Service Locator removed