Remove unused code
Merge pull request #5133 from wilsonge/patch-25

Remove unused code