Feature/cleanup 2.6 deprecations

Christian Engwerrequested to merge
feature/cleanup-2.6-deprecations into master

We remove support for deprecated features.

This should be backported to 2.7

Merge request reports