diff --git a/queries/1282876.yaml b/queries/1282876.yaml
deleted file mode 100644
index f2bf4ccb..00000000
--- a/queries/1282876.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >
-  (message:"fatal: The remote end hung up unexpectedly" OR
-  (message:"fatal:" AND message:"Recv failure: Connection timed out")) AND
-  tags:"console" AND NOT build_queue:"check-tripleo"
diff --git a/queries/1669468.yaml b/queries/1669468.yaml
deleted file mode 100644
index 48ab1d7b..00000000
--- a/queries/1669468.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >
-  message:"AssertionError: True is not false : Token must be invalid because the connection closed." AND
-  tags:"console"
diff --git a/queries/1745168.yaml b/queries/1745168.yaml
deleted file mode 100644
index 4402dcf5..00000000
--- a/queries/1745168.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >-
-  message:"backup" AND
-  message:"failed to reach available status (current creating) within the required time" AND
-  tags:"console"
diff --git a/queries/1798472.yaml b/queries/1798472.yaml
deleted file mode 100644
index 6280982c..00000000
--- a/queries/1798472.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-query: >-
-    message:"fixtures._fixtures.timeout.TimeoutException" AND
-    (build_name:"neutron-fullstack" OR build_name:"neutron-fullstack-python36") AND
-    tags:console AND
-    filename:"job-output.txt"
diff --git a/queries/1803544.yaml b/queries/1803544.yaml
deleted file mode 100644
index 9bf0e17f..00000000
--- a/queries/1803544.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >-
-  message:"error mounting image volumes: unable to find user root: no matching entries in passwd file" AND
-  tags:"console"
diff --git a/queries/1804434.yaml b/queries/1804434.yaml
deleted file mode 100644
index 11ce1a5a..00000000
--- a/queries/1804434.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >-
-  message:"exec user process caused \"no such file or directory" AND
-  tags:"console"
diff --git a/queries/1808171.yaml b/queries/1808171.yaml
deleted file mode 100644
index 7cb2001a..00000000
--- a/queries/1808171.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >-
-  message:"tempest-TaggedBootDevicesTest" AND
-  message:"Timeout waiting for [('network-vif-plugged'" AND
-  tags:"screen-n-cpu.txt"
diff --git a/queries/1818560.yaml b/queries/1818560.yaml
deleted file mode 100644
index 3d150516..00000000
--- a/queries/1818560.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >-
-  message:"no such option sync_on_startup in group [placement_database]" AND
-  tags:"console"
diff --git a/queries/1819166.yaml b/queries/1819166.yaml
deleted file mode 100644
index a7e8d174..00000000
--- a/queries/1819166.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >-
-  message:"error: unrecognized arguments: --force" AND
-  tags:"console"
diff --git a/queries/1819374.yaml b/queries/1819374.yaml
deleted file mode 100644
index 221f8cdb..00000000
--- a/queries/1819374.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >-
-  message:"Port" AND
-  message:"from network info_cache is no longer associated with instance in Neutron. Removing from network info_cache.'" AND
-  tags:"console"
diff --git a/queries/1819910.yaml b/queries/1819910.yaml
deleted file mode 100644
index c26b0679..00000000
--- a/queries/1819910.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >-
-  message:"Failed to save allocation for" AND
-  message:"DestinationHypervisorTooOld" AND
-  tags:"screen-n-super-cond.txt"
diff --git a/queries/1820337.yaml b/queries/1820337.yaml
deleted file mode 100644
index 929e2df6..00000000
--- a/queries/1820337.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >-
-  message:"testtools.matchers._impl.MismatchError: ['bfv'] != []" AND
-  tags:"console"
diff --git a/queries/1820892.yaml b/queries/1820892.yaml
deleted file mode 100644
index a2b170da..00000000
--- a/queries/1820892.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-query: >-
-  message:"ModuleNotFoundError" AND
-  tags:"screen" AND
-  ( build_name:"grenade-py3" OR
-    build_name:"neutron-grenade-multinode" OR
-    build_name:"neutron-grenade-dvr-multinode" )
diff --git a/queries/1820993.yaml b/queries/1820993.yaml
deleted file mode 100644
index b691395a..00000000
--- a/queries/1820993.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >-
-  message:"ERROR! 'msg' is not a valid attribute for a Task" AND
-  tags:"console" AND
-  project:"openstack/neutron"
diff --git a/queries/1821007.yaml b/queries/1821007.yaml
deleted file mode 100644
index 17ee7d73..00000000
--- a/queries/1821007.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >-
-  message:"The error was: 'gabbi_tempest_path' is undefined" AND
-  tags:"console"
diff --git a/queries/1821092.yaml b/queries/1821092.yaml
deleted file mode 100644
index 0ea118de..00000000
--- a/queries/1821092.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >-
-  message:"conf_fixture=placement_config, db=False) as placement:" AND
-  tags:"console"
diff --git a/queries/1822605.yaml b/queries/1822605.yaml
deleted file mode 100644
index de6efc24..00000000
--- a/queries/1822605.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >-
-  message:"Multiple possible networks found, use a Network ID to be more specific" AND
-  tags:"console" AND
-  build_name:"nova-live-migration"
diff --git a/queries/1825435.yaml b/queries/1825435.yaml
deleted file mode 100644
index 1b184681..00000000
--- a/queries/1825435.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >-
-  message:"| Fatal Python error: Cannot recover from stack overflow." AND
-  tags:"console" AND
-  project:"openstack/nova"
diff --git a/queries/1826953.yaml b/queries/1826953.yaml
deleted file mode 100644
index 5833bff2..00000000
--- a/queries/1826953.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >-
-  message:"{\"code\": 409, \"message\": \"Volume Type luks already exists." AND
-  tags:"console"
diff --git a/queries/1827083.yaml b/queries/1827083.yaml
deleted file mode 100644
index c89c66e2..00000000
--- a/queries/1827083.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >-
-  message:"ERROR: Could not install packages due to an EnvironmentError: HTTPSConnectionPool(host='git.openstack.org', port=443): Max retries exceeded with url: /cgit/openstack/requirements/plain/upper-constraints.txt (Caused by NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at" AND
-  message:"Failed to establish a new connection: [Errno -3] Temporary failure in name resolution',))" AND
-  tags:"console"
diff --git a/queries/1831474.yaml b/queries/1831474.yaml
deleted file mode 100644
index 546467ce..00000000
--- a/queries/1831474.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >-
-  message:"('Connection broken: IncompleteRead(0 bytes read)', IncompleteRead(0 bytes read))" AND
-  tags:"console" AND
-  node_provider:"rax-dfw"
diff --git a/queries/1838811.yaml b/queries/1838811.yaml
deleted file mode 100644
index 2334782c..00000000
--- a/queries/1838811.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >-
-  message:"|     outfile = open(opts.outfile, 'ab', 0)" AND
-  tags:"console"
diff --git a/queries/1839515.yaml b/queries/1839515.yaml
deleted file mode 100644
index 84f6d135..00000000
--- a/queries/1839515.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-query: >-
-  message:"ERROR [nova.compute.manager] Did not find resource allocations for migration" AND
-  message:"on source node" AND
-  message:"Unable to revert source node allocations back to the instance." AND
-  tags:"console" AND (
-  build_name:"nova-tox-functional" OR
-  build_name:"nova-tox-functional-py36")