Remove service methods with no reference
Merge branch 'APD-103-BOZ' into develop