Clean up MessageSyntax