KRACOEUS-7120: more service refactoring for s2s
KRACOEUS-7120: removing relationship that is not needed
Merge pull request #153 from leoherbie/s2s_api_changes2

KRACOEUS-7120: more service refactoring for s2s