Remove unused utility code
Merge pull request #3310 from chrisvest/2.2-remove-unused

[2.2] Remove unused utility code