Remove more cruft