Remove more legacy code.