HA Cluster support and more cleanup