removed old code which was commented out