Obsolete code commented out (Annalisa)