true DI and Service Locator for AR - minor fixes and clean up