removed old commented lines