Update old code

**Is your feature request related to a problem? Please describe.**
The deprecated code was left in the framework for a few month now. Since all (known) current usages don't rely on the deprecated code, it can be safely removed.

**Describe the solution you'd like**
Delete the deprecated code

