Old and useless code deleted