Remove dead code

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

Merge request reports