KCINFR-979: removing unused code, cleaning up code

S2S had a fair amount of dead code.  Before splitting the s2s generators out into a new project it makes sense to clean out anything not used.