- Remove or replace a few dumb deprecations (#7760)