KCINFR-979: replacing arg value service
Merge pull request #191 from leoherbie/s2s_arg_value_replacement

KCINFR-979: replacing arg value service
KCINFR-979: removing unused code
Merge pull request #192 from leoherbie/s2s_cleanup_unused

KCINFR-979: removing unused code