Git rid of more cruft.