Remove debugging markup from factory-xmatter