remove buggy and inconsistent intf-switch