Removed old code

Cleaned house