KCINFR-979: cleaning up code
Merge pull request #100 from leoherbie/s2s_cleanup2

KCINFR-979: cleaning up code