Removed service locator anti-pattern from base controller