[3.8] Cleanup temporary files