refactoring, removing duplicate service definitions