diff --git a/dbgen/queries/1.sql b/dbgen/queries/1.sql
index d0309599..e62cab0a 100644
--- a/dbgen/queries/1.sql
+++ b/dbgen/queries/1.sql
@@ -25,4 +25,3 @@ group by
 order by
 	l_returnflag,
 	l_linestatus;
-:n -1
diff --git a/dbgen/queries/10.sql b/dbgen/queries/10.sql
index aa52f8ea..29da07dc 100644
--- a/dbgen/queries/10.sql
+++ b/dbgen/queries/10.sql
@@ -34,5 +34,5 @@ group by
 	c_address,
 	c_comment
 order by
-	revenue desc;
+	revenue desc
 :n 20
diff --git a/dbgen/queries/11.sql b/dbgen/queries/11.sql
index 8d8b7445..dd23c7e7 100644
--- a/dbgen/queries/11.sql
+++ b/dbgen/queries/11.sql
@@ -31,4 +31,3 @@ group by
 		)
 order by
 	value desc;
-:n -1
diff --git a/dbgen/queries/12.sql b/dbgen/queries/12.sql
index 2cc7a0f8..b9e9575e 100644
--- a/dbgen/queries/12.sql
+++ b/dbgen/queries/12.sql
@@ -32,4 +32,3 @@ group by
 	l_shipmode
 order by
 	l_shipmode;
-:n -1
diff --git a/dbgen/queries/13.sql b/dbgen/queries/13.sql
index 20dd693e..4c404e22 100644
--- a/dbgen/queries/13.sql
+++ b/dbgen/queries/13.sql
@@ -24,4 +24,3 @@ group by
 order by
 	custdist desc,
 	c_count desc;
-:n -1
diff --git a/dbgen/queries/14.sql b/dbgen/queries/14.sql
index 27c5b479..f0308c90 100644
--- a/dbgen/queries/14.sql
+++ b/dbgen/queries/14.sql
@@ -17,4 +17,3 @@ where
 	l_partkey = p_partkey
 	and l_shipdate >= date ':1'
 	and l_shipdate < date ':1' + interval '1' month;
-:n -1
diff --git a/dbgen/queries/15.sql b/dbgen/queries/15.sql
index 77fe2a40..c1140d4c 100644
--- a/dbgen/queries/15.sql
+++ b/dbgen/queries/15.sql
@@ -37,4 +37,3 @@ order by
 	s_suppkey;
 
 drop view revenue:s;
-:n -1
diff --git a/dbgen/queries/16.sql b/dbgen/queries/16.sql
index f07a9657..b464cfb7 100644
--- a/dbgen/queries/16.sql
+++ b/dbgen/queries/16.sql
@@ -34,4 +34,3 @@ order by
 	p_brand,
 	p_type,
 	p_size;
-:n -1
diff --git a/dbgen/queries/17.sql b/dbgen/queries/17.sql
index bca3f1bb..cee30969 100644
--- a/dbgen/queries/17.sql
+++ b/dbgen/queries/17.sql
@@ -21,4 +21,3 @@ where
 		where
 			l_partkey = p_partkey
 	);
-:n -1
diff --git a/dbgen/queries/18.sql b/dbgen/queries/18.sql
index 3f7e1256..25231241 100644
--- a/dbgen/queries/18.sql
+++ b/dbgen/queries/18.sql
@@ -35,5 +35,5 @@ group by
 	o_totalprice
 order by
 	o_totalprice desc,
-	o_orderdate;
+	o_orderdate
 :n 100
diff --git a/dbgen/queries/19.sql b/dbgen/queries/19.sql
index a9c6e5d5..1c6a9a65 100644
--- a/dbgen/queries/19.sql
+++ b/dbgen/queries/19.sql
@@ -39,4 +39,3 @@ where
 		and l_shipmode in ('AIR', 'AIR REG')
 		and l_shipinstruct = 'DELIVER IN PERSON'
 	);
