KCINFR-979: cleaning up code while doing analysis
KCINFR-979: cleaning up code while doing analysis
Merge pull request #105 from leoherbie/s2s_analysis

KCINFR-979: cleaning up code while doing analysis