Removed service locator anti-pattern