Cleaning up some more cruft