clean up some cruft