removing some deprecated and useless code