some i18n cleanup