Remove injected factory to maintain common instantiation pattern