Clean up and removed old code.