Remove commented code
Merge pull request #4145 from wilsonge/patch-5

Remove commented code