Remove factory from implementation. Conserve FactoryService instead