no more MASC, no more antixml.

Closes #45