more hai cleanup