Removed old code commented out