ServiceLocator factory dependencies removed