Remove a few pre-2.24 checks