Issue #3511467: remove legacy code

Closes #3511467

Merge request reports

Loading