removed more old code