Fac cleanup and export