Remove localization
oops
Fix merge conflict
Merge branch 'ghost1227-issue/22' into release/2.1