Removed old commented code