ha_system: cleanup Hien's mess