removed more old expired code