Removed old commented out block