Clean up some of the cruft.