clean more cruft