clean up logic for HA start+change mode