diff --git a/.github/workflows/ci-dgraph-fuzz.yml b/.github/workflows/ci-dgraph-fuzz.yml
new file mode 100644
index 00000000000..0be22f1570e
--- /dev/null
+++ b/.github/workflows/ci-dgraph-fuzz.yml
@@ -0,0 +1,37 @@
+name: ci-dgraph-fuzz
+on:
+  push:
+    branches:
+      - main
+      - 'release/**'
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+    branches:
+      - main
+      - 'release/**'
+  schedule:
+    - cron: "0 */8 * * *" # every 8hrs
+jobs:
+  fuzz-test:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Get Go Version
+        run: |
+          #!/bin/bash
+          GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
+          echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GOVERSION }}
+      - name: Run fuzz tests
+        run: |
+          #!/bin/bash
+          # go env settings
+          export GOPATH=~/go
+          go test ./dql -fuzz="Fuzz" -fuzztime="300s" -fuzzminimizetime="120s"
diff --git a/.gitignore b/.gitignore
index 8d8224a240b..e1740a52822 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,11 +4,6 @@
 /dgraph-bulk-loader
 /osx-docker-gopath
 
-# fuzzing output
-dql/dql-fuzz.zip
-dql/fuzz-data/crashers
-dql/fuzz-data/suppressions
-
 # goland project folder
 .idea
 dgraph.iml
