Get rid of ModelNormalizer