[3.8] Cleanup files