removed old code that was commented out