Remove commented code
Merge pull request #799 from romainneutron/code-comments

[3.9] Remove commented code