Remove dead code
Merge pull request #2212 from fgrehm/remove-dead-code-take-2

core: remove dead code