Removed old stuff we were not using