Removed old commented-out lines