Remove i18n dependency