Moved health check proto logic to TaskBuilder

- other minor cleanup items identified in review