more cruft removal