cleaning up some cruft