Remove duplicate normalization logic