Removed old outdated code