remove some more old code