Remove a few more pre-2.24 checks