Clean up more cruft.