Remove dead code in support
Merge pull request #1632 from edwinb/remove-support

Remove dead code in support