Removing service dep.
Merge branch 'master' into develop