Finish deprecated+seal work

Now it just needs regression testing for all the changes