Tweak, cruft removal