Clean Up of Useless Code