Removed old code no longer necessary