Remove dead code
Merge pull request #2777 from davidegrohmann/2.1-rm-dead-code

Remove dead code