diff --git a/src/toki-pona/CatTok.gf b/src/toki-pona/CatTok.gf
index 19d5a835c..7f6e13d33 100644
--- a/src/toki-pona/CatTok.gf
+++ b/src/toki-pona/CatTok.gf
@@ -73,7 +73,7 @@ concrete CatTok of Cat = CommonX ** open ResTok, Coordination, Prelude in {
 
 -- Constructed in StructuralTok.
     Conj = Coordination.ConjunctionDistr ** {
-        n : Number -- The number of the NP that results from
+        -- n : Number -- The number of the NP that results from
                    -- coordinating a list of NPs with that Conj.
         } ;        -- "[Ann and Bob] are children" → and_Conj.n = Pl
     Subj = SS ;
diff --git a/src/toki-pona/NounTok.gf b/src/toki-pona/NounTok.gf
index 80dfe0556..aeb70119c 100644
--- a/src/toki-pona/NounTok.gf
+++ b/src/toki-pona/NounTok.gf
@@ -9,7 +9,7 @@ concrete NounTok of Noun = CatTok ** open ResTok, Prelude in {
 
 -- : Det -> CN -> NP
     DetCN det cn = emptyNP ** {
-      s = cn.s ! det.n ++ det.s
+      s = cn.s ++ det.s
       } ;
 {-
   -- : PN -> NP ;
@@ -65,8 +65,7 @@ concrete NounTok of Noun = CatTok ** open ResTok, Prelude in {
 
   -- : Quant -> Num -> Det ;
     DetQuant quant num = quant ** {
-      s = quant.s ! num.n ++ num.s ;
-      n = num.n ;
+      s = quant.s ++ num.s
       } ;
 
   -- : Quant -> Num -> Ord -> Det ;
@@ -81,9 +80,6 @@ concrete NounTok of Noun = CatTok ** open ResTok, Prelude in {
 -- the "kernel" of a determiner. It is, however, the $Num$ that determines
 -- the inherent number.
 
-  NumSg = {s = [] ; n = Sg} ;
-  NumPl = {s = [] ; n = Pl} ;
-
 {-
   -- : Card -> Num ;    -- two
   NumCard card = card ;
diff --git a/src/toki-pona/SentenceTok.gf b/src/toki-pona/SentenceTok.gf
index 42e15ef15..bfe64ad98 100644
--- a/src/toki-pona/SentenceTok.gf
+++ b/src/toki-pona/SentenceTok.gf
@@ -13,7 +13,7 @@ lin
     subj = np.s ; -- ! Nom, if there are cases
     pred =
      -- table {something with tense+polarity =>
-            vp.s ! TODOVF np.n np.p
+            vp.s
             -- TODO: all of the VP's tense and polarity should be open here!
             -- PredVP only decides the subject.
      -- }
diff --git a/src/toki-pona/StructuralTok.gf b/src/toki-pona/StructuralTok.gf
index d100d13f1..9ec4d467d 100644
--- a/src/toki-pona/StructuralTok.gf
+++ b/src/toki-pona/StructuralTok.gf
@@ -43,10 +43,10 @@ lin there_Adv = ss "" ;
 -- which means that there are two fields for the strings, and
 -- n:Number which specifies the number of the resulting NP.
 
-lin and_Conj = {s1 = [] ; s2 = "and" ; n = Pl} ;
+lin and_Conj = {s1 = [] ; s2 = "and" } ;
 -- lin or_Conj =
 -- lin if_then_Conj =
-lin both7and_DConj = {s1 = "both" ; s2 = "and" ; n = Pl} ;
+lin both7and_DConj = {s1 = "both" ; s2 = "and" } ;
 -- lin either7or_DConj =
 
 -- lin but_PConj =