Removed old legacy code