Do a better job of excising UNICAST3 from EAP configs