Cleanup/remove deprecated

Merged Timo Koch requested to merge cleanup/remove-deprecated into master

There should be no overlap with !1876 (merged)

Merge request reports