More cleanup for health API changes.