Remove all references to ServiceLocator in favor of ServiceManager