Removed more old stuff