Made cleaning arch-indep