diff --git a/examples/query/small/patentsQuery/LexPatsQuery.gfo b/examples/query/small/patentsQuery/LexPatsQuery.gfo
deleted file mode 100644
index 95cf7d052..000000000
Binary files a/examples/query/small/patentsQuery/LexPatsQuery.gfo and /dev/null differ
diff --git a/examples/query/small/patentsQuery/LexPatsQueryEng.gfo b/examples/query/small/patentsQuery/LexPatsQueryEng.gfo
deleted file mode 100644
index 40ce22fd4..000000000
Binary files a/examples/query/small/patentsQuery/LexPatsQueryEng.gfo and /dev/null differ
diff --git a/examples/query/small/patentsQuery/QueryI.gf b/examples/query/small/patentsQuery/QueryI.gf
index 8c63e7dfb..3ec88697c 100644
--- a/examples/query/small/patentsQuery/QueryI.gf
+++ b/examples/query/small/patentsQuery/QueryI.gf
@@ -1,8 +1,9 @@
 --# -path=.:..:alltenses
 
 incomplete concrete QueryI of Query = open
+  LexQuery,
   Syntax,
-  Lang,
+  (Lang = Lang),
   Prelude
 in {
 
@@ -35,9 +36,9 @@ lin
         | mkNP (mkNP thePl_Det name_N) (mkAdv possess_Prep s)
         ---- s's names
     in
-      mkUtt (mkImp (mkVP give_V3 (mkNP i_Pron) ss))
-    | mkUtt (mkQS (mkQCl (L.CompIP whatSg_IP) ss))
-    | mkUtt (mkQS (mkQCl (L.CompIP (L.IdetIP (mkIDet which_IQuant))) ss))
+      mkUtt (mkImp (mkVP LexQuery.give_V3 (mkNP i_Pron) ss))
+    | mkUtt (mkQS (mkQCl (Lang.CompIP whatSg_IP) ss))
+    | mkUtt (mkQS (mkQCl (Lang.CompIP (Lang.IdetIP (mkIDet which_IQuant))) ss))
     | mkUtt ss ;
 
   QWhere s = mkUtt (mkQS (mkQCl where_IAdv s)) ;
@@ -45,10 +46,10 @@ lin
     let
       info : NP = mkNP all_Predet (mkNP (mkNP information_N) (mkAdv about_Prep s)) ;
     in
-      mkUtt (mkImp (mkVP give_V3 (mkNP i_Pron) info))
+      mkUtt (mkImp (mkVP LexQuery.give_V3 (mkNP i_Pron) info))
     | mkUtt info ;
 
-  QCalled i = mkUtt (mkQS (mkQCl how_IAdv (mkCl i (mkVP also_AdV (mkVP called_A))))) ;
+---  QCalled i = mkUtt (mkQS (mkQCl how_IAdv (mkCl i (mkVP also_AdV (mkVP called_A))))) ;
 
   AKind s k = mkUtt (mkCl s (mkNP aPl_Det k)) ; ---- a, fun of s
   AProp s p = mkUtt (mkCl s p) ;
@@ -80,25 +81,6 @@ lin
      mkCN k (mkRS (mkRCl that_RP p)) ;
   KRel r = r.cn ;
 
-oper
--- structural words
-  about_Prep = mkPrep "about" ;
-  all_NP = mkNP (mkPN "all") ; ---
-  also_AdV = mkAdV "also" | mkAdV "otherwise" ;
-  as_Prep = mkPrep "as" ;
-  at_Prep = mkPrep "at" ;
-  called_A = mkA "called" | mkA "named" ;
-  give_V3 = mkV3 give_V ;
-  information_N = mkN "information" ;
-  other_A = mkA "other" ;
-  name_N = mkN "name" ;
 
--- lexical constructors
-  mkName : Str -> NP =
-    \s -> mkNP (mkPN s) ;
-
-oper  
- mkRelation : Str -> {cn : CN ; prep : Prep} =
-    \s -> {cn = mkCN (mkN s) ; prep = possess_Prep} ;
 
 }
diff --git a/examples/query/small/patentsQuery/QueryPat.gfo b/examples/query/small/patentsQuery/QueryPat.gfo
deleted file mode 100644
index 791f96fb0..000000000
Binary files a/examples/query/small/patentsQuery/QueryPat.gfo and /dev/null differ
diff --git a/examples/query/small/patentsQuery/QueryPatEng.gf b/examples/query/small/patentsQuery/QueryPatEng.gf
index 78489449d..c07a57cab 100644
--- a/examples/query/small/patentsQuery/QueryPatEng.gf
+++ b/examples/query/small/patentsQuery/QueryPatEng.gf
@@ -1,4 +1,4 @@
---# -path=.:..:alltenses
+--# -path=.:alltenses
 
 concrete QueryPatEng of QueryPat = QueryEng ** open
   SyntaxEng,
diff --git a/examples/query/small/patentsQuery/QueryPatEng.gfo b/examples/query/small/patentsQuery/QueryPatEng.gfo
deleted file mode 100644
index 1614e51af..000000000
Binary files a/examples/query/small/patentsQuery/QueryPatEng.gfo and /dev/null differ
diff --git a/examples/query/small/patentsQuery/QueryPatI.gfo b/examples/query/small/patentsQuery/QueryPatI.gfo
deleted file mode 100644
index fe61c9d58..000000000
Binary files a/examples/query/small/patentsQuery/QueryPatI.gfo and /dev/null differ