cruft removal, mostly