Merge "Remove oversight references from i18n"