further i18n cleanup