Removed old commented out or unused code