Remove deprecations
Merge pull request #3275 from dereuromark/3.0-depr

Remove deprecations