Resolve #3571057 "Remove deprecated code"

Closes #3571057

Merge request reports

Loading