Remove normalization class instantiation for now as well