diff --git a/src/backend/utils/mb/Unicode/euc_jis_2004_to_utf8.map b/src/backend/utils/mb/Unicode/euc_jis_2004_to_utf8.map
index 59a1d946359..881a286a920 100644
--- a/src/backend/utils/mb/Unicode/euc_jis_2004_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/euc_jis_2004_to_utf8.map
@@ -2,134 +2,6 @@
  * This file was generated by UCS_to_EUC_JIS_2004.pl
  */
 static const pg_local_to_utf LUmapEUC_JIS_2004[] = {
-  {0x000000, 0x00000000},	/* U+0000	 <control> */
-  {0x000001, 0x00000001},	/* U+0001	 <control> */
-  {0x000002, 0x00000002},	/* U+0002	 <control> */
-  {0x000003, 0x00000003},	/* U+0003	 <control> */
-  {0x000004, 0x00000004},	/* U+0004	 <control> */
-  {0x000005, 0x00000005},	/* U+0005	 <control> */
-  {0x000006, 0x00000006},	/* U+0006	 <control> */
-  {0x000007, 0x00000007},	/* U+0007	 <control> */
-  {0x000008, 0x00000008},	/* U+0008	 <control> */
-  {0x000009, 0x00000009},	/* U+0009	 <control> */
-  {0x00000a, 0x0000000a},	/* U+000A	 <control> */
-  {0x00000b, 0x0000000b},	/* U+000B	 <control> */
-  {0x00000c, 0x0000000c},	/* U+000C	 <control> */
-  {0x00000d, 0x0000000d},	/* U+000D	 <control> */
-  {0x00000e, 0x0000000e},	/* U+000E	 <control> */
-  {0x00000f, 0x0000000f},	/* U+000F	 <control> */
-  {0x000010, 0x00000010},	/* U+0010	 <control> */
-  {0x000011, 0x00000011},	/* U+0011	 <control> */
-  {0x000012, 0x00000012},	/* U+0012	 <control> */
-  {0x000013, 0x00000013},	/* U+0013	 <control> */
-  {0x000014, 0x00000014},	/* U+0014	 <control> */
-  {0x000015, 0x00000015},	/* U+0015	 <control> */
-  {0x000016, 0x00000016},	/* U+0016	 <control> */
-  {0x000017, 0x00000017},	/* U+0017	 <control> */
-  {0x000018, 0x00000018},	/* U+0018	 <control> */
-  {0x000019, 0x00000019},	/* U+0019	 <control> */
-  {0x00001a, 0x0000001a},	/* U+001A	 <control> */
-  {0x00001b, 0x0000001b},	/* U+001B	 <control> */
-  {0x00001c, 0x0000001c},	/* U+001C	 <control> */
-  {0x00001d, 0x0000001d},	/* U+001D	 <control> */
-  {0x00001e, 0x0000001e},	/* U+001E	 <control> */
-  {0x00001f, 0x0000001f},	/* U+001F	 <control> */
-  {0x000020, 0x00000020},	/* U+0020	 SPACE */
-  {0x000021, 0x00000021},	/* U+0021	 EXCLAMATION MARK */
-  {0x000022, 0x00000022},	/* U+0022	 QUOTATION MARK */
-  {0x000023, 0x00000023},	/* U+0023	 NUMBER SIGN */
-  {0x000024, 0x00000024},	/* U+0024	 DOLLAR SIGN */
-  {0x000025, 0x00000025},	/* U+0025	 PERCENT SIGN */
-  {0x000026, 0x00000026},	/* U+0026	 AMPERSAND */
-  {0x000027, 0x00000027},	/* U+0027	 APOSTROPHE */
-  {0x000028, 0x00000028},	/* U+0028	 LEFT PARENTHESIS */
-  {0x000029, 0x00000029},	/* U+0029	 RIGHT PARENTHESIS */
-  {0x00002a, 0x0000002a},	/* U+002A	 ASTERISK */
-  {0x00002b, 0x0000002b},	/* U+002B	 PLUS SIGN */
-  {0x00002c, 0x0000002c},	/* U+002C	 COMMA */
-  {0x00002d, 0x0000002d},	/* U+002D	 HYPHEN-MINUS */
-  {0x00002e, 0x0000002e},	/* U+002E	 FULL STOP */
-  {0x00002f, 0x0000002f},	/* U+002F	 SOLIDUS */
-  {0x000030, 0x00000030},	/* U+0030	 DIGIT ZERO */
-  {0x000031, 0x00000031},	/* U+0031	 DIGIT ONE */
-  {0x000032, 0x00000032},	/* U+0032	 DIGIT TWO */
-  {0x000033, 0x00000033},	/* U+0033	 DIGIT THREE */
-  {0x000034, 0x00000034},	/* U+0034	 DIGIT FOUR */
-  {0x000035, 0x00000035},	/* U+0035	 DIGIT FIVE */
-  {0x000036, 0x00000036},	/* U+0036	 DIGIT SIX */
-  {0x000037, 0x00000037},	/* U+0037	 DIGIT SEVEN */
-  {0x000038, 0x00000038},	/* U+0038	 DIGIT EIGHT */
-  {0x000039, 0x00000039},	/* U+0039	 DIGIT NINE */
-  {0x00003a, 0x0000003a},	/* U+003A	 COLON */
-  {0x00003b, 0x0000003b},	/* U+003B	 SEMICOLON */
-  {0x00003c, 0x0000003c},	/* U+003C	 LESS-THAN SIGN */
-  {0x00003d, 0x0000003d},	/* U+003D	 EQUALS SIGN */
-  {0x00003e, 0x0000003e},	/* U+003E	 GREATER-THAN SIGN */
-  {0x00003f, 0x0000003f},	/* U+003F	 QUESTION MARK */
-  {0x000040, 0x00000040},	/* U+0040	 COMMERCIAL AT */
-  {0x000041, 0x00000041},	/* U+0041	 LATIN CAPITAL LETTER A */
-  {0x000042, 0x00000042},	/* U+0042	 LATIN CAPITAL LETTER B */
-  {0x000043, 0x00000043},	/* U+0043	 LATIN CAPITAL LETTER C */
-  {0x000044, 0x00000044},	/* U+0044	 LATIN CAPITAL LETTER D */
-  {0x000045, 0x00000045},	/* U+0045	 LATIN CAPITAL LETTER E */
-  {0x000046, 0x00000046},	/* U+0046	 LATIN CAPITAL LETTER F */
-  {0x000047, 0x00000047},	/* U+0047	 LATIN CAPITAL LETTER G */
-  {0x000048, 0x00000048},	/* U+0048	 LATIN CAPITAL LETTER H */
-  {0x000049, 0x00000049},	/* U+0049	 LATIN CAPITAL LETTER I */
-  {0x00004a, 0x0000004a},	/* U+004A	 LATIN CAPITAL LETTER J */
-  {0x00004b, 0x0000004b},	/* U+004B	 LATIN CAPITAL LETTER K */
-  {0x00004c, 0x0000004c},	/* U+004C	 LATIN CAPITAL LETTER L */
-  {0x00004d, 0x0000004d},	/* U+004D	 LATIN CAPITAL LETTER M */
-  {0x00004e, 0x0000004e},	/* U+004E	 LATIN CAPITAL LETTER N */
-  {0x00004f, 0x0000004f},	/* U+004F	 LATIN CAPITAL LETTER O */
-  {0x000050, 0x00000050},	/* U+0050	 LATIN CAPITAL LETTER P */
-  {0x000051, 0x00000051},	/* U+0051	 LATIN CAPITAL LETTER Q */
-  {0x000052, 0x00000052},	/* U+0052	 LATIN CAPITAL LETTER R */
-  {0x000053, 0x00000053},	/* U+0053	 LATIN CAPITAL LETTER S */
-  {0x000054, 0x00000054},	/* U+0054	 LATIN CAPITAL LETTER T */
-  {0x000055, 0x00000055},	/* U+0055	 LATIN CAPITAL LETTER U */
-  {0x000056, 0x00000056},	/* U+0056	 LATIN CAPITAL LETTER V */
-  {0x000057, 0x00000057},	/* U+0057	 LATIN CAPITAL LETTER W */
-  {0x000058, 0x00000058},	/* U+0058	 LATIN CAPITAL LETTER X */
-  {0x000059, 0x00000059},	/* U+0059	 LATIN CAPITAL LETTER Y */
-  {0x00005a, 0x0000005a},	/* U+005A	 LATIN CAPITAL LETTER Z */
-  {0x00005b, 0x0000005b},	/* U+005B	 LEFT SQUARE BRACKET */
-  {0x00005c, 0x0000005c},	/* U+005C	 REVERSE SOLIDUS */
-  {0x00005d, 0x0000005d},	/* U+005D	 RIGHT SQUARE BRACKET */
-  {0x00005e, 0x0000005e},	/* U+005E	 CIRCUMFLEX ACCENT */
-  {0x00005f, 0x0000005f},	/* U+005F	 LOW LINE */
-  {0x000060, 0x00000060},	/* U+0060	 GRAVE ACCENT */
-  {0x000061, 0x00000061},	/* U+0061	 LATIN SMALL LETTER A */
-  {0x000062, 0x00000062},	/* U+0062	 LATIN SMALL LETTER B */
-  {0x000063, 0x00000063},	/* U+0063	 LATIN SMALL LETTER C */
-  {0x000064, 0x00000064},	/* U+0064	 LATIN SMALL LETTER D */
-  {0x000065, 0x00000065},	/* U+0065	 LATIN SMALL LETTER E */
-  {0x000066, 0x00000066},	/* U+0066	 LATIN SMALL LETTER F */
-  {0x000067, 0x00000067},	/* U+0067	 LATIN SMALL LETTER G */
-  {0x000068, 0x00000068},	/* U+0068	 LATIN SMALL LETTER H */
-  {0x000069, 0x00000069},	/* U+0069	 LATIN SMALL LETTER I */
-  {0x00006a, 0x0000006a},	/* U+006A	 LATIN SMALL LETTER J */
-  {0x00006b, 0x0000006b},	/* U+006B	 LATIN SMALL LETTER K */
-  {0x00006c, 0x0000006c},	/* U+006C	 LATIN SMALL LETTER L */
-  {0x00006d, 0x0000006d},	/* U+006D	 LATIN SMALL LETTER M */
-  {0x00006e, 0x0000006e},	/* U+006E	 LATIN SMALL LETTER N */
-  {0x00006f, 0x0000006f},	/* U+006F	 LATIN SMALL LETTER O */
-  {0x000070, 0x00000070},	/* U+0070	 LATIN SMALL LETTER P */
-  {0x000071, 0x00000071},	/* U+0071	 LATIN SMALL LETTER Q */
-  {0x000072, 0x00000072},	/* U+0072	 LATIN SMALL LETTER R */
-  {0x000073, 0x00000073},	/* U+0073	 LATIN SMALL LETTER S */
-  {0x000074, 0x00000074},	/* U+0074	 LATIN SMALL LETTER T */
-  {0x000075, 0x00000075},	/* U+0075	 LATIN SMALL LETTER U */
-  {0x000076, 0x00000076},	/* U+0076	 LATIN SMALL LETTER V */
-  {0x000077, 0x00000077},	/* U+0077	 LATIN SMALL LETTER W */
-  {0x000078, 0x00000078},	/* U+0078	 LATIN SMALL LETTER X */
-  {0x000079, 0x00000079},	/* U+0079	 LATIN SMALL LETTER Y */
-  {0x00007a, 0x0000007a},	/* U+007A	 LATIN SMALL LETTER Z */
-  {0x00007b, 0x0000007b},	/* U+007B	 LEFT CURLY BRACKET */
-  {0x00007c, 0x0000007c},	/* U+007C	 VERTICAL LINE */
-  {0x00007d, 0x0000007d},	/* U+007D	 RIGHT CURLY BRACKET */
-  {0x00007e, 0x0000007e},	/* U+007E	 TILDE */
-  {0x00007f, 0x0000007f},	/* U+007F	 <control> */
   {0x000080, 0x0000c280},	/* U+0080	 <control> */
   {0x000081, 0x0000c281},	/* U+0081	 <control> */
   {0x000082, 0x0000c282},	/* U+0082	 <control> */
diff --git a/src/backend/utils/mb/Unicode/shift_jis_2004_to_utf8.map b/src/backend/utils/mb/Unicode/shift_jis_2004_to_utf8.map
index f4e03e90d8a..73fbea90bdd 100644
--- a/src/backend/utils/mb/Unicode/shift_jis_2004_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/shift_jis_2004_to_utf8.map
@@ -2,134 +2,6 @@
  * This file was generated by UCS_to_SHIFTJIS_2004.pl
  */
 static const pg_local_to_utf LUmapSHIFT_JIS_2004[] = {
-  {0x0000, 0x00000000},	/* U+0000	 <control> */
-  {0x0001, 0x00000001},	/* U+0001	 <control> */
-  {0x0002, 0x00000002},	/* U+0002	 <control> */
-  {0x0003, 0x00000003},	/* U+0003	 <control> */
-  {0x0004, 0x00000004},	/* U+0004	 <control> */
-  {0x0005, 0x00000005},	/* U+0005	 <control> */
-  {0x0006, 0x00000006},	/* U+0006	 <control> */
-  {0x0007, 0x00000007},	/* U+0007	 <control> */
-  {0x0008, 0x00000008},	/* U+0008	 <control> */
-  {0x0009, 0x00000009},	/* U+0009	 <control> */
-  {0x000a, 0x0000000a},	/* U+000A	 <control> */
-  {0x000b, 0x0000000b},	/* U+000B	 <control> */
-  {0x000c, 0x0000000c},	/* U+000C	 <control> */
-  {0x000d, 0x0000000d},	/* U+000D	 <control> */
-  {0x000e, 0x0000000e},	/* U+000E	 <control> */
-  {0x000f, 0x0000000f},	/* U+000F	 <control> */
-  {0x0010, 0x00000010},	/* U+0010	 <control> */
-  {0x0011, 0x00000011},	/* U+0011	 <control> */
-  {0x0012, 0x00000012},	/* U+0012	 <control> */
-  {0x0013, 0x00000013},	/* U+0013	 <control> */
-  {0x0014, 0x00000014},	/* U+0014	 <control> */
-  {0x0015, 0x00000015},	/* U+0015	 <control> */
-  {0x0016, 0x00000016},	/* U+0016	 <control> */
-  {0x0017, 0x00000017},	/* U+0017	 <control> */
-  {0x0018, 0x00000018},	/* U+0018	 <control> */
-  {0x0019, 0x00000019},	/* U+0019	 <control> */
-  {0x001a, 0x0000001a},	/* U+001A	 <control> */
-  {0x001b, 0x0000001b},	/* U+001B	 <control> */
-  {0x001c, 0x0000001c},	/* U+001C	 <control> */
-  {0x001d, 0x0000001d},	/* U+001D	 <control> */
-  {0x001e, 0x0000001e},	/* U+001E	 <control> */
-  {0x001f, 0x0000001f},	/* U+001F	 <control> */
-  {0x0020, 0x00000020},	/* U+0020	 SPACE */
-  {0x0021, 0x00000021},	/* U+0021	 EXCLAMATION MARK */
-  {0x0022, 0x00000022},	/* U+0022	 QUOTATION MARK */
-  {0x0023, 0x00000023},	/* U+0023	 NUMBER SIGN */
-  {0x0024, 0x00000024},	/* U+0024	 DOLLAR SIGN */
-  {0x0025, 0x00000025},	/* U+0025	 PERCENT SIGN */
-  {0x0026, 0x00000026},	/* U+0026	 AMPERSAND */
-  {0x0027, 0x00000027},	/* U+0027	 APOSTROPHE */
-  {0x0028, 0x00000028},	/* U+0028	 LEFT PARENTHESIS */
-  {0x0029, 0x00000029},	/* U+0029	 RIGHT PARENTHESIS */
-  {0x002a, 0x0000002a},	/* U+002A	 ASTERISK */
-  {0x002b, 0x0000002b},	/* U+002B	 PLUS SIGN */
-  {0x002c, 0x0000002c},	/* U+002C	 COMMA */
-  {0x002d, 0x0000002d},	/* U+002D	 HYPHEN-MINUS */
-  {0x002e, 0x0000002e},	/* U+002E	 FULL STOP */
-  {0x002f, 0x0000002f},	/* U+002F	 SOLIDUS */
-  {0x0030, 0x00000030},	/* U+0030	 DIGIT ZERO */
-  {0x0031, 0x00000031},	/* U+0031	 DIGIT ONE */
-  {0x0032, 0x00000032},	/* U+0032	 DIGIT TWO */
-  {0x0033, 0x00000033},	/* U+0033	 DIGIT THREE */
-  {0x0034, 0x00000034},	/* U+0034	 DIGIT FOUR */
-  {0x0035, 0x00000035},	/* U+0035	 DIGIT FIVE */
-  {0x0036, 0x00000036},	/* U+0036	 DIGIT SIX */
-  {0x0037, 0x00000037},	/* U+0037	 DIGIT SEVEN */
-  {0x0038, 0x00000038},	/* U+0038	 DIGIT EIGHT */
-  {0x0039, 0x00000039},	/* U+0039	 DIGIT NINE */
-  {0x003a, 0x0000003a},	/* U+003A	 COLON */
-  {0x003b, 0x0000003b},	/* U+003B	 SEMICOLON */
-  {0x003c, 0x0000003c},	/* U+003C	 LESS-THAN SIGN */
-  {0x003d, 0x0000003d},	/* U+003D	 EQUALS SIGN */
-  {0x003e, 0x0000003e},	/* U+003E	 GREATER-THAN SIGN */
-  {0x003f, 0x0000003f},	/* U+003F	 QUESTION MARK */
-  {0x0040, 0x00000040},	/* U+0040	 COMMERCIAL AT */
-  {0x0041, 0x00000041},	/* U+0041	 LATIN CAPITAL LETTER A */
-  {0x0042, 0x00000042},	/* U+0042	 LATIN CAPITAL LETTER B */
-  {0x0043, 0x00000043},	/* U+0043	 LATIN CAPITAL LETTER C */
-  {0x0044, 0x00000044},	/* U+0044	 LATIN CAPITAL LETTER D */
-  {0x0045, 0x00000045},	/* U+0045	 LATIN CAPITAL LETTER E */
-  {0x0046, 0x00000046},	/* U+0046	 LATIN CAPITAL LETTER F */
-  {0x0047, 0x00000047},	/* U+0047	 LATIN CAPITAL LETTER G */
-  {0x0048, 0x00000048},	/* U+0048	 LATIN CAPITAL LETTER H */
-  {0x0049, 0x00000049},	/* U+0049	 LATIN CAPITAL LETTER I */
-  {0x004a, 0x0000004a},	/* U+004A	 LATIN CAPITAL LETTER J */
-  {0x004b, 0x0000004b},	/* U+004B	 LATIN CAPITAL LETTER K */
-  {0x004c, 0x0000004c},	/* U+004C	 LATIN CAPITAL LETTER L */
-  {0x004d, 0x0000004d},	/* U+004D	 LATIN CAPITAL LETTER M */
-  {0x004e, 0x0000004e},	/* U+004E	 LATIN CAPITAL LETTER N */
-  {0x004f, 0x0000004f},	/* U+004F	 LATIN CAPITAL LETTER O */
-  {0x0050, 0x00000050},	/* U+0050	 LATIN CAPITAL LETTER P */
-  {0x0051, 0x00000051},	/* U+0051	 LATIN CAPITAL LETTER Q */
-  {0x0052, 0x00000052},	/* U+0052	 LATIN CAPITAL LETTER R */
-  {0x0053, 0x00000053},	/* U+0053	 LATIN CAPITAL LETTER S */
-  {0x0054, 0x00000054},	/* U+0054	 LATIN CAPITAL LETTER T */
-  {0x0055, 0x00000055},	/* U+0055	 LATIN CAPITAL LETTER U */
-  {0x0056, 0x00000056},	/* U+0056	 LATIN CAPITAL LETTER V */
-  {0x0057, 0x00000057},	/* U+0057	 LATIN CAPITAL LETTER W */
-  {0x0058, 0x00000058},	/* U+0058	 LATIN CAPITAL LETTER X */
-  {0x0059, 0x00000059},	/* U+0059	 LATIN CAPITAL LETTER Y */
-  {0x005a, 0x0000005a},	/* U+005A	 LATIN CAPITAL LETTER Z */
-  {0x005b, 0x0000005b},	/* U+005B	 LEFT SQUARE BRACKET */
-  {0x005c, 0x0000c2a5},	/* U+00A5	 YEN SIGN */
-  {0x005d, 0x0000005d},	/* U+005D	 RIGHT SQUARE BRACKET */
-  {0x005e, 0x0000005e},	/* U+005E	 CIRCUMFLEX ACCENT */
-  {0x005f, 0x0000005f},	/* U+005F	 LOW LINE */
-  {0x0060, 0x00000060},	/* U+0060	 GRAVE ACCENT */
-  {0x0061, 0x00000061},	/* U+0061	 LATIN SMALL LETTER A */
-  {0x0062, 0x00000062},	/* U+0062	 LATIN SMALL LETTER B */
-  {0x0063, 0x00000063},	/* U+0063	 LATIN SMALL LETTER C */
-  {0x0064, 0x00000064},	/* U+0064	 LATIN SMALL LETTER D */
-  {0x0065, 0x00000065},	/* U+0065	 LATIN SMALL LETTER E */
-  {0x0066, 0x00000066},	/* U+0066	 LATIN SMALL LETTER F */
-  {0x0067, 0x00000067},	/* U+0067	 LATIN SMALL LETTER G */
-  {0x0068, 0x00000068},	/* U+0068	 LATIN SMALL LETTER H */
-  {0x0069, 0x00000069},	/* U+0069	 LATIN SMALL LETTER I */
-  {0x006a, 0x0000006a},	/* U+006A	 LATIN SMALL LETTER J */
-  {0x006b, 0x0000006b},	/* U+006B	 LATIN SMALL LETTER K */
-  {0x006c, 0x0000006c},	/* U+006C	 LATIN SMALL LETTER L */
-  {0x006d, 0x0000006d},	/* U+006D	 LATIN SMALL LETTER M */
-  {0x006e, 0x0000006e},	/* U+006E	 LATIN SMALL LETTER N */
-  {0x006f, 0x0000006f},	/* U+006F	 LATIN SMALL LETTER O */
-  {0x0070, 0x00000070},	/* U+0070	 LATIN SMALL LETTER P */
-  {0x0071, 0x00000071},	/* U+0071	 LATIN SMALL LETTER Q */
-  {0x0072, 0x00000072},	/* U+0072	 LATIN SMALL LETTER R */
-  {0x0073, 0x00000073},	/* U+0073	 LATIN SMALL LETTER S */
-  {0x0074, 0x00000074},	/* U+0074	 LATIN SMALL LETTER T */
-  {0x0075, 0x00000075},	/* U+0075	 LATIN SMALL LETTER U */
-  {0x0076, 0x00000076},	/* U+0076	 LATIN SMALL LETTER V */
-  {0x0077, 0x00000077},	/* U+0077	 LATIN SMALL LETTER W */
-  {0x0078, 0x00000078},	/* U+0078	 LATIN SMALL LETTER X */
-  {0x0079, 0x00000079},	/* U+0079	 LATIN SMALL LETTER Y */
-  {0x007a, 0x0000007a},	/* U+007A	 LATIN SMALL LETTER Z */
-  {0x007b, 0x0000007b},	/* U+007B	 LEFT CURLY BRACKET */
-  {0x007c, 0x0000007c},	/* U+007C	 VERTICAL LINE */
-  {0x007d, 0x0000007d},	/* U+007D	 RIGHT CURLY BRACKET */
-  {0x007e, 0x00e280be},	/* U+203E	 OVERLINE */
-  {0x007f, 0x0000007f},	/* U+007F	 <control> */
   {0x00a1, 0x00efbda1},	/* U+FF61	 HALFWIDTH IDEOGRAPHIC FULL STOP */
   {0x00a2, 0x00efbda2},	/* U+FF62	 HALFWIDTH LEFT CORNER BRACKET */
   {0x00a3, 0x00efbda3},	/* U+FF63	 HALFWIDTH RIGHT CORNER BRACKET */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_euc_jis_2004.map b/src/backend/utils/mb/Unicode/utf8_to_euc_jis_2004.map
index bae26f2d86d..83f8e73aaa6 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_euc_jis_2004.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_euc_jis_2004.map
@@ -2,134 +2,6 @@
  * This file was generated by UCS_to_EUC_JIS_2004.pl
  */
 static const pg_utf_to_local ULmapEUC_JIS_2004[] = {
-  {0x00000000, 0x000000},	/* U+0000	 <control> */
-  {0x00000001, 0x000001},	/* U+0001	 <control> */
-  {0x00000002, 0x000002},	/* U+0002	 <control> */
-  {0x00000003, 0x000003},	/* U+0003	 <control> */
-  {0x00000004, 0x000004},	/* U+0004	 <control> */
-  {0x00000005, 0x000005},	/* U+0005	 <control> */
-  {0x00000006, 0x000006},	/* U+0006	 <control> */
-  {0x00000007, 0x000007},	/* U+0007	 <control> */
-  {0x00000008, 0x000008},	/* U+0008	 <control> */
-  {0x00000009, 0x000009},	/* U+0009	 <control> */
-  {0x0000000a, 0x00000a},	/* U+000A	 <control> */
-  {0x0000000b, 0x00000b},	/* U+000B	 <control> */
-  {0x0000000c, 0x00000c},	/* U+000C	 <control> */
-  {0x0000000d, 0x00000d},	/* U+000D	 <control> */
-  {0x0000000e, 0x00000e},	/* U+000E	 <control> */
-  {0x0000000f, 0x00000f},	/* U+000F	 <control> */
-  {0x00000010, 0x000010},	/* U+0010	 <control> */
-  {0x00000011, 0x000011},	/* U+0011	 <control> */
-  {0x00000012, 0x000012},	/* U+0012	 <control> */
-  {0x00000013, 0x000013},	/* U+0013	 <control> */
-  {0x00000014, 0x000014},	/* U+0014	 <control> */
-  {0x00000015, 0x000015},	/* U+0015	 <control> */
-  {0x00000016, 0x000016},	/* U+0016	 <control> */
-  {0x00000017, 0x000017},	/* U+0017	 <control> */
-  {0x00000018, 0x000018},	/* U+0018	 <control> */
-  {0x00000019, 0x000019},	/* U+0019	 <control> */
-  {0x0000001a, 0x00001a},	/* U+001A	 <control> */
-  {0x0000001b, 0x00001b},	/* U+001B	 <control> */
-  {0x0000001c, 0x00001c},	/* U+001C	 <control> */
-  {0x0000001d, 0x00001d},	/* U+001D	 <control> */
-  {0x0000001e, 0x00001e},	/* U+001E	 <control> */
-  {0x0000001f, 0x00001f},	/* U+001F	 <control> */
-  {0x00000020, 0x000020},	/* U+0020	 SPACE */
-  {0x00000021, 0x000021},	/* U+0021	 EXCLAMATION MARK */
-  {0x00000022, 0x000022},	/* U+0022	 QUOTATION MARK */
-  {0x00000023, 0x000023},	/* U+0023	 NUMBER SIGN */
-  {0x00000024, 0x000024},	/* U+0024	 DOLLAR SIGN */
-  {0x00000025, 0x000025},	/* U+0025	 PERCENT SIGN */
-  {0x00000026, 0x000026},	/* U+0026	 AMPERSAND */
-  {0x00000027, 0x000027},	/* U+0027	 APOSTROPHE */
-  {0x00000028, 0x000028},	/* U+0028	 LEFT PARENTHESIS */
-  {0x00000029, 0x000029},	/* U+0029	 RIGHT PARENTHESIS */
-  {0x0000002a, 0x00002a},	/* U+002A	 ASTERISK */
-  {0x0000002b, 0x00002b},	/* U+002B	 PLUS SIGN */
-  {0x0000002c, 0x00002c},	/* U+002C	 COMMA */
-  {0x0000002d, 0x00002d},	/* U+002D	 HYPHEN-MINUS */
-  {0x0000002e, 0x00002e},	/* U+002E	 FULL STOP */
-  {0x0000002f, 0x00002f},	/* U+002F	 SOLIDUS */
-  {0x00000030, 0x000030},	/* U+0030	 DIGIT ZERO */
-  {0x00000031, 0x000031},	/* U+0031	 DIGIT ONE */
-  {0x00000032, 0x000032},	/* U+0032	 DIGIT TWO */
-  {0x00000033, 0x000033},	/* U+0033	 DIGIT THREE */
-  {0x00000034, 0x000034},	/* U+0034	 DIGIT FOUR */
-  {0x00000035, 0x000035},	/* U+0035	 DIGIT FIVE */
-  {0x00000036, 0x000036},	/* U+0036	 DIGIT SIX */
-  {0x00000037, 0x000037},	/* U+0037	 DIGIT SEVEN */
-  {0x00000038, 0x000038},	/* U+0038	 DIGIT EIGHT */
-  {0x00000039, 0x000039},	/* U+0039	 DIGIT NINE */
-  {0x0000003a, 0x00003a},	/* U+003A	 COLON */
-  {0x0000003b, 0x00003b},	/* U+003B	 SEMICOLON */
-  {0x0000003c, 0x00003c},	/* U+003C	 LESS-THAN SIGN */
-  {0x0000003d, 0x00003d},	/* U+003D	 EQUALS SIGN */
-  {0x0000003e, 0x00003e},	/* U+003E	 GREATER-THAN SIGN */
-  {0x0000003f, 0x00003f},	/* U+003F	 QUESTION MARK */
-  {0x00000040, 0x000040},	/* U+0040	 COMMERCIAL AT */
-  {0x00000041, 0x000041},	/* U+0041	 LATIN CAPITAL LETTER A */
-  {0x00000042, 0x000042},	/* U+0042	 LATIN CAPITAL LETTER B */
-  {0x00000043, 0x000043},	/* U+0043	 LATIN CAPITAL LETTER C */
-  {0x00000044, 0x000044},	/* U+0044	 LATIN CAPITAL LETTER D */
-  {0x00000045, 0x000045},	/* U+0045	 LATIN CAPITAL LETTER E */
-  {0x00000046, 0x000046},	/* U+0046	 LATIN CAPITAL LETTER F */
-  {0x00000047, 0x000047},	/* U+0047	 LATIN CAPITAL LETTER G */
-  {0x00000048, 0x000048},	/* U+0048	 LATIN CAPITAL LETTER H */
-  {0x00000049, 0x000049},	/* U+0049	 LATIN CAPITAL LETTER I */
-  {0x0000004a, 0x00004a},	/* U+004A	 LATIN CAPITAL LETTER J */
-  {0x0000004b, 0x00004b},	/* U+004B	 LATIN CAPITAL LETTER K */
-  {0x0000004c, 0x00004c},	/* U+004C	 LATIN CAPITAL LETTER L */
-  {0x0000004d, 0x00004d},	/* U+004D	 LATIN CAPITAL LETTER M */
-  {0x0000004e, 0x00004e},	/* U+004E	 LATIN CAPITAL LETTER N */
-  {0x0000004f, 0x00004f},	/* U+004F	 LATIN CAPITAL LETTER O */
-  {0x00000050, 0x000050},	/* U+0050	 LATIN CAPITAL LETTER P */
-  {0x00000051, 0x000051},	/* U+0051	 LATIN CAPITAL LETTER Q */
-  {0x00000052, 0x000052},	/* U+0052	 LATIN CAPITAL LETTER R */
-  {0x00000053, 0x000053},	/* U+0053	 LATIN CAPITAL LETTER S */
-  {0x00000054, 0x000054},	/* U+0054	 LATIN CAPITAL LETTER T */
-  {0x00000055, 0x000055},	/* U+0055	 LATIN CAPITAL LETTER U */
-  {0x00000056, 0x000056},	/* U+0056	 LATIN CAPITAL LETTER V */
-  {0x00000057, 0x000057},	/* U+0057	 LATIN CAPITAL LETTER W */
-  {0x00000058, 0x000058},	/* U+0058	 LATIN CAPITAL LETTER X */
-  {0x00000059, 0x000059},	/* U+0059	 LATIN CAPITAL LETTER Y */
-  {0x0000005a, 0x00005a},	/* U+005A	 LATIN CAPITAL LETTER Z */
-  {0x0000005b, 0x00005b},	/* U+005B	 LEFT SQUARE BRACKET */
-  {0x0000005c, 0x00005c},	/* U+005C	 REVERSE SOLIDUS */
-  {0x0000005d, 0x00005d},	/* U+005D	 RIGHT SQUARE BRACKET */
-  {0x0000005e, 0x00005e},	/* U+005E	 CIRCUMFLEX ACCENT */
-  {0x0000005f, 0x00005f},	/* U+005F	 LOW LINE */
-  {0x00000060, 0x000060},	/* U+0060	 GRAVE ACCENT */
-  {0x00000061, 0x000061},	/* U+0061	 LATIN SMALL LETTER A */
-  {0x00000062, 0x000062},	/* U+0062	 LATIN SMALL LETTER B */
-  {0x00000063, 0x000063},	/* U+0063	 LATIN SMALL LETTER C */
-  {0x00000064, 0x000064},	/* U+0064	 LATIN SMALL LETTER D */
-  {0x00000065, 0x000065},	/* U+0065	 LATIN SMALL LETTER E */
-  {0x00000066, 0x000066},	/* U+0066	 LATIN SMALL LETTER F */
-  {0x00000067, 0x000067},	/* U+0067	 LATIN SMALL LETTER G */
-  {0x00000068, 0x000068},	/* U+0068	 LATIN SMALL LETTER H */
-  {0x00000069, 0x000069},	/* U+0069	 LATIN SMALL LETTER I */
-  {0x0000006a, 0x00006a},	/* U+006A	 LATIN SMALL LETTER J */
-  {0x0000006b, 0x00006b},	/* U+006B	 LATIN SMALL LETTER K */
-  {0x0000006c, 0x00006c},	/* U+006C	 LATIN SMALL LETTER L */
-  {0x0000006d, 0x00006d},	/* U+006D	 LATIN SMALL LETTER M */
-  {0x0000006e, 0x00006e},	/* U+006E	 LATIN SMALL LETTER N */
-  {0x0000006f, 0x00006f},	/* U+006F	 LATIN SMALL LETTER O */
-  {0x00000070, 0x000070},	/* U+0070	 LATIN SMALL LETTER P */
-  {0x00000071, 0x000071},	/* U+0071	 LATIN SMALL LETTER Q */
-  {0x00000072, 0x000072},	/* U+0072	 LATIN SMALL LETTER R */
-  {0x00000073, 0x000073},	/* U+0073	 LATIN SMALL LETTER S */
-  {0x00000074, 0x000074},	/* U+0074	 LATIN SMALL LETTER T */
-  {0x00000075, 0x000075},	/* U+0075	 LATIN SMALL LETTER U */
-  {0x00000076, 0x000076},	/* U+0076	 LATIN SMALL LETTER V */
-  {0x00000077, 0x000077},	/* U+0077	 LATIN SMALL LETTER W */
-  {0x00000078, 0x000078},	/* U+0078	 LATIN SMALL LETTER X */
-  {0x00000079, 0x000079},	/* U+0079	 LATIN SMALL LETTER Y */
-  {0x0000007a, 0x00007a},	/* U+007A	 LATIN SMALL LETTER Z */
-  {0x0000007b, 0x00007b},	/* U+007B	 LEFT CURLY BRACKET */
-  {0x0000007c, 0x00007c},	/* U+007C	 VERTICAL LINE */
-  {0x0000007d, 0x00007d},	/* U+007D	 RIGHT CURLY BRACKET */
-  {0x0000007e, 0x00007e},	/* U+007E	 TILDE */
-  {0x0000007f, 0x00007f},	/* U+007F	 <control> */
   {0x0000c280, 0x000080},	/* U+0080	 <control> */
   {0x0000c281, 0x000081},	/* U+0081	 <control> */
   {0x0000c282, 0x000082},	/* U+0082	 <control> */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_shift_jis_2004.map b/src/backend/utils/mb/Unicode/utf8_to_shift_jis_2004.map
index 5eb8c69564c..0c9aaf3b2c1 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_shift_jis_2004.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_shift_jis_2004.map
@@ -2,134 +2,6 @@
  * This file was generated by UCS_to_SHIFT_JIS_2004.pl
  */
 static const pg_utf_to_local ULmapSHIFT_JIS_2004[] = {
-  {0x00000000, 0x000000},	/* U+0000	 <control> */
-  {0x00000001, 0x000001},	/* U+0001	 <control> */
-  {0x00000002, 0x000002},	/* U+0002	 <control> */
-  {0x00000003, 0x000003},	/* U+0003	 <control> */
-  {0x00000004, 0x000004},	/* U+0004	 <control> */
-  {0x00000005, 0x000005},	/* U+0005	 <control> */
-  {0x00000006, 0x000006},	/* U+0006	 <control> */
-  {0x00000007, 0x000007},	/* U+0007	 <control> */
-  {0x00000008, 0x000008},	/* U+0008	 <control> */
-  {0x00000009, 0x000009},	/* U+0009	 <control> */
-  {0x0000000a, 0x00000a},	/* U+000A	 <control> */
-  {0x0000000b, 0x00000b},	/* U+000B	 <control> */
-  {0x0000000c, 0x00000c},	/* U+000C	 <control> */
-  {0x0000000d, 0x00000d},	/* U+000D	 <control> */
-  {0x0000000e, 0x00000e},	/* U+000E	 <control> */
-  {0x0000000f, 0x00000f},	/* U+000F	 <control> */
-  {0x00000010, 0x000010},	/* U+0010	 <control> */
-  {0x00000011, 0x000011},	/* U+0011	 <control> */
-  {0x00000012, 0x000012},	/* U+0012	 <control> */
-  {0x00000013, 0x000013},	/* U+0013	 <control> */
-  {0x00000014, 0x000014},	/* U+0014	 <control> */
-  {0x00000015, 0x000015},	/* U+0015	 <control> */
-  {0x00000016, 0x000016},	/* U+0016	 <control> */
-  {0x00000017, 0x000017},	/* U+0017	 <control> */
-  {0x00000018, 0x000018},	/* U+0018	 <control> */
-  {0x00000019, 0x000019},	/* U+0019	 <control> */
-  {0x0000001a, 0x00001a},	/* U+001A	 <control> */
-  {0x0000001b, 0x00001b},	/* U+001B	 <control> */
-  {0x0000001c, 0x00001c},	/* U+001C	 <control> */
-  {0x0000001d, 0x00001d},	/* U+001D	 <control> */
-  {0x0000001e, 0x00001e},	/* U+001E	 <control> */
-  {0x0000001f, 0x00001f},	/* U+001F	 <control> */
-  {0x00000020, 0x000020},	/* U+0020	 SPACE */
-  {0x00000021, 0x000021},	/* U+0021	 EXCLAMATION MARK */
-  {0x00000022, 0x000022},	/* U+0022	 QUOTATION MARK */
-  {0x00000023, 0x000023},	/* U+0023	 NUMBER SIGN */
-  {0x00000024, 0x000024},	/* U+0024	 DOLLAR SIGN */
-  {0x00000025, 0x000025},	/* U+0025	 PERCENT SIGN */
-  {0x00000026, 0x000026},	/* U+0026	 AMPERSAND */
-  {0x00000027, 0x000027},	/* U+0027	 APOSTROPHE */
-  {0x00000028, 0x000028},	/* U+0028	 LEFT PARENTHESIS */
-  {0x00000029, 0x000029},	/* U+0029	 RIGHT PARENTHESIS */
-  {0x0000002a, 0x00002a},	/* U+002A	 ASTERISK */
-  {0x0000002b, 0x00002b},	/* U+002B	 PLUS SIGN */
-  {0x0000002c, 0x00002c},	/* U+002C	 COMMA */
-  {0x0000002d, 0x00002d},	/* U+002D	 HYPHEN-MINUS */
-  {0x0000002e, 0x00002e},	/* U+002E	 FULL STOP */
-  {0x0000002f, 0x00002f},	/* U+002F	 SOLIDUS */
-  {0x00000030, 0x000030},	/* U+0030	 DIGIT ZERO */
-  {0x00000031, 0x000031},	/* U+0031	 DIGIT ONE */
-  {0x00000032, 0x000032},	/* U+0032	 DIGIT TWO */
-  {0x00000033, 0x000033},	/* U+0033	 DIGIT THREE */
-  {0x00000034, 0x000034},	/* U+0034	 DIGIT FOUR */
-  {0x00000035, 0x000035},	/* U+0035	 DIGIT FIVE */
-  {0x00000036, 0x000036},	/* U+0036	 DIGIT SIX */
-  {0x00000037, 0x000037},	/* U+0037	 DIGIT SEVEN */
-  {0x00000038, 0x000038},	/* U+0038	 DIGIT EIGHT */
-  {0x00000039, 0x000039},	/* U+0039	 DIGIT NINE */
-  {0x0000003a, 0x00003a},	/* U+003A	 COLON */
-  {0x0000003b, 0x00003b},	/* U+003B	 SEMICOLON */
-  {0x0000003c, 0x00003c},	/* U+003C	 LESS-THAN SIGN */
-  {0x0000003d, 0x00003d},	/* U+003D	 EQUALS SIGN */
-  {0x0000003e, 0x00003e},	/* U+003E	 GREATER-THAN SIGN */
-  {0x0000003f, 0x00003f},	/* U+003F	 QUESTION MARK */
-  {0x00000040, 0x000040},	/* U+0040	 COMMERCIAL AT */
-  {0x00000041, 0x000041},	/* U+0041	 LATIN CAPITAL LETTER A */
-  {0x00000042, 0x000042},	/* U+0042	 LATIN CAPITAL LETTER B */
-  {0x00000043, 0x000043},	/* U+0043	 LATIN CAPITAL LETTER C */
-  {0x00000044, 0x000044},	/* U+0044	 LATIN CAPITAL LETTER D */
-  {0x00000045, 0x000045},	/* U+0045	 LATIN CAPITAL LETTER E */
-  {0x00000046, 0x000046},	/* U+0046	 LATIN CAPITAL LETTER F */
-  {0x00000047, 0x000047},	/* U+0047	 LATIN CAPITAL LETTER G */
-  {0x00000048, 0x000048},	/* U+0048	 LATIN CAPITAL LETTER H */
-  {0x00000049, 0x000049},	/* U+0049	 LATIN CAPITAL LETTER I */
-  {0x0000004a, 0x00004a},	/* U+004A	 LATIN CAPITAL LETTER J */
-  {0x0000004b, 0x00004b},	/* U+004B	 LATIN CAPITAL LETTER K */
-  {0x0000004c, 0x00004c},	/* U+004C	 LATIN CAPITAL LETTER L */
-  {0x0000004d, 0x00004d},	/* U+004D	 LATIN CAPITAL LETTER M */
-  {0x0000004e, 0x00004e},	/* U+004E	 LATIN CAPITAL LETTER N */
-  {0x0000004f, 0x00004f},	/* U+004F	 LATIN CAPITAL LETTER O */
-  {0x00000050, 0x000050},	/* U+0050	 LATIN CAPITAL LETTER P */
-  {0x00000051, 0x000051},	/* U+0051	 LATIN CAPITAL LETTER Q */
-  {0x00000052, 0x000052},	/* U+0052	 LATIN CAPITAL LETTER R */
-  {0x00000053, 0x000053},	/* U+0053	 LATIN CAPITAL LETTER S */
-  {0x00000054, 0x000054},	/* U+0054	 LATIN CAPITAL LETTER T */
-  {0x00000055, 0x000055},	/* U+0055	 LATIN CAPITAL LETTER U */
-  {0x00000056, 0x000056},	/* U+0056	 LATIN CAPITAL LETTER V */
-  {0x00000057, 0x000057},	/* U+0057	 LATIN CAPITAL LETTER W */
-  {0x00000058, 0x000058},	/* U+0058	 LATIN CAPITAL LETTER X */
-  {0x00000059, 0x000059},	/* U+0059	 LATIN CAPITAL LETTER Y */
-  {0x0000005a, 0x00005a},	/* U+005A	 LATIN CAPITAL LETTER Z */
-  {0x0000005b, 0x00005b},	/* U+005B	 LEFT SQUARE BRACKET */
-  {0x0000005c, 0x00815f},	/* U+005C	 REVERSE SOLIDUS	Fullwidth: U+FF3C */
-  {0x0000005d, 0x00005d},	/* U+005D	 RIGHT SQUARE BRACKET */
-  {0x0000005e, 0x00005e},	/* U+005E	 CIRCUMFLEX ACCENT */
-  {0x0000005f, 0x00005f},	/* U+005F	 LOW LINE */
-  {0x00000060, 0x000060},	/* U+0060	 GRAVE ACCENT */
-  {0x00000061, 0x000061},	/* U+0061	 LATIN SMALL LETTER A */
-  {0x00000062, 0x000062},	/* U+0062	 LATIN SMALL LETTER B */
-  {0x00000063, 0x000063},	/* U+0063	 LATIN SMALL LETTER C */
-  {0x00000064, 0x000064},	/* U+0064	 LATIN SMALL LETTER D */
-  {0x00000065, 0x000065},	/* U+0065	 LATIN SMALL LETTER E */
-  {0x00000066, 0x000066},	/* U+0066	 LATIN SMALL LETTER F */
-  {0x00000067, 0x000067},	/* U+0067	 LATIN SMALL LETTER G */
-  {0x00000068, 0x000068},	/* U+0068	 LATIN SMALL LETTER H */
-  {0x00000069, 0x000069},	/* U+0069	 LATIN SMALL LETTER I */
-  {0x0000006a, 0x00006a},	/* U+006A	 LATIN SMALL LETTER J */
-  {0x0000006b, 0x00006b},	/* U+006B	 LATIN SMALL LETTER K */
-  {0x0000006c, 0x00006c},	/* U+006C	 LATIN SMALL LETTER L */
-  {0x0000006d, 0x00006d},	/* U+006D	 LATIN SMALL LETTER M */
-  {0x0000006e, 0x00006e},	/* U+006E	 LATIN SMALL LETTER N */
-  {0x0000006f, 0x00006f},	/* U+006F	 LATIN SMALL LETTER O */
-  {0x00000070, 0x000070},	/* U+0070	 LATIN SMALL LETTER P */
-  {0x00000071, 0x000071},	/* U+0071	 LATIN SMALL LETTER Q */
-  {0x00000072, 0x000072},	/* U+0072	 LATIN SMALL LETTER R */
-  {0x00000073, 0x000073},	/* U+0073	 LATIN SMALL LETTER S */
-  {0x00000074, 0x000074},	/* U+0074	 LATIN SMALL LETTER T */
-  {0x00000075, 0x000075},	/* U+0075	 LATIN SMALL LETTER U */
-  {0x00000076, 0x000076},	/* U+0076	 LATIN SMALL LETTER V */
-  {0x00000077, 0x000077},	/* U+0077	 LATIN SMALL LETTER W */
-  {0x00000078, 0x000078},	/* U+0078	 LATIN SMALL LETTER X */
-  {0x00000079, 0x000079},	/* U+0079	 LATIN SMALL LETTER Y */
-  {0x0000007a, 0x00007a},	/* U+007A	 LATIN SMALL LETTER Z */
-  {0x0000007b, 0x00007b},	/* U+007B	 LEFT CURLY BRACKET */
-  {0x0000007c, 0x00007c},	/* U+007C	 VERTICAL LINE */
-  {0x0000007d, 0x00007d},	/* U+007D	 RIGHT CURLY BRACKET */
-  {0x0000007e, 0x0081b0},	/* U+007E	 TILDE	[2000]	Fullwidth: U+FF5E */
-  {0x0000007f, 0x00007f},	/* U+007F	 <control> */
   {0x0000c2a0, 0x008541},	/* U+00A0	 NO-BREAK SPACE	[2000] */
   {0x0000c2a1, 0x008542},	/* U+00A1	 INVERTED EXCLAMATION MARK	[2000] */
   {0x0000c2a2, 0x008191},	/* U+00A2	 CENT SIGN	Windows: U+FFE0 */