Removed old stuff that should not be here