Merge "Remove Markup and Utterance classes."