Remove code that was commented out by earlier re-factor