Remove dead code

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

Merge request reports