Remove dead code
Fix CS
Merge pull request #616 from romainneutron/dead-code

[3.9] Remove dead code