Remove dependency on container, removing service locator antipattern