Remove more old code.