Add service locator, remove new from use-code
Merge remote-tracking branch 'origin/master'