Restored almost-lost Normalization fixes
Remove unnecessary code from Normalize Task