Removed old location code