Remove dead code

Merged Mark Andrews requested to merge remove-dead-code into master

Merge request reports