KCINFR-979: cleaning up code while doing analysis

Here is some minor cleanup work I did while doing analysis on the s2s codebase.  Note the toStringMapper methods are totally useless.  My guess is the developer figured those methods were being used by a super class toString implementation or something.