Substantial cleanup for removeLocaleEntities.pl