cruft cleanup