Removing some old and useless code