Remove even more cruft.