Merge "healthd: clean up unused code"