More i18n cleanup