Remove code that was commented out