Cleanup factory in such a way that you do not have to depend on it first in order to resolve it.