Fix: HA policy cleanup