get rid of some cruft