Simplify health checks

[#81524216]