Removed some code commented