Removed old stuff
Clean up