At this point, it's probably easiest to keep the removal of unused code and i18n in the same PR. They're separate commits, and we won't be able to merge the second without the first.