IDEX-1006 remove service
Merge remote-tracking branch 'origin/master'