Resolve #3463241 "Remove outdated code"

Closes #3463241

Merge request reports

Loading