Purged ms notation from datamodel internals