4 files changed, 9 insertions, 17 deletions
diff --git a/lib/expression/_readme.rst b/lib/expression/_readme.rst
index 729a950..59c4687 100644
--- a/lib/expression/_readme.rst
+++ b/lib/expression/_readme.rst
@@ -26,13 +26,6 @@ Simple transformations
 Composed transformations
 ------------------------
 
-:Filter:
-
-    Generate the filters in the query. This module identify if one the
-    expression is actually a group window and handle a special case for this.
-
-    This module relies on Ast
-
 :Query:
 
     Build an sql query. This module relies on Type_of
diff --git a/lib/expression/dune b/lib/expression/dune
index 8bf6e62..5f5a12c 100755
--- a/lib/expression/dune
+++ b/lib/expression/dune
@@ -2,7 +2,6 @@
  (name importExpression)
  (libraries 
    re
-   importCSV
    importDataTypes
    importErrors
  )
diff --git a/lib/expression/query.ml b/lib/expression/query.ml
index e648daf..8ff179d 100644
--- a/lib/expression/query.ml
+++ b/lib/expression/query.ml
@@ -6,7 +6,7 @@ open StdLabels
     in order to tell if we need to bind the parameters in the query, or if we
     can use plain literal as is (with some risk at the execution time. *)
 type _ binded_query =
-  | BindParam : ImportCSV.DataType.t Queue.t binded_query
+  | BindParam : ImportDataTypes.Value.t Queue.t binded_query
   | NoParam : unit binded_query
 
 module QueryParameter = struct
@@ -17,7 +17,7 @@ module QueryParameter = struct
       The Raw can be generated from both BindParam or NoParam queries. *)
   type t =
     | Literal
-    | Queue of ImportCSV.DataType.t Queue.t
+    | Queue of ImportDataTypes.Value.t Queue.t
     | Raw of t
 
   (** Wrap the given parameter mode into the raw mode *)
@@ -100,7 +100,7 @@ module Query = TypeBuilder.Make (struct
         Format.fprintf formatter "'%s'" l
     | QueryParameter.Queue queue ->
         Format.fprintf formatter "?";
-        Queue.add (ImportCSV.DataType.Content l) queue
+        Queue.add (ImportDataTypes.Value.Content l) queue
     | QueryParameter.Raw _ -> Format.fprintf formatter "%s" l
 
   let integer : string -> 'a Type_of.obs -> 'a repr =
diff --git a/lib/expression/query.mli b/lib/expression/query.mli
index fa789a9..a124be4 100644
--- a/lib/expression/query.mli
+++ b/lib/expression/query.mli
@@ -1,17 +1,17 @@
 module QueryParameter : sig
-  (** Internaly, we need to keep a different type for the Literal chunks
-    (which requires to be quoted), and raw (which should be given as is to the
-    sql engine) 
+  (** Internaly, we need to keep a different type for the Literal chunks (which
+      requires to be quoted), and raw (which should be given as is to the sql
+      engine)
 
-    The Raw can be generated from both BindParam or NoParam queries. *)
+      The Raw can be generated from both BindParam or NoParam queries. *)
   type t =
     | Literal
-    | Queue of ImportCSV.DataType.t Queue.t
+    | Queue of ImportDataTypes.Value.t Queue.t
     | Raw of t
 end
 
 type _ binded_query =
-  | BindParam : ImportCSV.DataType.t Queue.t binded_query
+  | BindParam : ImportDataTypes.Value.t Queue.t binded_query
   | NoParam : unit binded_query
 
 val query_of_expression :