Cleaning up some of the cruft.