partial cruft cleanup