Get rid of more cruft