Remove dead code relating to unused features.
Merge branch 'remove-dead-code'