Fac cleanup and export

Why is this commented out?