Fixed build, futher added code related to health and removed dead code.