Removed service locator methods