cleanup cruft