Drop unused code.
Merge pull request #3608 from ktf/drop-unused-code

Clang -- Drop unused code.