diff --git a/source/texk/web2c/uptexdir/uptex-m.ch b/source/texk/web2c/uptexdir/uptex-m.ch
index fb7d2e46b..505b45946 100644
--- a/source/texk/web2c/uptexdir/uptex-m.ch
+++ b/source/texk/web2c/uptexdir/uptex-m.ch
@@ -1140,39 +1140,6 @@ begin
   {ending (largest) character code}
 @z
 
-@x
-@!char_base: ^integer;
-  {base addresses for |char_info|}
-@y
-@!char_base: ^integer;
-  {base addresses for |char_info|}
-@!char_attr_base: ^integer; {for OFM}
-@!ivalues_start: ^integer; {for OFM}
-@!fvalues_start: ^integer; {for OFM}
-@!mvalues_start: ^integer; {for OFM}
-@!rules_start: ^integer; {for OFM}
-@!glues_start: ^integer; {for OFM}
-@!penalties_start: ^integer; {for OFM}
-@!ivalues_base: ^integer; {for OFM}
-@!fvalues_base: ^integer; {for OFM}
-@!mvalues_base: ^integer; {for OFM}
-@!rules_base: ^integer; {for OFM}
-@!glues_base: ^integer; {for OFM}
-@!penalties_base: ^integer; {for OFM}
-@z
-
-@x
-@d kchar_code_end(#)==#].hh.rh
-@d kchar_code(#)==font_info[ctype_base[#]+kchar_code_end
-@d kchar_type_end(#)==#].hh.lhfield
-@d kchar_type(#)==font_info[ctype_base[#]+kchar_type_end
-@y
-@d kchar_code_end(#)==#].hh.rh
-@d kchar_code(#)==font_info[ctype_base[#]+kchar_code_end
-@d kchar_type_end(#)==#].hh.lhfield
-@d kchar_type(#)==font_info[ctype_base[#]+kchar_type_end
-@z
-
 @x
 @d char_width_end(#)==#.b0].sc
 @d char_width(#)==font_info[width_base[#]+char_width_end
@@ -1523,50 +1490,6 @@ bch_label:=@'77777; bchar:=256;
 bch_label:=@'77777; bchar:=max_latin_val;
 @z
 
-@x
-    if a>128 then
-      begin if 256*c+d>=nl then abort;
-      if a=255 then if k=lig_kern_base[f] then bchar:=b;
-      end
-    else begin if b<>bchar then check_existence(b);
-      if c<128 then begin
-        if jfm_flag<>dir_default then
-          begin if 256*c+d>=ne then abort; end {check glue}
-        else check_existence(d); {check ligature}
-        end
-      else if 256*(c-128)+d>=nk then abort; {check kern}
-      if a<128 then if k-lig_kern_base[f]+a+1>=nl then abort;
-      end;
-    end;
-  if a=255 then bch_label:=256*c+d;
-  end;
-@y
-    if a>128 then
-      begin if 256*c+d>=nl then abort;
-      if a=255 then if k=lig_kern_base[f] then bchar:=b;
-      end
-    else begin if b<>bchar then check_existence(b);
-      if c<128 then begin
-        if jfm_flag<>dir_default then
-          begin if 256*c+d>=ne then abort; end {check glue}
-        else check_existence(d); {check ligature}
-        end
-      else if 256*(c-128)+d>=nk then abort; {check kern}
-      if a<128 then if k-lig_kern_base[f]+a+1>=nl then abort;
-      end;
-    end;
-  if a=255 then bch_label:=256*c+d;
-  end;
-@z
-
-@x
-adjust(ctype_base);
-adjust(char_base); adjust(width_base); adjust(lig_kern_base);
-@y
-adjust(ctype_base);
-adjust(char_base); adjust(width_base); adjust(lig_kern_base);
-@z
-
 @x
 @p procedure char_warning(@!f:internal_font_number;@!c:eight_bits);
 @y
@@ -1906,14 +1829,6 @@ if trie_max<h+max_hyph_char then
   until trie_max=h+max_hyph_char;
 @z
 
-@x
-if l<256 then
-  begin if z<256 then ll:=z @+else ll:=256;
-@y
-if l<256 then
-  begin if z<256 then ll:=z @+else ll:=256;
-@z
-
 @x
   begin for r:=0 to 256 do clear_trie;
   trie_max:=256;
@@ -2385,14 +2300,6 @@ if (t<cs_token_flag+single_base) then
   begin c:=t mod max_char_val;
 @z
 
-@x
-dump_things(ctype_base[null_font], font_ptr+1-null_font);
-dump_things(char_base[null_font], font_ptr+1-null_font);
-@y
-dump_things(ctype_base[null_font], font_ptr+1-null_font);
-dump_things(char_base[null_font], font_ptr+1-null_font);
-@z
-
 @x
 font_bc:=xmalloc_array(eight_bits, font_max);
 font_ec:=xmalloc_array(eight_bits, font_max);
@@ -2401,22 +2308,6 @@ font_bc:=xmalloc_array(sixteen_bits, font_max);
 font_ec:=xmalloc_array(sixteen_bits, font_max);
 @z
 
-@x
-ctype_base:=xmalloc_array(integer, font_max);
-char_base:=xmalloc_array(integer, font_max);
-@y
-ctype_base:=xmalloc_array(integer, font_max);
-char_base:=xmalloc_array(integer, font_max);
-@z
-
-@x
-undump_things(ctype_base[null_font], font_ptr+1-null_font);
-undump_things(char_base[null_font], font_ptr+1-null_font);
-@y
-undump_things(ctype_base[null_font], font_ptr+1-null_font);
-undump_things(char_base[null_font], font_ptr+1-null_font);
-@z
-
 @x
   font_bc:=xmalloc_array(eight_bits, font_max);
   font_ec:=xmalloc_array(eight_bits, font_max);
@@ -2425,20 +2316,6 @@ undump_things(char_base[null_font], font_ptr+1-null_font);
   font_ec:=xmalloc_array(sixteen_bits, font_max);
 @z
 
-@x
-  ctype_base:=xmalloc_array(integer, font_max);
-  char_base:=xmalloc_array(integer, font_max);
-@y
-  ctype_base:=xmalloc_array(integer, font_max);
-  char_base:=xmalloc_array(integer, font_max);
-@z
-
-@x
-  ctype_base[null_font]:=0; char_base[null_font]:=0; width_base[null_font]:=0;
-@y
-  ctype_base[null_font]:=0; char_base[null_font]:=0; width_base[null_font]:=0;
-@z
-
 @x
 @ @<Scan the font encoding specification@>=
 begin jfm_enc:=0;