I would move these 2 unset calls in the previous normalization functions