Some more old code elimination