Merge pull request #3830 from jenshnielsen/master

Merge of #3402
Remove deprecated nonorm and normalize
Merge pull request #3832 from jenshnielsen/norm_deprecated

Remove deprecated nonorm and normalize