i18n cleanup