make cleanup a little more user friendly