cleanup healthcheck changes some