Factory, DI and Popo cleanups