*: drop remaining X-[Condition] references