diff --git a/extra/zoneinfo/zoneinfo.factor b/extra/zoneinfo/zoneinfo.factor
index 08927bb31d..ed9d3a6bdb 100644
--- a/extra/zoneinfo/zoneinfo.factor
+++ b/extra/zoneinfo/zoneinfo.factor
@@ -32,8 +32,6 @@ TUPLE: raw-leap year month day hms corr r/s ;
 
 TUPLE: zone name ;
 TUPLE: rule name from to at-time ;
-TUPLE: link ;
-TUPLE: leap ;
 
 : rule-to ( m string -- m n )
     {
@@ -42,9 +40,6 @@ TUPLE: leap ;
         [ string>number ]
     } case ;
 
-: raw-rule>rule ( raw-rule -- rule )
-    ;
-
 : parse-rule ( seq -- rule )
     [
         {
@@ -61,9 +56,6 @@ TUPLE: leap ;
         } spread
     ] input<sequence raw-rule boa ;
 
-: raw-zone>zone ( raw-zone -- zone )
-    ;
-
 : parse-zone ( seq -- zone )
     {
         [ second ]
@@ -82,9 +74,6 @@ TUPLE: leap ;
         [ 3 tail harvest ]
     } cleave raw-zone boa ;
 
-: raw-link>link ( raw-link -- link )
-    ;
-
 : parse-link ( seq -- link )
     [
         {
@@ -94,9 +83,6 @@ TUPLE: leap ;
         } spread
     ] input<sequence raw-link boa ;
 
-: raw-leap>leap ( raw-leap -- leap )
-    ;
-
 : parse-leap ( seq -- link )
     [
         {
@@ -113,10 +99,10 @@ TUPLE: leap ;
 : parse-line ( seq -- tuple )
     dup first >lower
     {
-        { "zone" [ parse-zone dup last-zone set raw-zone>zone ] }
-        { "rule" [ parse-rule raw-rule>rule ] }
-        { "link" [ parse-link raw-link>link ] }
-        { "leap" [ parse-leap raw-leap>leap ] }
+        { "zone" [ parse-zone dup last-zone set ] }
+        { "rule" [ parse-rule ] }
+        { "link" [ parse-link ] }
+        { "leap" [ parse-leap ] }
         [ drop harvest parse-partial-zone ]
     } case ;
 
@@ -132,7 +118,6 @@ MEMO: zoneinfo-files ( -- seq )
 MEMO: zoneinfo-array ( -- seq )
     zoneinfo-files concat ;
 
-
 : raw-rule-map ( -- assoc )
     zoneinfo-array [ raw-rule? ] filter [ name>> ] collect-by ;