Remove deprecated code

Remove deprecated code, as part of the 3.0 release.

First merge:
- [ ] #6983
- [x] #6987
- [ ] #6999