updated cleanup again

this time i think it runs in *most* cases