Remove some code deprecated in 2.9

Christoph Grüningerrequested to merge
feature/remove-deprecated-2.9 into master

There is more deprecated code

Merge request reports