removed old commented code