clean up a few HA-related things