new "better" cleanup support