Removed ServiceManager and replaced with the far simpler ServiceLocator.