Remove more cruft.