[3.8] Cleanup setup files