Remove code commented out