Removed old code no longer needed