Remove some more cruft.