Removed unnecessary i18n
Fix NP