Cleanup restorehealth (6/35)

Cleanup restorehealth