Factory and Config cleanups