nightly: fix and simplify cleanup