*: drop remaining X-[Condition] references
Merge pull request #877 from bcwaldon/remaining-references

*: drop remaining X-[Condition] references