jeherve and matticbot Janitorial: clean up deprecated code (#16434)

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/1341976945

7f971a9