Draft: Deprecation fixes
This one needs lots and lots and lots and lots of testing. Marked as draft so it does not get merged until tested.
This one needs lots and lots and lots and lots of testing. Marked as draft so it does not get merged until tested.