Removed old commented-out sections