Remove code deprecated in 2.9

Merge request reports

Loading