MC-125: Clean NormalizerGuesser