Removed old code that was commented out