Cleanup wasn't reliable

Cleanup temporary files reliably