KCINFR-979: removing unused code

I noticed a bunch of commented and unused code that came in from the 5.2.1 merge.  I'm cleaning it up here.