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

KCINFR-979: removing unused code