clean up cruft