Remove some more old code.