Removed code commented out