removed more old stuff