Cleaning up some of the old cruft.