Remove code which was commented out