more cleanup support