REFACTOR remove deprecated methods
FIX test on PSServiceController DIGME-1317