-:n -1
diff --git a/dbgen/queries/2.sql b/dbgen/queries/2.sql
index 2c941f5a..db679f27 100644
--- a/dbgen/queries/2.sql
+++ b/dbgen/queries/2.sql
@@ -46,5 +46,5 @@ order by
 	s_acctbal desc,
 	n_name,
 	s_name,
-	p_partkey;
+	p_partkey
 :n 100
diff --git a/dbgen/queries/20.sql b/dbgen/queries/20.sql
index 23cecc76..ae8499d8 100644
--- a/dbgen/queries/20.sql
+++ b/dbgen/queries/20.sql
@@ -41,4 +41,3 @@ where
 	and n_name = ':3'
 order by
 	s_name;
-:n -1
diff --git a/dbgen/queries/21.sql b/dbgen/queries/21.sql
index 380bcfd8..de32786e 100644
--- a/dbgen/queries/21.sql
+++ b/dbgen/queries/21.sql
@@ -42,5 +42,5 @@ group by
 	s_name
 order by
 	numwait desc,
-	s_name;
+	s_name
 :n 100
diff --git a/dbgen/queries/22.sql b/dbgen/queries/22.sql
index 3cf5b615..4f4629c4 100644
--- a/dbgen/queries/22.sql
+++ b/dbgen/queries/22.sql
@@ -41,4 +41,3 @@ group by
 	cntrycode
 order by
 	cntrycode;
-:n -1
diff --git a/dbgen/queries/3.sql b/dbgen/queries/3.sql
index 7c388289..2381f3f4 100644
--- a/dbgen/queries/3.sql
+++ b/dbgen/queries/3.sql
@@ -25,5 +25,5 @@ group by
 	o_shippriority
 order by
 	revenue desc,
-	o_orderdate;
+	o_orderdate
 :n 10
diff --git a/dbgen/queries/4.sql b/dbgen/queries/4.sql
index 8a99c8d4..75d13546 100644
--- a/dbgen/queries/4.sql
+++ b/dbgen/queries/4.sql
@@ -25,4 +25,3 @@ group by
 	o_orderpriority
 order by
 	o_orderpriority;
-:n -1
diff --git a/dbgen/queries/5.sql b/dbgen/queries/5.sql
index 499a735f..670de027 100644
--- a/dbgen/queries/5.sql
+++ b/dbgen/queries/5.sql
@@ -28,4 +28,3 @@ group by
 	n_name
 order by
 	revenue desc;
-:n -1
diff --git a/dbgen/queries/6.sql b/dbgen/queries/6.sql
index 8698a28a..aeb3417e 100644
--- a/dbgen/queries/6.sql
+++ b/dbgen/queries/6.sql
@@ -13,4 +13,3 @@ where
 	and l_shipdate < date ':1' + interval '1' year
 	and l_discount between :2 - 0.01 and :2 + 0.01
 	and l_quantity < :3;
-:n -1
diff --git a/dbgen/queries/7.sql b/dbgen/queries/7.sql
index d1a4441b..0f952945 100644
--- a/dbgen/queries/7.sql
+++ b/dbgen/queries/7.sql
@@ -43,4 +43,3 @@ order by
 	supp_nation,
 	cust_nation,
 	l_year;
-:n -1
diff --git a/dbgen/queries/8.sql b/dbgen/queries/8.sql
index 677e06f2..95776583 100644
--- a/dbgen/queries/8.sql
+++ b/dbgen/queries/8.sql
@@ -41,4 +41,3 @@ group by
 	o_year
 order by
 	o_year;
-:n -1
diff --git a/dbgen/queries/9.sql b/dbgen/queries/9.sql
index 1d635117..6ecd69ed 100644
--- a/dbgen/queries/9.sql
+++ b/dbgen/queries/9.sql
@@ -36,4 +36,3 @@ group by
 order by
 	nation,
 	o_year desc;
-:n -1