Clean-up some cruft