removed more old crap