clean up more cruft.