diff --git a/dql/fuzz-data/corpus/02e9b80a4f835ecd1fbffd3ca9c564f7d95e9cc0 b/dql/fuzz-data/corpus/02e9b80a4f835ecd1fbffd3ca9c564f7d95e9cc0
deleted file mode 100644
index 0d1fc02390d..00000000000
--- a/dql/fuzz-data/corpus/02e9b80a4f835ecd1fbffd3ca9c564f7d95e9cc0
+++ /dev/null
@@ -1 +0,0 @@
-{e(func:uid(L))m(func:uid(J))u(func:uid(K))r(func:uid(0x0a)){L AS s}r(func:uid(0x0a)){J AS s}r(func:uid(0x0a)){K AS s}}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/03f773418fcce70c93ad305c9bb36decddfa928a b/dql/fuzz-data/corpus/03f773418fcce70c93ad305c9bb36decddfa928a
deleted file mode 100644
index dc42ad45cb2..00000000000
--- a/dql/fuzz-data/corpus/03f773418fcce70c93ad305c9bb36decddfa928a
+++ /dev/null
@@ -1 +0,0 @@
-{e(func:uid(L),orderasc:val(c)){val(c)L as s{x as e}a as min(val(x))b as max(val(x))c as math(a+b)}}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/10919f4425629e42fa6e643fc0840ad95b1f3bec b/dql/fuzz-data/corpus/10919f4425629e42fa6e643fc0840ad95b1f3bec
deleted file mode 100644
index 5c651b42712..00000000000
--- a/dql/fuzz-data/corpus/10919f4425629e42fa6e643fc0840ad95b1f3bec
+++ /dev/null
@@ -1 +0,0 @@
-{K AS r(func:uid()){fr as s}e(func:uid(fr))@filter(uid(K)){e@filter(uid(fr))}}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/13b762a964b6b62debab41ae7d0be7297a422fac b/dql/fuzz-data/corpus/13b762a964b6b62debab41ae7d0be7297a422fac
deleted file mode 100644
index 1fc91548bc5..00000000000
--- a/dql/fuzz-data/corpus/13b762a964b6b62debab41ae7d0be7297a422fac
+++ /dev/null
@@ -1 +0,0 @@
-query y($a:t,$b:t,$""}}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/20379b8b5d28f8132266482910674262418fa284 b/dql/fuzz-data/corpus/20379b8b5d28f8132266482910674262418fa284
deleted file mode 100644
index 336cfb52a15..00000000000
--- a/dql/fuzz-data/corpus/20379b8b5d28f8132266482910674262418fa284
+++ /dev/null
@@ -1 +0,0 @@
-{e(func:uid(0)){@filter(p(e,//i))}}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/36c807ad68d5ff2080edc69e1dd2e01a0a196de1 b/dql/fuzz-data/corpus/36c807ad68d5ff2080edc69e1dd2e01a0a196de1
deleted file mode 100644
index 1df29e59426..00000000000
--- a/dql/fuzz-data/corpus/36c807ad68d5ff2080edc69e1dd2e01a0a196de1
+++ /dev/null
@@ -1 +0,0 @@
-{e(){{@facets(1,2,3)}}}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/3d40bd6c0f24308dc0883d3ff50b556c97e0af82 b/dql/fuzz-data/corpus/3d40bd6c0f24308dc0883d3ff50b556c97e0af82
deleted file mode 100644
index 9e40d30f524..00000000000
--- a/dql/fuzz-data/corpus/3d40bd6c0f24308dc0883d3ff50b556c97e0af82
+++ /dev/null
@@ -1,3 +0,0 @@
-
-	{
-		m(func:uid(J)){name}u(func:uid(K)){name}r(func:uid(0x0a)){L AS friends}r(func:uid(0x0a)){J AS friends}r(func:uid(0x0a)){K AS friends}}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/4f6c723629adae83f3bc4d61e8af70a8bc755afb b/dql/fuzz-data/corpus/4f6c723629adae83f3bc4d61e8af70a8bc755afb
deleted file mode 100644
index 45cf5abae49..00000000000
--- a/dql/fuzz-data/corpus/4f6c723629adae83f3bc4d61e8af70a8bc755afb
+++ /dev/null
@@ -1 +0,0 @@
-{e(func:uid()){Friend{Count}}}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/60fd4bd0c7755da5460a22b7ee03d464d3f21213 b/dql/fuzz-data/corpus/60fd4bd0c7755da5460a22b7ee03d464d3f21213
deleted file mode 100644
index a26118eea49..00000000000
--- a/dql/fuzz-data/corpus/60fd4bd0c7755da5460a22b7ee03d464d3f21213
+++ /dev/null
@@ -1 +0,0 @@
-{e(func:uid(0)){d(orderasc:e@n:r)}}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/67540078276cb3966d5206cdcb7babc94a22c4ef b/dql/fuzz-data/corpus/67540078276cb3966d5206cdcb7babc94a22c4ef
deleted file mode 100644
index 6c15aa0921a..00000000000
--- a/dql/fuzz-data/corpus/67540078276cb3966d5206cdcb7babc94a22c4ef
+++ /dev/null
@@ -1 +0,0 @@
-fragment t t t d{}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/7c58b5f3b2ec9e938153e3c4a25abee1ef41e009 b/dql/fuzz-data/corpus/7c58b5f3b2ec9e938153e3c4a25abee1ef41e009
deleted file mode 100644
index cccfb5e0788..00000000000
--- a/dql/fuzz-data/corpus/7c58b5f3b2ec9e938153e3c4a25abee1ef41e009
+++ /dev/null
@@ -1 +0,0 @@
-{e(func:uid()){Friend}}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/7d8add83c5c42e5d52ad98228753acbeb36b485f b/dql/fuzz-data/corpus/7d8add83c5c42e5d52ad98228753acbeb36b485f
deleted file mode 100644
index 62946075207..00000000000
--- a/dql/fuzz-data/corpus/7d8add83c5c42e5d52ad98228753acbeb36b485f
+++ /dev/null
@@ -1 +0,0 @@
-{e()@filter(p(t,//fLaGs))}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/84bffcf19c47c3a9cd19e88c846eba53694ccb94 b/dql/fuzz-data/corpus/84bffcf19c47c3a9cd19e88c846eba53694ccb94
deleted file mode 100644
index 5152aec0fbf..00000000000
--- a/dql/fuzz-data/corpus/84bffcf19c47c3a9cd19e88c846eba53694ccb94
+++ /dev/null
@@ -1 +0,0 @@
-{e(func:regexp(e,/\/'')/))}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/88c9ac2f65593ccdf319a7683c20aba8f725900f b/dql/fuzz-data/corpus/88c9ac2f65593ccdf319a7683c20aba8f725900f
deleted file mode 100644
index 051d1c36267..00000000000
--- a/dql/fuzz-data/corpus/88c9ac2f65593ccdf319a7683c20aba8f725900f
+++ /dev/null
@@ -1 +0,0 @@
-{e(){@facets(s,o
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/8bd480f32572a50edce44fe713f1f034dc51d9e0 b/dql/fuzz-data/corpus/8bd480f32572a50edce44fe713f1f034dc51d9e0
deleted file mode 100644
index e02ae87ad7f..00000000000
--- a/dql/fuzz-data/corpus/8bd480f32572a50edce44fe713f1f034dc51d9e0
+++ /dev/null
@@ -1 +0,0 @@
-{e(){@filter(near([]]
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/95c6c7b3b84fcb805642d68fd5b80a824e2c11d8 b/dql/fuzz-data/corpus/95c6c7b3b84fcb805642d68fd5b80a824e2c11d8
deleted file mode 100644
index e4c68e9b77f..00000000000
--- a/dql/fuzz-data/corpus/95c6c7b3b84fcb805642d68fd5b80a824e2c11d8
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-  		e(func:anyoftext(t)){Text(first:1,first:4)
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/b46dfd0b5ec806d2343935d21df885280a17f46a b/dql/fuzz-data/corpus/b46dfd0b5ec806d2343935d21df885280a17f46a
deleted file mode 100644
index 9a9e7c01193..00000000000
--- a/dql/fuzz-data/corpus/b46dfd0b5ec806d2343935d21df885280a17f46a
+++ /dev/null
@@ -1 +0,0 @@
-{"query":"query y($a:float,$b:bool){t()}","variables":{"$b":"f","$a":"3.33"}}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/b4d0b5a2fde25df6ce3f56159814a321ea113456 b/dql/fuzz-data/corpus/b4d0b5a2fde25df6ce3f56159814a321ea113456
deleted file mode 100644
index b5272dfaa28..00000000000
--- a/dql/fuzz-data/corpus/b4d0b5a2fde25df6ce3f56159814a321ea113456
+++ /dev/null
@@ -1 +0,0 @@
-{e(func:uid(0)){@filter(a(e,"o")or b(e,"d","s")and(c(a,"a")or(d(d,"a")or e(e,"a")))and f(f,"a"))}}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/c30b0431a18afcff534831a5242058e47aaad6f2 b/dql/fuzz-data/corpus/c30b0431a18afcff534831a5242058e47aaad6f2
deleted file mode 100644
index d042e825191..00000000000
--- a/dql/fuzz-data/corpus/c30b0431a18afcff534831a5242058e47aaad6f2
+++ /dev/null
@@ -1 +0,0 @@
-n< 
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/e3442b591fb989e018ffdd34bd994e3fccde19f0 b/dql/fuzz-data/corpus/e3442b591fb989e018ffdd34bd994e3fccde19f0
deleted file mode 100644
index 6887ca49747..00000000000
--- a/dql/fuzz-data/corpus/e3442b591fb989e018ffdd34bd994e3fccde19f0
+++ /dev/null
@@ -1,7 +0,0 @@
-
-		mutation{set{
-				<e><s><g>.
-				<n><s><o>.
-			}delete{
-				<e><s><e>.
-			}}{e(func:uid(0))}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/e4d8f6af24774a8dbeba500838bc2f5580d38011 b/dql/fuzz-data/corpus/e4d8f6af24774a8dbeba500838bc2f5580d38011
deleted file mode 100644
index e394c900513..00000000000
--- a/dql/fuzz-data/corpus/e4d8f6af24774a8dbeba500838bc2f5580d38011
+++ /dev/null
@@ -1 +0,0 @@
-fragment t f
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/e859f5a28eea527d00e1fb95f7d3d3d6de05fb6d b/dql/fuzz-data/corpus/e859f5a28eea527d00e1fb95f7d3d3d6de05fb6d
deleted file mode 100644
index a3e4b09e227..00000000000
--- a/dql/fuzz-data/corpus/e859f5a28eea527d00e1fb95f7d3d3d6de05fb6d
+++ /dev/null
@@ -1 +0,0 @@
-{e(func:uid(L),orderasc:val(d)){e	val(q)}r(func:uid()){L as s{a as e	b as count(s)c as count(s)d as math((a+b+1)-ln(c))q as math(c*-1+-b+(-b*c))}}}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/f16e00ef6f0b2053e0f2dc3295c1ee3f1b7d37a8 b/dql/fuzz-data/corpus/f16e00ef6f0b2053e0f2dc3295c1ee3f1b7d37a8
deleted file mode 100644
index cf1a437cd26..00000000000
--- a/dql/fuzz-data/corpus/f16e00ef6f0b2053e0f2dc3295c1ee3f1b7d37a8
+++ /dev/null
@@ -1 +0,0 @@
-{e(func:uid(L))m(func:uid(J))u(func:uid(K
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/f363e2668de0c60125e5fb242d3673d23201b8a6 b/dql/fuzz-data/corpus/f363e2668de0c60125e5fb242d3673d23201b8a6
deleted file mode 100644
index c099b70e25e..00000000000
--- a/dql/fuzz-data/corpus/f363e2668de0c60125e5fb242d3673d23201b8a6
+++ /dev/null
@@ -1 +0,0 @@
-{e(func:uid(0x0a)){friends@filter(near(c[[1,2],[[3,4],[5,6]]
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/f4fb416fe444942161c4a3934e2587f44021632d b/dql/fuzz-data/corpus/f4fb416fe444942161c4a3934e2587f44021632d
deleted file mode 100644
index fd3e406e684..00000000000
--- a/dql/fuzz-data/corpus/f4fb416fe444942161c4a3934e2587f44021632d
+++ /dev/null
@@ -1 +0,0 @@
-{e(func:anyofterms(c,"c"))@filter(allofterms(e,"e")){friends@filter(){name@filter(namefilter(e,"a"))}gender@filter(eq(g,"a"))age@filter(neq(a,"b"))hometown}}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/fa5385f417f89ed924e6c64481367be6b26a8f36 b/dql/fuzz-data/corpus/fa5385f417f89ed924e6c64481367be6b26a8f36
deleted file mode 100644
index 49b7ef114ed..00000000000
--- a/dql/fuzz-data/corpus/fa5385f417f89ed924e6c64481367be6b26a8f36
+++ /dev/null
@@ -1 +0,0 @@
-query s($n:string="a"){s()}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/fda62334dc9c1b41f08aa5520e542625bfa0bef5 b/dql/fuzz-data/corpus/fda62334dc9c1b41f08aa5520e542625bfa0bef5
deleted file mode 100644
index 2ef911ebda8..00000000000
--- a/dql/fuzz-data/corpus/fda62334dc9c1b41f08aa5520e542625bfa0bef5
+++ /dev/null
@@ -1 +0,0 @@
-{r(func:uid()){d as math(a+b*c
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test001.in b/dql/fuzz-data/corpus/test001.in
deleted file mode 100644
index a4f13b96eef..00000000000
--- a/dql/fuzz-data/corpus/test001.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-{
-  me(func: uid(1)) {
-    Upvote {
-       u as Author
-    }
-    count(val(u))
-  }
-}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test002.in b/dql/fuzz-data/corpus/test002.in
deleted file mode 100644
index 27374b4f405..00000000000
--- a/dql/fuzz-data/corpus/test002.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	{
-		var(func: uid(0x0a)) {
-			a as friends
-		}
-
-		me(func: uid(a)) {
-			uid(a)
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test003.in b/dql/fuzz-data/corpus/test003.in
deleted file mode 100644
index 94ce632826f..00000000000
--- a/dql/fuzz-data/corpus/test003.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	{
-		var(func: uid( 0x0a)) {
-			friends {
-				expand(_all_)
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test004.in b/dql/fuzz-data/corpus/test004.in
deleted file mode 100644
index adedee899c1..00000000000
--- a/dql/fuzz-data/corpus/test004.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	{
-		me(func: uid(0x0a)) {
-			pred: predicate_names
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test005.in b/dql/fuzz-data/corpus/test005.in
deleted file mode 100644
index 395d60522dc..00000000000
--- a/dql/fuzz-data/corpus/test005.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	{
-		me(func: uid(0x0a)) {
-			count(predicate_names)
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test006.in b/dql/fuzz-data/corpus/test006.in
deleted file mode 100644
index ff2069be961..00000000000
--- a/dql/fuzz-data/corpus/test006.in
+++ /dev/null
@@ -1,16 +0,0 @@
-
-	{
-		var(func: uid(0x0a)) {
-			f as friends
-		}
-
-		var(func: uid(f)) {
-			l as predicate_names
-		}
-
-		var(func: uid( 0x0a)) {
-			friends {
-				expand(val(l))
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test007.in b/dql/fuzz-data/corpus/test007.in
deleted file mode 100644
index 20285f148f5..00000000000
--- a/dql/fuzz-data/corpus/test007.in
+++ /dev/null
@@ -1,19 +0,0 @@
-
-	{
-		var(func: uid(0x0a)) {
-			f as friends
-		}
-
-		var(func: uid(f)) {
-			l as predicate_names
-			friend {
-				g as predicate_names
-			}
-		}
-
-		var(func: uid( 0x0a)) {
-			friends {
-				expand(val(l, g))
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test008.in b/dql/fuzz-data/corpus/test008.in
deleted file mode 100644
index 73eceded01d..00000000000
--- a/dql/fuzz-data/corpus/test008.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-	{
-		me(func: uid(), orderasc: val(n)) {
-			name
-		}
-
-		var(func: uid(0x0a)) {
-			friends {
-				n AS name
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test009.in b/dql/fuzz-data/corpus/test009.in
deleted file mode 100644
index 04117e80b37..00000000000
--- a/dql/fuzz-data/corpus/test009.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	{
-		var(func: uid(0x0a)) {
-			min(friends) {
-				name
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test010.in b/dql/fuzz-data/corpus/test010.in
deleted file mode 100644
index 26ee4e7e1c9..00000000000
--- a/dql/fuzz-data/corpus/test010.in
+++ /dev/null
@@ -1,16 +0,0 @@
-
-{
-      me(func: uid(aliceInWonderland)) {
-        type
-        writtenIn
-        name
-        character {
-                name
-        }
-        author {
-                name
-                born
-                died
-        }
-      }
-    }
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test011.in b/dql/fuzz-data/corpus/test011.in
deleted file mode 100644
index 8a7243bdb18..00000000000
--- a/dql/fuzz-data/corpus/test011.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(n, d)) {
-			name
-		}
-
-		var(func: uid(0x0a)) {
-			L AS friends {
-				n AS name
-				d as age
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test012.in b/dql/fuzz-data/corpus/test012.in
deleted file mode 100644
index 8dd6991bcb6..00000000000
--- a/dql/fuzz-data/corpus/test012.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(c)) {
-			name
-		}
-
-		var(func: uid(0x0a)) {
-			L as friends {
-				a as age
-				c as sumvar()
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test013.in b/dql/fuzz-data/corpus/test013.in
deleted file mode 100644
index 64991d484e2..00000000000
--- a/dql/fuzz-data/corpus/test013.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(d)) {
-			name
-		}
-
-		var(func: uid(0x0a)) {
-			L as friends {
-				a as age
-				b as count(friends)
-				c as count(relatives)
-				d as math(a + b*c + exp())
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test014.in b/dql/fuzz-data/corpus/test014.in
deleted file mode 100644
index 3b2af6855fc..00000000000
--- a/dql/fuzz-data/corpus/test014.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(d)) {
-			name
-		}
-
-		var(func: uid(0x0a)) {
-			L as friends {
-				a as age
-				b as count(friends)
-				c as count(relatives)
-				d as math(a + b*c+ log())
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test015.in b/dql/fuzz-data/corpus/test015.in
deleted file mode 100644
index 1b71a65f7ba..00000000000
--- a/dql/fuzz-data/corpus/test015.in
+++ /dev/null
@@ -1,17 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(d)) {
-			name
-			val(f)
-		}
-
-		var(func: uid(0x0a)) {
-			L as friends {
-				a as age
-				b as count(friends)
-				c as count(relatives)
-				d as math(a + b*c)
-				f as math()
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test016.in b/dql/fuzz-data/corpus/test016.in
deleted file mode 100644
index 8df36357ca2..00000000000
--- a/dql/fuzz-data/corpus/test016.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(d)) {
-			name
-		}
-
-		var(func: uid(0x0a)) {
-			L as friends {
-				a as age
-				b as count(friends)
-				c as count(relatives)
-				d as math(a + b*c)
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test017.in b/dql/fuzz-data/corpus/test017.in
deleted file mode 100644
index b82e22e8853..00000000000
--- a/dql/fuzz-data/corpus/test017.in
+++ /dev/null
@@ -1,17 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(d)) {
-			name
-			val(q)
-		}
-
-		var(func: uid(0x0a)) {
-			L as friends {
-				a as age
-				b as count(friends)
-				c as count(relatives)
-				d as math(exp(a + b + 1) - ln(c))
-				q as math(c*-1+-b+(-b*c))
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test018.in b/dql/fuzz-data/corpus/test018.in
deleted file mode 100644
index 6b66d9f94a7..00000000000
--- a/dql/fuzz-data/corpus/test018.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(d) ) {
-			name
-		}
-
-		var(func: uid(0x0a)) {
-			L as friends {
-				a as age
-				b as count(friends)
-				c as count(relatives)
-				d as math(exp(a + b + 1) - max(c,ln(c)) + sqrt(a%b))
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test019.in b/dql/fuzz-data/corpus/test019.in
deleted file mode 100644
index cc62a30cdce..00000000000
--- a/dql/fuzz-data/corpus/test019.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(d) ) {
-			name
-			val(e)
-		}
-
-		var(func: uid(0x0a)) {
-			L as friends {
-				a as age
-				d as math(ln(sqrt(a)))
-				e as math(sqrt(ln(a)))
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test020.in b/dql/fuzz-data/corpus/test020.in
deleted file mode 100644
index ec59aed7309..00000000000
--- a/dql/fuzz-data/corpus/test020.in
+++ /dev/null
@@ -1,18 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(d) ) {
-			name
-			val(f)
-		}
-
-		var(func: uid(0x0a)) {
-			L as friends {
-				a as age
-				b as count(friends)
-				c as count(relatives)
-				d as math(cond(a <= 10, exp(a + b + 1), ln(c)) + 10*a)
-				e as math(cond(a!=10, exp(a + b + 1), ln(d)))
-				f as math(cond(a==10, exp(a + b + 1), ln(e)))
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test021.in b/dql/fuzz-data/corpus/test021.in
deleted file mode 100644
index 9281f583284..00000000000
--- a/dql/fuzz-data/corpus/test021.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(d) ) {
-			name
-	}
-
-		var(func: uid(0x0a)) {
-			L as friends {
-				a as age
-				b as count(friends)
-				c as count(relatives)
-				d as math(a + b * c / a + exp(a + b + 1) - ln(c))
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test022.in b/dql/fuzz-data/corpus/test022.in
deleted file mode 100644
index 7c4c8be1c98..00000000000
--- a/dql/fuzz-data/corpus/test022.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(d)) {
-			name
-		}
-
-		var(func: uid(0x0a)) {
-			L as friends {
-				a as age
-				d as math(a + *)
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test023.in b/dql/fuzz-data/corpus/test023.in
deleted file mode 100644
index 4daf4c21e1e..00000000000
--- a/dql/fuzz-data/corpus/test023.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(d)) {
-			name
-		}
-
-		var(func: uid(0x0a)) {
-			L as friends {
-				a as age
-				b as count(friends)
-				c as count(relatives)
-				d as math(a +b*c -)
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test024.in b/dql/fuzz-data/corpus/test024.in
deleted file mode 100644
index 3649a152569..00000000000
--- a/dql/fuzz-data/corpus/test024.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	{
-		var(func: uid(0x0a)) {
-			friends {
-				a as count(age)
-			}
-			s as sum(val(a))
-		}
-
-		sumage(func: uid( 0x0a)) {
-			val(s)
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test025.in b/dql/fuzz-data/corpus/test025.in
deleted file mode 100644
index eb5a8935f55..00000000000
--- a/dql/fuzz-data/corpus/test025.in
+++ /dev/null
@@ -1,16 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(c) ) {
-			name
-			val(c)
-		}
-
-		var(func: uid(0x0a)) {
-			L as friends {
-				x as age
-			}
-			a as min(val(x))
-			b as max(val(x))
-			c as math(a + b)
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test026.in b/dql/fuzz-data/corpus/test026.in
deleted file mode 100644
index c5622a87ffd..00000000000
--- a/dql/fuzz-data/corpus/test026.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(n) ) {
-			name
-		}
-
-		var(func: uid(0x0a)) {
-			L AS friends {
-				na as name
-			}
-			n as min(val(na))
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test027.in b/dql/fuzz-data/corpus/test027.in
deleted file mode 100644
index 6bd56823cb9..00000000000
--- a/dql/fuzz-data/corpus/test027.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: uid(n)) {
-			name
-		}
-
-		var(func: uid(0x0a)) {
-			L AS friends {
-				na as name
-			}
-			n as min(val(na))
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test028.in b/dql/fuzz-data/corpus/test028.in
deleted file mode 100644
index e50f7fc4d12..00000000000
--- a/dql/fuzz-data/corpus/test028.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	{
-		me(func: val(L), orderasc: val(n)) {
-			name
-		}
-
-		var(func: uid(0x0a)) {
-			L AS friends {
-				na as name
-			}
-			n as min(val(na))
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test029.in b/dql/fuzz-data/corpus/test029.in
deleted file mode 100644
index 1d19a4131a8..00000000000
--- a/dql/fuzz-data/corpus/test029.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(n) ) {
-			name
-		}
-
-		var(func: uid(0x0a)) {
-			L AS friends {
-				n AS count(friend)
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test030.in b/dql/fuzz-data/corpus/test030.in
deleted file mode 100644
index 7ecfddaaa2a..00000000000
--- a/dql/fuzz-data/corpus/test030.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-	{
-		me(func: uid(L), orderasc: val(n) ) {
-			name
-		}
-
-		var(func: uid(0x0a)) {
-			L AS friends {
-				n AS name
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test031.in b/dql/fuzz-data/corpus/test031.in
deleted file mode 100644
index 0936ed00781..00000000000
--- a/dql/fuzz-data/corpus/test031.in
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	{
-		me(func: uid( L, J, K)) {name}
-		var(func: uid(0x0a)) {L AS friends}
-		var(func: uid(0x0a)) {J AS friends}
-		var(func: uid(0x0a)) {K AS friends}
-	}
diff --git a/dql/fuzz-data/corpus/test032.in b/dql/fuzz-data/corpus/test032.in
deleted file mode 100644
index 98d73543fd3..00000000000
--- a/dql/fuzz-data/corpus/test032.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	{
-		me(func: uid(L)) {name}
-		him(func: uid(J)) {name}
-		you(func: uid(K)) {name}
-		var(func: uid(0x0a)) {L AS friends}
-		var(func: uid(0x0a)) {J AS friends}
-		var(func: uid(0x0a)) {K AS friends}
-	}
diff --git a/dql/fuzz-data/corpus/test033.in b/dql/fuzz-data/corpus/test033.in
deleted file mode 100644
index 5226531d1e3..00000000000
--- a/dql/fuzz-data/corpus/test033.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	{
-		him(func: uid(J)) {name}
-		you(func: uid(K)) {name}
-		var(func: uid(0x0a)) {L AS friends}
-		var(func: uid(0x0a)) {J AS friends}
-		var(func: uid(0x0a)) {K AS friends}
-	}
diff --git a/dql/fuzz-data/corpus/test034.in b/dql/fuzz-data/corpus/test034.in
deleted file mode 100644
index d0a81a5fb87..00000000000
--- a/dql/fuzz-data/corpus/test034.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	{
-		me(func: uid(L)) {name}
-		him(func: uid(J)) {name}
-		you(func: uid(K)) {name}
-		var(func: uid(0x0a)) {L AS friends}
-		var(func: uid(0x0a)) {K AS friends}
-	}
diff --git a/dql/fuzz-data/corpus/test035.in b/dql/fuzz-data/corpus/test035.in
deleted file mode 100644
index 30e49d6a70d..00000000000
--- a/dql/fuzz-data/corpus/test035.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	{
-		me(func: uid(1) @filter(anyof(name, "alice"))) {
-		 name
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test036.in b/dql/fuzz-data/corpus/test036.in
deleted file mode 100644
index 8138d8864ab..00000000000
--- a/dql/fuzz-data/corpus/test036.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	{
-		me(func: uid(1)) @filter(anyofterms(name"alice")) {
-		 name
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test037.in b/dql/fuzz-data/corpus/test037.in
deleted file mode 100644
index 48d3ee39061..00000000000
--- a/dql/fuzz-data/corpus/test037.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	{
-		me(func: uid(1)) @filter(anyofterms(name "alice")) {
-		 name
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test038.in b/dql/fuzz-data/corpus/test038.in
deleted file mode 100644
index 9ba3208cc3d..00000000000
--- a/dql/fuzz-data/corpus/test038.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	{
-		K as var(func: uid(0x0a)) {
-			L AS friends
-		}
-		me(func: uid(K)) @filter(uid(L)) {
-		 name
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test039.in b/dql/fuzz-data/corpus/test039.in
deleted file mode 100644
index 0a00ff69235..00000000000
--- a/dql/fuzz-data/corpus/test039.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	{
-		K AS var(func: uid(0x0a)) {
-			fr as friends
-		}
-		me(func: uid(fr)) @filter(uid(K)) {
-		 name	@filter(uid(fr))
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test040.in b/dql/fuzz-data/corpus/test040.in
deleted file mode 100644
index d94f52d217e..00000000000
--- a/dql/fuzz-data/corpus/test040.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-	{
-		var(func: uid(0x0a)) {
-			fr as friends {
-				a as age
-			}
-		}
-
-		me(func: uid(fr)) @filter(gt(val(a, b), 10)) {
-		 name
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test041.in b/dql/fuzz-data/corpus/test041.in
deleted file mode 100644
index 9795143a905..00000000000
--- a/dql/fuzz-data/corpus/test041.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-	{
-		var(func: uid(0x0a)) {
-			fr as friends {
-				a as age
-			}
-		}
-
-		me(func: uid(fr)) @filter(gt(val(a), 10)) {
-		 name
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test042.in b/dql/fuzz-data/corpus/test042.in
deleted file mode 100644
index fd0d90572b2..00000000000
--- a/dql/fuzz-data/corpus/test042.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	{
-		var(func: uid(0x0a)) {
-			L AS friends
-		}
-
-		me(func: uid(L)) {
-		 name
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test043.in b/dql/fuzz-data/corpus/test043.in
deleted file mode 100644
index a55eeeec05d..00000000000
--- a/dql/fuzz-data/corpus/test043.in
+++ /dev/null
@@ -1,16 +0,0 @@
-
-	{
-		var(func: uid(0x0a)) {
-			L AS friends {
-				B AS relatives
-			}
-		}
-
-		me(func: uid(L)) {
-		 name
-		}
-
-		relatives(func: uid(B)) {
-			name
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test044.in b/dql/fuzz-data/corpus/test044.in
deleted file mode 100644
index 36eb8430a7f..00000000000
--- a/dql/fuzz-data/corpus/test044.in
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	{
-		shortest(from:0x0a, to:0x0b, numpaths: 3) {
-			friends
-			name
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test045.in b/dql/fuzz-data/corpus/test045.in
deleted file mode 100644
index 01880012f10..00000000000
--- a/dql/fuzz-data/corpus/test045.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	{
-		you(func: uid(0x0a)) {
-			name
-		}
-
-		me(func: uid(0x0b)) {
-		 friends
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test046.in b/dql/fuzz-data/corpus/test046.in
deleted file mode 100644
index 7a6bb09fc77..00000000000
--- a/dql/fuzz-data/corpus/test046.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a), first: -4, offset: +1) {
-			friends {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test047.in b/dql/fuzz-data/corpus/test047.in
deleted file mode 100644
index 95c55af66e1..00000000000
--- a/dql/fuzz-data/corpus/test047.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a), first: 1, offset:0) {
-			friends {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test048.in b/dql/fuzz-data/corpus/test048.in
deleted file mode 100644
index 630a8ae1696..00000000000
--- a/dql/fuzz-data/corpus/test048.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test049.in b/dql/fuzz-data/corpus/test049.in
deleted file mode 100644
index daf65716ab9..00000000000
--- a/dql/fuzz-data/corpus/test049.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-		me(func: uid(0x0a)) {
-			friends {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test050.in b/dql/fuzz-data/corpus/test050.in
deleted file mode 100644
index 90c784802e4..00000000000
--- a/dql/fuzz-data/corpus/test050.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	query {
-		user(func: uid( 0x11)) {
-			type.object.name
-		}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test051.in b/dql/fuzz-data/corpus/test051.in
deleted file mode 100644
index 2a3b02642ba..00000000000
--- a/dql/fuzz-data/corpus/test051.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	query {
-		user(func: uid(0x1)) {
-			type.object.name
-		}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test052.in b/dql/fuzz-data/corpus/test052.in
deleted file mode 100644
index 62263933c87..00000000000
--- a/dql/fuzz-data/corpus/test052.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	query {
-		user(func: uid(0x1, 0x34)) {
-			type.object.name
-		}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test053.in b/dql/fuzz-data/corpus/test053.in
deleted file mode 100644
index 4394c016242..00000000000
--- a/dql/fuzz-data/corpus/test053.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	query {
-		user(func: uid( [0x1, 0x1, abc, ade, 0x34))] {
-			type.object.name
-		}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test054.in b/dql/fuzz-data/corpus/test054.in
deleted file mode 100644
index aab9272ffd0..00000000000
--- a/dql/fuzz-data/corpus/test054.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	query {
-		user(func: uid( [0x1, 0x1, 2, 3, 0x34])) {
-			type.object.name
-		}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test055.in b/dql/fuzz-data/corpus/test055.in
deleted file mode 100644
index 07bc16e163d..00000000000
--- a/dql/fuzz-data/corpus/test055.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	query {
-		user(func: uid( 0x1)) {
-			type.object.name
-			friends (first: 10) {
-			}
-		}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test056.in b/dql/fuzz-data/corpus/test056.in
deleted file mode 100644
index 4e260a340a3..00000000000
--- a/dql/fuzz-data/corpus/test056.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	query {
-		user(func: uid( 0x1)) {
-			type.object.name
-			friends (first: ) {
-			}
-		}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test057.in b/dql/fuzz-data/corpus/test057.in
deleted file mode 100644
index 0de5d53fcba..00000000000
--- a/dql/fuzz-data/corpus/test057.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	query {
-		user(func: uid( 0x1)) {
-			type.object.name
-			friends (first: 10, after: 3) {
-			}
-		}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test058.in b/dql/fuzz-data/corpus/test058.in
deleted file mode 100644
index d9f6181088f..00000000000
--- a/dql/fuzz-data/corpus/test058.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	query {
-		user(func: uid( 0x1)) {
-			type.object.name
-			friends (first: 10, offset: 3) {
-			}
-		}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test059.in b/dql/fuzz-data/corpus/test059.in
deleted file mode 100644
index e2763279948..00000000000
--- a/dql/fuzz-data/corpus/test059.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	query {
-		user(func: uid( 0x1)) {
-			type.object.name
-			friends (first: 10, offset: ) {
-			}
-		}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test060.in b/dql/fuzz-data/corpus/test060.in
deleted file mode 100644
index fef354399f0..00000000000
--- a/dql/fuzz-data/corpus/test060.in
+++ /dev/null
@@ -1,7 +0,0 @@
-
-		query {
-			me {
-				name
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test061.in b/dql/fuzz-data/corpus/test061.in
deleted file mode 100644
index 10f3fd85b6b..00000000000
--- a/dql/fuzz-data/corpus/test061.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-		{
-			me(func: uid(0x0a)) {
-				name,
-				friends(xid:what) {  # xid would be ignored.
-				}
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test062.in b/dql/fuzz-data/corpus/test062.in
deleted file mode 100644
index 84d4f655c2b..00000000000
--- a/dql/fuzz-data/corpus/test062.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-		{
-			me(func: uid(0x0a)) {
-				name,
-				bestFriend: friends(first: 10) {
-					nameCount: count(name)
-				}
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test063.in b/dql/fuzz-data/corpus/test063.in
deleted file mode 100644
index e0cf898f1a0..00000000000
--- a/dql/fuzz-data/corpus/test063.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-		{
-			me(func: uid(0x0a)) {
-				name,
-				f as bestFriend: friends(first: 10) {
-					c as count(friend)
-				}
-			}
-
-			friend(func: uid(f)) {
-				name
-				fcount: val(c)
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test064.in b/dql/fuzz-data/corpus/test064.in
deleted file mode 100644
index 1874f90b205..00000000000
--- a/dql/fuzz-data/corpus/test064.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-		{
-			me(func: uid(0x0a)) {
-				name,
-				bestFriend: friends(first: 10) {
-					x as count(friends)
-				}
-				maxfriendcount: max(val(x))
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test065.in b/dql/fuzz-data/corpus/test065.in
deleted file mode 100644
index e3872597dd1..00000000000
--- a/dql/fuzz-data/corpus/test065.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-		{
-			me(func: uid(0x0a)) {
-				name,
-				bestFriend: friends(first: 10) {
-					name
-				}
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test066.in b/dql/fuzz-data/corpus/test066.in
deleted file mode 100644
index c442ae8dc62..00000000000
--- a/dql/fuzz-data/corpus/test066.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-		{
-			me(func: uid(0x0a)) {
-				name: type.object.name.en
-				bestFriend: friends(first: 10) {
-					name: type.object.name.hi
-				}
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test067.in b/dql/fuzz-data/corpus/test067.in
deleted file mode 100644
index 4596bde705a..00000000000
--- a/dql/fuzz-data/corpus/test067.in
+++ /dev/null
@@ -1,7 +0,0 @@
-
-		{
-			root(func: uid( 0x0a)) {
-				type.object.name.es.419
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test068.in b/dql/fuzz-data/corpus/test068.in
deleted file mode 100644
index 6d009927853..00000000000
--- a/dql/fuzz-data/corpus/test068.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-		schema (pred : name) {
-			pred
-			type
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test069.in b/dql/fuzz-data/corpus/test069.in
deleted file mode 100644
index 3f370d61c61..00000000000
--- a/dql/fuzz-data/corpus/test069.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-		schema (pred : [name,hi]) {
-			pred
-			type
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test070.in b/dql/fuzz-data/corpus/test070.in
deleted file mode 100644
index 014ba735851..00000000000
--- a/dql/fuzz-data/corpus/test070.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-		schema {
-			pred
-			type
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test071.in b/dql/fuzz-data/corpus/test071.in
deleted file mode 100644
index 93ed7646bd9..00000000000
--- a/dql/fuzz-data/corpus/test071.in
+++ /dev/null
@@ -1,7 +0,0 @@
-
-		schema (pred : name) {
-			#hi
-			pred #bye
-			type
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test072.in b/dql/fuzz-data/corpus/test072.in
deleted file mode 100644
index e855138c32e..00000000000
--- a/dql/fuzz-data/corpus/test072.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-		schema {
-			pred
-			type
-		}
-		query {
-			me(func: uid( tomhanks)) {
-				name
-				hometown
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test073.in b/dql/fuzz-data/corpus/test073.in
deleted file mode 100644
index 9101554fe7e..00000000000
--- a/dql/fuzz-data/corpus/test073.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-		query {
-			me(func: uid( tomhanks)) {
-				name
-				hometown
-			}
-		}
-		schema {
-			pred
-			type
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test074.in b/dql/fuzz-data/corpus/test074.in
deleted file mode 100644
index 9c28ce30bed..00000000000
--- a/dql/fuzz-data/corpus/test074.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-		schema () {
-			pred
-			type
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test075.in b/dql/fuzz-data/corpus/test075.in
deleted file mode 100644
index 9a4ab725a54..00000000000
--- a/dql/fuzz-data/corpus/test075.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-		schema {
-			pred
-			type
-		}
-		schema {
-			pred
-			type
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test076.in b/dql/fuzz-data/corpus/test076.in
deleted file mode 100644
index c7d3dc9e9e2..00000000000
--- a/dql/fuzz-data/corpus/test076.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-		mutation {
-			set {
-				<name> <is> <something> .
-				<hometown> <is> <san/francisco> .
-			}
-			delete {
-				<name> <is> <something-else> .
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test077.in b/dql/fuzz-data/corpus/test077.in
deleted file mode 100644
index 24dfeb3e03a..00000000000
--- a/dql/fuzz-data/corpus/test077.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-		mutation {
-			set {
-				<name> <is> <something> .
-				<hometown> <is> <san francisco> .
-			}
-			delete {
-				<name> <is> <something-else> .
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test078.in b/dql/fuzz-data/corpus/test078.in
deleted file mode 100644
index 758bf1206d6..00000000000
--- a/dql/fuzz-data/corpus/test078.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-		mutation {
-			set {
-				<name> <is> <something> .
-				<hometown> <is> <san-francisco> .
-			}
-			delete {
-				<name> <is> <something-else> .
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test079.in b/dql/fuzz-data/corpus/test079.in
deleted file mode 100644
index 15f0653dbb0..00000000000
--- a/dql/fuzz-data/corpus/test079.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-		mutation {
-			set {
-				<name> <is> <something> .
-				<hometown> <is> <san-francisco> .
-			}
-			delete {
-				<name> <is> <something-else> .
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test080.in b/dql/fuzz-data/corpus/test080.in
deleted file mode 100644
index c1ecaf22ab6..00000000000
--- a/dql/fuzz-data/corpus/test080.in
+++ /dev/null
@@ -1,17 +0,0 @@
-
-		mutation {
-			set {
-				<name> <is> <something> .
-				<hometown> <is> <san-francisco> .
-			}
-			delete {
-				<name> <is> <something-else> .
-			}
-		}
-		mutation {
-			set {
-				another one?
-			}
-		}
-
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test081.in b/dql/fuzz-data/corpus/test081.in
deleted file mode 100644
index 921c6ac5660..00000000000
--- a/dql/fuzz-data/corpus/test081.in
+++ /dev/null
@@ -1,21 +0,0 @@
-
-	# Mutation
-		mutation {
-			# Set block
-			set {
-				<name> <is> <something> .
-				<hometown> <is> <san/francisco> .
-			}
-			# Delete block
-			delete {
-				<name> <is> <something-else> .
-			}
-		}
-		# Query starts here.
-		query {
-			me(func: uid( 0x5)) { # now mention children
-				name		# Name
-				hometown # hometown of the person
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test082.in b/dql/fuzz-data/corpus/test082.in
deleted file mode 100644
index 377a58078ad..00000000000
--- a/dql/fuzz-data/corpus/test082.in
+++ /dev/null
@@ -1,17 +0,0 @@
-
-		mutation {
-			set {
-				<name> <is> <something> .
-				<hometown> <is> <san/francisco> .
-			}
-			delete {
-				<name> <is> <something-else> .
-			}
-		}
-		query {
-			me(func: uid( 0x5)) {
-				name
-				hometown
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test083.in b/dql/fuzz-data/corpus/test083.in
deleted file mode 100644
index 1376155d85a..00000000000
--- a/dql/fuzz-data/corpus/test083.in
+++ /dev/null
@@ -1,33 +0,0 @@
-
-	{
-		user(func: uid(0x0a)) {
-			...fragmenta,...fragmentb
-			friends {
-				name
-			}
-			...fragmentc
-			hobbies
-			...fragmentd
-		}
-
-		me(func: uid(0x01)) {
-			...fragmenta
-			...fragmentb
-		}
-	}
-
-	fragment fragmenta {
-		name
-	}
-
-	fragment fragmentb {
-		id
-	}
-
-	fragment fragmentc {
-		name
-	}
-
-	fragment fragmentd {
-		id
-	}
diff --git a/dql/fuzz-data/corpus/test084.in b/dql/fuzz-data/corpus/test084.in
deleted file mode 100644
index 939dbee149d..00000000000
--- a/dql/fuzz-data/corpus/test084.in
+++ /dev/null
@@ -1,28 +0,0 @@
-
-	query {
-		user(func: uid(0x0a)) {
-			...fragmenta,...fragmentb
-			friends {
-				name
-			}
-			...fragmentc
-			hobbies
-			...fragmentd
-		}
-	}
-
-	fragment fragmenta {
-		name
-	}
-
-	fragment fragmentb {
-		id
-	}
-
-	fragment fragmentc {
-		name
-	}
-
-	fragment fragmentd {
-		id
-	}
diff --git a/dql/fuzz-data/corpus/test085.in b/dql/fuzz-data/corpus/test085.in
deleted file mode 100644
index bb76591c6d0..00000000000
--- a/dql/fuzz-data/corpus/test085.in
+++ /dev/null
@@ -1,18 +0,0 @@
-
-	query {
-		user(func: uid(0x0a)) {
-			...fragmenta
-			friends {
-				name
-			}
-		}
-	}
-
-	fragment fragmenta {
-		id
-		...fragmentb
-	}
-
-	fragment fragmentb {
-		hobbies
-	}
diff --git a/dql/fuzz-data/corpus/test086.in b/dql/fuzz-data/corpus/test086.in
deleted file mode 100644
index 7e2e81ac65c..00000000000
--- a/dql/fuzz-data/corpus/test086.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-	query {
-		user(func: uid(0x0a)) {
-			friends {
-				...fragmenta
-			}
-		}
-	}
-	fragment fragmenta {
-		name
-		...fragmentb
-	}
-	fragment fragmentb {
-		nickname
-	}
diff --git a/dql/fuzz-data/corpus/test087.in b/dql/fuzz-data/corpus/test087.in
deleted file mode 100644
index 08947ea4606..00000000000
--- a/dql/fuzz-data/corpus/test087.in
+++ /dev/null
@@ -1,17 +0,0 @@
-
-	query {
-		user(func: uid(0x0a)) {
-			...fragmenta
-		}
-	}
-	fragment fragmenta {
-		name
-		...fragmentb
-	}
-	fragment fragmentb {
-		...fragmentc
-	}
-	fragment fragmentc {
-		id
-		...fragmenta
-	}
diff --git a/dql/fuzz-data/corpus/test088.in b/dql/fuzz-data/corpus/test088.in
deleted file mode 100644
index e48a210eeaa..00000000000
--- a/dql/fuzz-data/corpus/test088.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	query {
-		user(func: uid(0x0a)) {
-			...fragmenta
-		}
-	}
-	fragment fragmentb {
-		...fragmentc
-	}
-	fragment fragmentc {
-		id
-		...fragmenta
-	}
diff --git a/dql/fuzz-data/corpus/test089.in b/dql/fuzz-data/corpus/test089.in
deleted file mode 100644
index 40a8471809e..00000000000
--- a/dql/fuzz-data/corpus/test089.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query" : "query versions($version: int!){versions(func:eq(type, $version)){versions{ version_number}}}",
-		"variables" : {"$version": "3"}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test090.in b/dql/fuzz-data/corpus/test090.in
deleted file mode 100644
index 6c66d3a8b34..00000000000
--- a/dql/fuzz-data/corpus/test090.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-		query versions($version: string = "v0.7.3/beta")
-		{
-			versions(func:eq(type, "version"))
-			{
-				versions @filter(eq(version_number, $version))
-				{
-					version_number
-				}
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test091.in b/dql/fuzz-data/corpus/test091.in
deleted file mode 100644
index d8100634d4b..00000000000
--- a/dql/fuzz-data/corpus/test091.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query" : "query versions($version: int!){versions(func:eq(type, \"version\")){versions @filter(eq(version_number, $version)) { version_number}}}",
-		"variables" : {"$version": "3"}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test092.in b/dql/fuzz-data/corpus/test092.in
deleted file mode 100644
index a00a2a112e2..00000000000
--- a/dql/fuzz-data/corpus/test092.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query": "query testQuery( $a  : int   , $b: int){root(func: uid(0x0a)) {name(first: $b, after: $a){english}}}",
-		"variables": {"$a": "6", "$b": "5" }
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test093.in b/dql/fuzz-data/corpus/test093.in
deleted file mode 100644
index 321b2c39755..00000000000
--- a/dql/fuzz-data/corpus/test093.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query": "query testQuery($a: int , $b: int!){root(func: uid( 0x0a)) {name(first: $b){english}}}",
-		"variables": {"$b": "5" }
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test094.in b/dql/fuzz-data/corpus/test094.in
deleted file mode 100644
index fd81a224e39..00000000000
--- a/dql/fuzz-data/corpus/test094.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query": "query testQuery($a: float , $b: bool!){root(func: uid( 0x0a)) {name{english}}}",
-		"variables": {"$b": "false", "$a": "3.33" }
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test095.in b/dql/fuzz-data/corpus/test095.in
deleted file mode 100644
index c1ac54e1c36..00000000000
--- a/dql/fuzz-data/corpus/test095.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query": "query testQuery($a: int , $b: int! ){root(func: uid( 0x0a)) {name(first: $b){english}}}",
-		"variables": {"$a": "5", "$b": "3"}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test096.in b/dql/fuzz-data/corpus/test096.in
deleted file mode 100644
index 34a005ed0a1..00000000000
--- a/dql/fuzz-data/corpus/test096.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query": "query testQuery($a: int! , $b: int){root(func: uid( 0x0a)) {name(first: $b){english}}}",
-		"variables": "{\"$a\": \"5\" }"
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test097.in b/dql/fuzz-data/corpus/test097.in
deleted file mode 100644
index 8a1740ecb44..00000000000
--- a/dql/fuzz-data/corpus/test097.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query": "query testQuery($a: int = 3  , $b: int =  4 ,  $c : int = 3){root(func: uid( 0x0a)) {name(first: $b, after: $a, offset: $c){english}}}",
-		"variables": {"$b": "5" }
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test098.in b/dql/fuzz-data/corpus/test098.in
deleted file mode 100644
index 51e78897e44..00000000000
--- a/dql/fuzz-data/corpus/test098.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"query": "query test($a: int){user(func: uid(0x0a)) {...fragmentd,friends(first: $a, offset: $a) {name}}} fragment fragmentd {id(first: $a)}",
-	"variables": {"$a": "5"}
-}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test099.in b/dql/fuzz-data/corpus/test099.in
deleted file mode 100644
index d829a4576e0..00000000000
--- a/dql/fuzz-data/corpus/test099.in
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	query testQuery($a: string, $b: int!){
-			root(func: uid( 0x0a)) {
-				type.object.name.es-419
-			}
-		}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test100.in b/dql/fuzz-data/corpus/test100.in
deleted file mode 100644
index c14f6fc59aa..00000000000
--- a/dql/fuzz-data/corpus/test100.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query": "query testQuery($a: int, $b: int, $c: int!){   root(func: uid( 0x0a) {name(first: $b, after: $a)){english}}}",
-		"variables": {"$a": "6", "$b": "5" }
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test101.in b/dql/fuzz-data/corpus/test101.in
deleted file mode 100644
index 1ea2efae7fd..00000000000
--- a/dql/fuzz-data/corpus/test101.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query": "query testQuery($a: int, $b: , $c: int!){   root(func: uid( 0x0a) {name(first: $b, after: $a)){english}}}",
-		"variables": {"$a": "6", "$b": "5" }
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test102.in b/dql/fuzz-data/corpus/test102.in
deleted file mode 100644
index 705f67652d2..00000000000
--- a/dql/fuzz-data/corpus/test102.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query": "query testQuery($a: bool , $b: float! = 3){root(func: uid( 0x0a) {name(first: $b)){english}}}",
-		"variables": {"$a": "5" }
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test103.in b/dql/fuzz-data/corpus/test103.in
deleted file mode 100644
index a58322b9fc4..00000000000
--- a/dql/fuzz-data/corpus/test103.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query": "query ($a: int, $b: int){root(func: uid( 0x0a) {name(first: $b, after: $a)){english}}}",
-		"variables": {"$a": "6", "$b": "5" }
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test104.in b/dql/fuzz-data/corpus/test104.in
deleted file mode 100644
index 569c5fb4270..00000000000
--- a/dql/fuzz-data/corpus/test104.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query": "query testQuery($a: int, $b: random){root(func: uid( 0x0a) {name(first: $b, after: $a)){english}}}",
-		"variables": {"$a": "6", "$b": "5" }
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test105.in b/dql/fuzz-data/corpus/test105.in
deleted file mode 100644
index 92aef80cf81..00000000000
--- a/dql/fuzz-data/corpus/test105.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query": "query testQuery($a: int, $b: int, $c: int!){    root(func: uid( 0x0a) {name(first: $b, after: $a)){english}}}",
-		"variables": {"$a": "6", "$b": "5", "$c": "321", "$d": "abc" }
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test106.in b/dql/fuzz-data/corpus/test106.in
deleted file mode 100644
index 75f8b943321..00000000000
--- a/dql/fuzz-data/corpus/test106.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query": "query testQuery($a: int = 3  , $b: int! =  4 ,  $c : int = 3){root(func: uid( 0x0a) {name(first: $b, after: $a, offset: $c)){english}}}",
-		"variables": {"$b": "5" }
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test107.in b/dql/fuzz-data/corpus/test107.in
deleted file mode 100644
index 67ab1657177..00000000000
--- a/dql/fuzz-data/corpus/test107.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func:anyofterms(abc, "Abc")) @filter(allofterms(name, "alice")) {
-			friends @filter() {
-				name @filter(namefilter(name, "a"))
-			}
-			gender @filter(eq(g, "a")),age @filter(neq(a, "b"))
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test108.in b/dql/fuzz-data/corpus/test108.in
deleted file mode 100644
index 166b12ce3ca..00000000000
--- a/dql/fuzz-data/corpus/test108.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	query {
-		me(func: gt(count(friend), 10)) {
-			friends @filter() {
-				name
-			}
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test109.in b/dql/fuzz-data/corpus/test109.in
deleted file mode 100644
index 2cf87c96c17..00000000000
--- a/dql/fuzz-data/corpus/test109.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-	query {
-		var(func:uid(1)) {
-			a as name
-		}
-		me(func: eq(name, val(a))) {
-			friends @filter() {
-				name
-			}
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test110.in b/dql/fuzz-data/corpus/test110.in
deleted file mode 100644
index 86f4b3e7892..00000000000
--- a/dql/fuzz-data/corpus/test110.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	query {
-		me(func:anyofterms(abc, "Abc")) @filter(gt(count(friends), 10)) {
-			friends @filter() {
-				name
-			}
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test111.in b/dql/fuzz-data/corpus/test111.in
deleted file mode 100644
index 534e786053f..00000000000
--- a/dql/fuzz-data/corpus/test111.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	query {
-		me(func:anyofterms(abc, "Abc")) @filter(gt(count(friends), sum(friends))) {
-			friends @filter() {
-				name
-			}
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test112.in b/dql/fuzz-data/corpus/test112.in
deleted file mode 100644
index 9da3cc0b724..00000000000
--- a/dql/fuzz-data/corpus/test112.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filter() {
-				name @filter(namefilter(name, "a"))
-			}
-			gender @filter(eq(g, "a")),age @filter(neq(a, "b"))
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test113.in b/dql/fuzz-data/corpus/test113.in
deleted file mode 100644
index c1aacf0d0e1..00000000000
--- a/dql/fuzz-data/corpus/test113.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filter(a(aa, "aaa") or b(bb, "bbb")
-			and c(cc, "ccc")) {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test114.in b/dql/fuzz-data/corpus/test114.in
deleted file mode 100644
index e016083e911..00000000000
--- a/dql/fuzz-data/corpus/test114.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filter(a(aa "aaa") or b(b "bbb")) {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test115.in b/dql/fuzz-data/corpus/test115.in
deleted file mode 100644
index 45a36e4a237..00000000000
--- a/dql/fuzz-data/corpus/test115.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filter(a(aa, "aaa") or b(b, "bbb")) {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test116.in b/dql/fuzz-data/corpus/test116.in
deleted file mode 100644
index 535ee49a8e5..00000000000
--- a/dql/fuzz-data/corpus/test116.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-		query {
-		me(func: uid(0x0a)) {
-			friends @filter(a(aa, "aaa") or b(b, "bbb") and) {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test117.in b/dql/fuzz-data/corpus/test117.in
deleted file mode 100644
index b7f37169bb5..00000000000
--- a/dql/fuzz-data/corpus/test117.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filter(not a(aa, "aaa")) {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test118.in b/dql/fuzz-data/corpus/test118.in
deleted file mode 100644
index 79cb399d37c..00000000000
--- a/dql/fuzz-data/corpus/test118.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filter(not(a(aa, "aaa") or (b(bb, "bbb"))) and c(cc, "ccc")) {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test119.in b/dql/fuzz-data/corpus/test119.in
deleted file mode 100644
index ee95d1a5940..00000000000
--- a/dql/fuzz-data/corpus/test119.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filter((a(aa, "aaa") Or b(bb, "bbb"))
-			 and c(cc, "ccc")) {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test120.in b/dql/fuzz-data/corpus/test120.in
deleted file mode 100644
index 4b7b1787560..00000000000
--- a/dql/fuzz-data/corpus/test120.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filter(  a(name, "hello") or b(name, "world", "is") and (c(aa, "aaa") or (d(dd, "haha") or e(ee, "aaa"))) and f(ff, "aaa")){
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test121.in b/dql/fuzz-data/corpus/test121.in
deleted file mode 100644
index 290abd91751..00000000000
--- a/dql/fuzz-data/corpus/test121.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filter(  () {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test122.in b/dql/fuzz-data/corpus/test122.in
deleted file mode 100644
index f1d66261bc9..00000000000
--- a/dql/fuzz-data/corpus/test122.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filter(near(loc, [-1.12 , 2.0123 ], 100.123 )) {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test123.in b/dql/fuzz-data/corpus/test123.in
deleted file mode 100644
index 562bc4b7f86..00000000000
--- a/dql/fuzz-data/corpus/test123.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filter(within(loc, [[11.2 , -2.234 ], [ -31.23, 4.3214] , [5.312, 6.53]] )) {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test124.in b/dql/fuzz-data/corpus/test124.in
deleted file mode 100644
index 8ac326611d0..00000000000
--- a/dql/fuzz-data/corpus/test124.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filter(near(loc, [[1 , 2 ], [[3, 4] , [5, 6]] )) {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test125.in b/dql/fuzz-data/corpus/test125.in
deleted file mode 100644
index 891d931c584..00000000000
--- a/dql/fuzz-data/corpus/test125.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filter(near(loc, [[1 , 2 ], [3, 4] , [5, 6]]] )) {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test126.in b/dql/fuzz-data/corpus/test126.in
deleted file mode 100644
index 1486964f36d..00000000000
--- a/dql/fuzz-data/corpus/test126.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filter(allofterms(name,,)) {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test127.in b/dql/fuzz-data/corpus/test127.in
deleted file mode 100644
index bbdd014e57c..00000000000
--- a/dql/fuzz-data/corpus/test127.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filtererr {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test128.in b/dql/fuzz-data/corpus/test128.in
deleted file mode 100644
index c99603e9436..00000000000
--- a/dql/fuzz-data/corpus/test128.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	query {
-		me(func: uid(0x0a)) {
-			friends @filtererr ()
-			gender,age
-			hometown
-		}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test129.in b/dql/fuzz-data/corpus/test129.in
deleted file mode 100644
index a893974e9c9..00000000000
--- a/dql/fuzz-data/corpus/test129.in
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-		me(allofterms(name, "barack")) {
-			friends {
-				name
-			}
-			gender,age
-			hometown
-			count(friends)
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test130.in b/dql/fuzz-data/corpus/test130.in
deleted file mode 100644
index 11524b6afe1..00000000000
--- a/dql/fuzz-data/corpus/test130.in
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-		me(func: allofterms(name, "barack")) {
-			friends(all: 5) {
-				name
-			}
-			gender,age
-			hometown
-			count(friends)
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test131.in b/dql/fuzz-data/corpus/test131.in
deleted file mode 100644
index 61252045be1..00000000000
--- a/dql/fuzz-data/corpus/test131.in
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-		me(func: allofterms("name", "barack")) {
-			friends {
-				name
-			}
-			gender,age
-			hometown
-			count(friends)
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test132.in b/dql/fuzz-data/corpus/test132.in
deleted file mode 100644
index 635f66bafcd..00000000000
--- a/dql/fuzz-data/corpus/test132.in
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-		me(func: uid(1)) {
-			count(friends), count(relatives)
-			count(classmates)
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test133.in b/dql/fuzz-data/corpus/test133.in
deleted file mode 100644
index 60c9f95b398..00000000000
--- a/dql/fuzz-data/corpus/test133.in
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-		me(func: uid(1)) {
-			count(friends, relatives
-			classmates)
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test134.in b/dql/fuzz-data/corpus/test134.in
deleted file mode 100644
index f3726ef5353..00000000000
--- a/dql/fuzz-data/corpus/test134.in
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-		me(func: uid(1)) {
-			count(friends)
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test135.in b/dql/fuzz-data/corpus/test135.in
deleted file mode 100644
index 49cbdf09bdc..00000000000
--- a/dql/fuzz-data/corpus/test135.in
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-		me(func: uid(1)) {
-			count(friends
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test136.in b/dql/fuzz-data/corpus/test136.in
deleted file mode 100644
index 9d95c4ed979..00000000000
--- a/dql/fuzz-data/corpus/test136.in
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-		me(func: uid(1)) {
-			count((friends)
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test137.in b/dql/fuzz-data/corpus/test137.in
deleted file mode 100644
index 48d268eed24..00000000000
--- a/dql/fuzz-data/corpus/test137.in
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-		me(func: uid(1)) {
-			checkpwd(password, "123456")
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test138.in b/dql/fuzz-data/corpus/test138.in
deleted file mode 100644
index 5f18b556931..00000000000
--- a/dql/fuzz-data/corpus/test138.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	# Something
-	{
-		me(func:allofterms(name, "barack")) {
-			friends {
-				name
-			} # Something
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test139.in b/dql/fuzz-data/corpus/test139.in
deleted file mode 100644
index c0fcd471acf..00000000000
--- a/dql/fuzz-data/corpus/test139.in
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-		#Something
-		me(func:allofterms(name, "barack")) {
-			friends {
-				name  # Name of my friend
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test140.in b/dql/fuzz-data/corpus/test140.in
deleted file mode 100644
index ab2e88c7f59..00000000000
--- a/dql/fuzz-data/corpus/test140.in
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-		me(func:allofterms(name, "barack")) {
-			friends {
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test141.in b/dql/fuzz-data/corpus/test141.in
deleted file mode 100644
index 0591a34ee35..00000000000
--- a/dql/fuzz-data/corpus/test141.in
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-		me(func: uid( 0x1)) {
-			<http://verygood.com/what/about/you>
-			friends @filter(allofterms(<http://verygood.com/what/about/you>,
-				"good better bad")){
-				name
-			}
-			gender,age
-			hometown
-		}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test142.in b/dql/fuzz-data/corpus/test142.in
deleted file mode 100644
index 4092b64b968..00000000000
--- a/dql/fuzz-data/corpus/test142.in
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-		me(func:anyofterms(<http://helloworld.com/how/are/you>, "good better bad")) {
-			<http://verygood.com/what/about/you>
-			friends @filter(allofterms(<http://verygood.com/what/about/you>,
-				"good better bad")){
-				name
-			}
-		}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test143.in b/dql/fuzz-data/corpus/test143.in
deleted file mode 100644
index 8666b86bb2e..00000000000
--- a/dql/fuzz-data/corpus/test143.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		me(func: uid( <http://helloworld.com/how/are/ you>)) {
-		}
-	      }
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test144.in b/dql/fuzz-data/corpus/test144.in
deleted file mode 100644
index b4006bc08db..00000000000
--- a/dql/fuzz-data/corpus/test144.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		me(func: uid( <http://helloworld.com/how/are/^you>)) {
-		}
-	      }
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test145.in b/dql/fuzz-data/corpus/test145.in
deleted file mode 100644
index 0059a44a932..00000000000
--- a/dql/fuzz-data/corpus/test145.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid( 0x3)) @normalize {
-			friends {
-				name
-			}
-			gender
-			hometown
-		}
-}
diff --git a/dql/fuzz-data/corpus/test146.in b/dql/fuzz-data/corpus/test146.in
deleted file mode 100644
index a9004f5f027..00000000000
--- a/dql/fuzz-data/corpus/test146.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	query {
-		me(func: uid( 1, 2, 3)) @groupby(friends) {
-				a as count(uid)
-		}
-
-		groups(func: uid(a)) {
-			uid
-			val(a)
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test147.in b/dql/fuzz-data/corpus/test147.in
deleted file mode 100644
index c67c6a97ef9..00000000000
--- a/dql/fuzz-data/corpus/test147.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @groupby(friends) {
-				a as count(uid)
-			}
-			hometown
-			age
-		}
-
-		groups(func: uid(a)) {
-			uid
-			val(a)
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test148.in b/dql/fuzz-data/corpus/test148.in
deleted file mode 100644
index a032b3f9a11..00000000000
--- a/dql/fuzz-data/corpus/test148.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @groupby(friends) {
-				a as max(first-name@en:ta)
-			}
-			hometown
-			age
-		}
-
-		groups(func: uid(a)) {
-			uid
-			val(a)
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test149.in b/dql/fuzz-data/corpus/test149.in
deleted file mode 100644
index 1493d079432..00000000000
--- a/dql/fuzz-data/corpus/test149.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @groupby(name@en) {
-				count(uid)
-			}
-			hometown
-			age
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test150.in b/dql/fuzz-data/corpus/test150.in
deleted file mode 100644
index 40946a67e6c..00000000000
--- a/dql/fuzz-data/corpus/test150.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @groupby(name) {
-				name
-				count(uid)
-			}
-			hometown
-			age
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test151.in b/dql/fuzz-data/corpus/test151.in
deleted file mode 100644
index d7c338614d7..00000000000
--- a/dql/fuzz-data/corpus/test151.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets {
-				name @facets(facet1,, facet2)
-			}
-			hometown
-			age
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test152.in b/dql/fuzz-data/corpus/test152.in
deleted file mode 100644
index 7396b375476..00000000000
--- a/dql/fuzz-data/corpus/test152.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets {
-				name @facets(facet1, b as)
-			}
-			hometown
-			age
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test153.in b/dql/fuzz-data/corpus/test153.in
deleted file mode 100644
index f84af42ecb7..00000000000
--- a/dql/fuzz-data/corpus/test153.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets {
-				name @facets(facet1 facet2)
-			}
-			hometown
-			age
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test154.in b/dql/fuzz-data/corpus/test154.in
deleted file mode 100644
index 616f71c905a..00000000000
--- a/dql/fuzz-data/corpus/test154.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets(orderdesc: orderdesc: closeness) {
-				name
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test155.in b/dql/fuzz-data/corpus/test155.in
deleted file mode 100644
index b97360dbaa2..00000000000
--- a/dql/fuzz-data/corpus/test155.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets(a as b as closeness) {
-				name
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test156.in b/dql/fuzz-data/corpus/test156.in
deleted file mode 100644
index 855c915b3ed..00000000000
--- a/dql/fuzz-data/corpus/test156.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets(orderdesc: closeness, order: abc) {
-				name
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test157.in b/dql/fuzz-data/corpus/test157.in
deleted file mode 100644
index f1e2d40daa6..00000000000
--- a/dql/fuzz-data/corpus/test157.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets(a as closeness, b as closeness) {
-				name
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test158.in b/dql/fuzz-data/corpus/test158.in
deleted file mode 100644
index 1a8896b1516..00000000000
--- a/dql/fuzz-data/corpus/test158.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets(orderdesc: a as b) {
-				name
-			}
-		}
-		me(func: uid(a)) { }
-	}
diff --git a/dql/fuzz-data/corpus/test159.in b/dql/fuzz-data/corpus/test159.in
deleted file mode 100644
index 7d565d40c8e..00000000000
--- a/dql/fuzz-data/corpus/test159.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets(a as orderdesc: b) {
-				name
-			}
-		}
-		me(func: uid(a)) {
-
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test160.in b/dql/fuzz-data/corpus/test160.in
deleted file mode 100644
index a94fbdc1f03..00000000000
--- a/dql/fuzz-data/corpus/test160.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets(orderdesc: closeness) {
-				name
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test161.in b/dql/fuzz-data/corpus/test161.in
deleted file mode 100644
index 6c7cc793a75..00000000000
--- a/dql/fuzz-data/corpus/test161.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets {
-				name @facets(facet1)
-			}
-			hometown
-			age
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test162.in b/dql/fuzz-data/corpus/test162.in
deleted file mode 100644
index 2cfdbe420d8..00000000000
--- a/dql/fuzz-data/corpus/test162.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets {
-				name @facets(key1, key2, key3)
-			}
-			hometown
-			age
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test163.in b/dql/fuzz-data/corpus/test163.in
deleted file mode 100644
index ec6328425db..00000000000
--- a/dql/fuzz-data/corpus/test163.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets {
-				name @facets(a as key1, key2, b as key3)
-			}
-			hometown
-			age
-		}
-		h(func: uid(a, b)) {
-			uid
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test164.in b/dql/fuzz-data/corpus/test164.in
deleted file mode 100644
index eae9277cf20..00000000000
--- a/dql/fuzz-data/corpus/test164.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets {
-				name @facets(key1, key2, key3, key1)
-			}
-			hometown
-			age
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test165.in b/dql/fuzz-data/corpus/test165.in
deleted file mode 100644
index d5eb7ef30e9..00000000000
--- a/dql/fuzz-data/corpus/test165.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets() {
-			}
-			hometown
-			age
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test166.in b/dql/fuzz-data/corpus/test166.in
deleted file mode 100644
index 5a2304d69f5..00000000000
--- a/dql/fuzz-data/corpus/test166.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	query {
-		me(func: uid(0x1)) {
-			friends @facets(key1,, key2) {
-			}
-			hometown
-			age
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test167.in b/dql/fuzz-data/corpus/test167.in
deleted file mode 100644
index a04e9ee51df..00000000000
--- a/dql/fuzz-data/corpus/test167.in
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	{
-  		me(func: anyoftext(Text, "biology"), func: anyoftext(Text, "science")) {
-			Text
-  		}
-	}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test168.in b/dql/fuzz-data/corpus/test168.in
deleted file mode 100644
index 8d28c30cbe3..00000000000
--- a/dql/fuzz-data/corpus/test168.in
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	{
-  		me(func: anyoftext(Text, "science")) {
-			Text(first: 1, first: 4)
-  		}
-	}
-	
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test169.in b/dql/fuzz-data/corpus/test169.in
deleted file mode 100644
index ae352612515..00000000000
--- a/dql/fuzz-data/corpus/test169.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	{
-		me(func: uid(0x1)) {
-			name
-			friend(first:5, orderasc: name@en:fr) {
-				name@en
-			}
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test170.in b/dql/fuzz-data/corpus/test170.in
deleted file mode 100644
index 81fa0257ef0..00000000000
--- a/dql/fuzz-data/corpus/test170.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	{
-	  me(func:regexp(name, /^[a-zA-z]*[^Kk ]?[Nn]ight/), orderasc: name@en, first:5) {
-		name@en
-		name@de
-		name@it
-	  }
-	}
diff --git a/dql/fuzz-data/corpus/test171.in b/dql/fuzz-data/corpus/test171.in
deleted file mode 100644
index 1a5b2ba4c4b..00000000000
--- a/dql/fuzz-data/corpus/test171.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	{
-	  me(func: uid(0x1)) {
-	    name
-		friend @filter(regexp(name@en, /case INSENSITIVE regexp with \/ escaped value/i)) {
-	      name@en
-	    }
-	  }
-    }
diff --git a/dql/fuzz-data/corpus/test172.in b/dql/fuzz-data/corpus/test172.in
deleted file mode 100644
index 93b3ca4c546..00000000000
--- a/dql/fuzz-data/corpus/test172.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	{
-	  me(func:regexp(name@en, /another\/compilicated ("") regexp('')/)) {
-	    name
-	  }
-    }
diff --git a/dql/fuzz-data/corpus/test173.in b/dql/fuzz-data/corpus/test173.in
deleted file mode 100644
index ec34c6200f2..00000000000
--- a/dql/fuzz-data/corpus/test173.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	{
-	  me(func:allofterms(name, "barack")) @filter(regexp(secret, /whitehouse[0-9]{1,4}/fLaGs)) {
-	    name
-	  }
-    }
diff --git a/dql/fuzz-data/corpus/test174.in b/dql/fuzz-data/corpus/test174.in
deleted file mode 100644
index 00a13ebe042..00000000000
--- a/dql/fuzz-data/corpus/test174.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	{
-	  me(func:regexp(name@en, /pattern/123)) {
-	    name
-	  }
-    }
diff --git a/dql/fuzz-data/corpus/test175.in b/dql/fuzz-data/corpus/test175.in
deleted file mode 100644
index 7d93d7629b5..00000000000
--- a/dql/fuzz-data/corpus/test175.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	{
-	  me(func:regexp(name@en, /pattern/flag123)) {
-	    name
-	  }
-    }
diff --git a/dql/fuzz-data/corpus/test176.in b/dql/fuzz-data/corpus/test176.in
deleted file mode 100644
index f409565ea72..00000000000
--- a/dql/fuzz-data/corpus/test176.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	{
-	  me(func:regexp(name@en, /pattern\/)) {
-	    name
-	  }
-    }
diff --git a/dql/fuzz-data/corpus/test177.in b/dql/fuzz-data/corpus/test177.in
deleted file mode 100644
index aee59accd13..00000000000
--- a/dql/fuzz-data/corpus/test177.in
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-		"query" : "query versions($a: string, $b: string, $c: string){versions(func: uid($a,$b,$c)){versions{ version_number}}}",
-		"variables" : {"$a": "3", "$b": "3", "$c": "3"}
-	}
\ No newline at end of file
diff --git a/dql/fuzz-data/corpus/test178.in b/dql/fuzz-data/corpus/test178.in
deleted file mode 100644
index 68e2196515d..00000000000
--- a/dql/fuzz-data/corpus/test178.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	{
-		me(func: uid(1, 20)) @filter(eq(name, ["And\"rea", "Bob"])) {
-		 name
-		}
-	}
diff --git a/dql/fuzz-data/corpus/test179.in b/dql/fuzz-data/corpus/test179.in
deleted file mode 100644
index 67d3eb5744d..00000000000
--- a/dql/fuzz-data/corpus/test179.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	{
-		me(func: eq(age, [1, 20])) @filter(eq(name, ["And\"rea", "Bob"])) {
-		 name
-		}
-	}
diff --git a/dql/fuzzit.sh b/dql/fuzzit.sh
deleted file mode 100644
index c65f346a7cc..00000000000
--- a/dql/fuzzit.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-set -xe
-
-export GO111MODULE="on"
-## Step 1:  Build fuzzing targets
-
-## Install go-fuzz
-go get -u github.com/dvyukov/go-fuzz/go-fuzz github.com/dvyukov/go-fuzz/go-fuzz-build
-
-## Build a fuzz target which is later used for fuzzitdev for Continuous Fuzzing.
-go-fuzz-build -o parser-fuzz-target.a -libfuzzer .
-docker run --rm -v "$(pwd):/tmp" teeks99/clang-ubuntu:10 clang-10 -fsanitize=fuzzer /tmp/parser-fuzz-target.a -o /tmp/parser-fuzz-target
-
-## Step 2: Perform Fuzzing and local regression on the fuzz target using fuzzit CLI
-
-## Install fuzzit latest version:
-wget -O fuzzit https://github.com/fuzzitdev/fuzzit/releases/latest/download/fuzzit_Linux_x86_64
-chmod a+x fuzzit
-
-## Create a target on fuzzit servers
-./fuzzit create target --skip-if-exists --seed ./dql/fuzz-data/corpus.tar.gz parser-fuzz-target
-## Start a job (${1} = [fuzzing][local-regression]).
-./fuzzit create job --type "${1}" dgraph-io-gh/parser-fuzz-target parser-fuzz-target
-
-rm -f parser-fuzz-target parser-fuzz-target.a fuzzit
diff --git a/dql/parser_fuzz.go b/dql/parser_fuzz.go
deleted file mode 100644
index f70252c11e5..00000000000
--- a/dql/parser_fuzz.go
+++ /dev/null
@@ -1,41 +0,0 @@
-//go:build gofuzz
-// +build gofuzz
-
-/*
- * Copyright 2017-2023 Dgraph Labs, Inc. and Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dql
-
-// GQL parser fuzzer for use with https://github.com/dvyukov/go-fuzz.
-//
-// Build: go-fuzz-build github.com/dgraph-io/dgraph/dql
-//
-// Run: go-fuzz -bin=./dql-fuzz.zip -workdir fuzz-data
-
-const (
-	fuzzInteresting = 1
-	fuzzNormal      = 0
-	fuzzDiscard     = -1
-)
-
-func Fuzz(in []byte) int {
-	_, err := Parse(Request{Str: string(in)})
-	if err == nil {
-		return fuzzInteresting
-	}
-
-	return fuzzNormal
-}
diff --git a/dql/parser_fuzz_test.go b/dql/parser_fuzz_test.go
new file mode 100644
index 00000000000..514a2e77768
--- /dev/null
+++ b/dql/parser_fuzz_test.go
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2017-2023 Dgraph Labs, Inc. and Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dql
+
+import (
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
+	"io"
+	"os"
+	"testing"
+)
+
+const (
+	corpusTarFile = "fuzz-data/corpus.tar.gz"
+)
+
+func FuzzTestParser(f *testing.F) {
+	// add the corpus data to the test
+	fd, err := os.Open(corpusTarFile)
+	if err != nil {
+		f.Fatalf("error opening corpus tar file: %v", err)
+	}
+	defer func() {
+		if err := fd.Close(); err != nil {
+			f.Logf("error closing corpus tar file: %v", err)
+		}
+	}()
+
+	gzr, err := gzip.NewReader(fd)
+	if err != nil {
+		f.Fatalf("error reading corpus tar file: %v", err)
+	}
+	defer func() {
+		if err := gzr.Close(); err != nil {
+			f.Logf("error closing corpus tar file: %v", err)
+		}
+	}()
+	tr := tar.NewReader(gzr)
+
+	for {
+		header, err := tr.Next()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			f.Fatalf("error while reading corpus tar file: %v", err)
+		}
+
+		switch header.Typeflag {
+		case tar.TypeReg:
+			buf := new(bytes.Buffer)
+			if _, err := io.Copy(buf, tr); err != nil {
+				f.Fatalf("error while copying file [%v]: %v", header.Name, err)
+			}
+			f.Add(buf.Bytes())
+			f.Logf("adding input: %v", buf.String())
+		}
+	}
+
+	f.Fuzz(func(t *testing.T, in []byte) {
+		defer func() {
+			if err := recover(); err != nil {
+				t.Errorf("DQL parsing failed for input [%x] with error: [%v]", in, err)
+			}
+		}()
+
+		_, _ = Parse(Request{Str: string(in)})
+	})
+}
diff --git a/go.mod b/go.mod
index cbf027325fc..051b0659509 100644
--- a/go.mod
+++ b/go.mod
@@ -56,11 +56,11 @@ require (
 	go.uber.org/zap v1.16.0
 	golang.org/x/crypto v0.9.0
 	golang.org/x/net v0.10.0
-	golang.org/x/sync v0.1.0
-	golang.org/x/sys v0.8.0
+	golang.org/x/sync v0.2.0
+	golang.org/x/sys v0.9.0
 	golang.org/x/term v0.8.0
 	golang.org/x/text v0.9.0
-	golang.org/x/tools v0.6.0
+	golang.org/x/tools v0.9.3
 	google.golang.org/grpc v1.52.0
 	gopkg.in/square/go-jose.v2 v2.3.1
 	gopkg.in/yaml.v2 v2.4.0
@@ -124,7 +124,7 @@ require (
 	github.com/xdg/stringprep v1.0.0 // indirect
 	go.uber.org/atomic v1.6.0 // indirect
 	go.uber.org/multierr v1.5.0 // indirect
-	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/mod v0.10.0 // indirect
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
 	google.golang.org/api v0.30.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
diff --git a/go.sum b/go.sum
index ad45126e357..dc014dee0fd 100644
--- a/go.sum
+++ b/go.sum
@@ -773,8 +773,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -836,8 +836,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
+golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -893,8 +893,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
+golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
@@ -970,8 +970,8 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=