Remove deprecated nonorm and normalize