Remove more old cruft