Remove deprecated code

Closes #3570683

Merge request reports

Loading