Cleaning up some cruft