Removed old code that are commented out