Fix bad cleanup