diff --git a/queries/1235435.yaml b/queries/1235435.yaml
deleted file mode 100644
index 0db2a7bf..00000000
--- a/queries/1235435.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >
-  message:"One or more ports have an IP allocation from this subnet"
-  AND message:" SubnetInUse: Unable to complete operation on subnet"
-  AND tags:"screen-q-svc.txt"
diff --git a/queries/1253482.yaml b/queries/1253482.yaml
deleted file mode 100644
index 2fbd8903..00000000
--- a/queries/1253482.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# do not delete this bug even if you don't see the hits
-# in ER, as it remains an unfixed issue.
-query: >
-  loglevel:"CRITICAL"
-  AND message:"Address already in use"
-  AND tags:"screen-key.txt"
diff --git a/queries/1254972.yaml b/queries/1254972.yaml
deleted file mode 100644
index 1df71bec..00000000
--- a/queries/1254972.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >
-  message:"Invalid input received: Invalid volume: Volume status must
-  be available or error, but current status is: attaching"
-  AND tags:console
diff --git a/queries/1257626.yaml b/queries/1257626.yaml
deleted file mode 100644
index ba2de565..00000000
--- a/queries/1257626.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >
-  message:"nova.compute.manager Timeout: Timeout while waiting on RPC response - topic: \"network\", RPC method: \"allocate_for_instance\""
-  AND tags:"screen-n-cpu.txt"
diff --git a/queries/1260310.yaml b/queries/1260310.yaml
deleted file mode 100644
index 85d279e7..00000000
--- a/queries/1260310.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-# note this is a low freq error that goes back at least until mid 2013, best
-# to not remove it when purging queries
-query: >
-  message:"An error occurred while enabling hairpin mode on domain with xml"
-  AND tags:screen-n-cpu.txt
diff --git a/queries/1260644.yaml b/queries/1260644.yaml
deleted file mode 100644
index 4aa6772d..00000000
--- a/queries/1260644.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >
-  message:"cannot be rescued: Driver Error: [Errno 2] No such file or directory:"
-  AND tags:"screen-n-cpu.txt"
diff --git a/queries/1266616.yaml b/queries/1266616.yaml
deleted file mode 100644
index 2459dca8..00000000
--- a/queries/1266616.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >
-  message:"Failed to connect to 2001:4800:"
-  AND tags:"console"
diff --git a/queries/1273908.yaml b/queries/1273908.yaml
deleted file mode 100644
index dc393fc7..00000000
--- a/queries/1273908.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-query: >
-  message:"Server" AND
-  message:"failed to reach RESCUE status and task state \"None\" within the required time" AND
-  message:"Current status: ACTIVE. Current task state: rescuing." AND
-  tags:"console"
diff --git a/queries/1274828.yaml b/queries/1274828.yaml
deleted file mode 100644
index 96b91b0b..00000000
--- a/queries/1274828.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >
-  message:"ERROR with Account server 127\.0\.0\.1\:6012\/sdb1" AND
-  message:"Connection refused" AND
-  tags:"syslog.txt"
diff --git a/queries/1275256.yaml b/queries/1275256.yaml
deleted file mode 100644
index fb6e8b22..00000000
--- a/queries/1275256.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-query: >
-  message:"Details: Server"
-  AND message:"failed to reach SHELVED_OFFLOADED status and task state \"None\" within the required time"
-  AND message:"Current status: SHELVED. Current task state: None."
-  AND tags:"console"
diff --git a/queries/1275500.yaml b/queries/1275500.yaml
deleted file mode 100644
index add27df2..00000000
--- a/queries/1275500.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >
-  message:"Network filter not found"
-  AND tags:"screen-n-cpu.txt"
diff --git a/queries/1280464.yaml b/queries/1280464.yaml
deleted file mode 100644
index 0e0f3f78..00000000
--- a/queries/1280464.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >
-  tags:"console"
-  AND message:"mount: wrong fs type, bad option, bad superblock on /dev/loop1,"
-  AND (build_name:"check-grenade-dsvm-neutron" OR build_name:"gate-grenade-dsvm-neutron")
diff --git a/queries/1282795.yaml b/queries/1282795.yaml
deleted file mode 100644
index e23b96a1..00000000
--- a/queries/1282795.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >
-  message:"ERROR: InterpreterNotFound: python2.6"
-  AND tags:"console.html"
-  AND build_name:*python26
diff --git a/queries/1290080.yaml b/queries/1290080.yaml
deleted file mode 100644
index 175a1338..00000000
--- a/queries/1290080.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >
-  message:"echo \'Not found" AND
-  message:"cirros-0.3.1-x86_64-uec.tar.gz" AND
-  tags:"console"
diff --git a/queries/1291620.yaml b/queries/1291620.yaml
deleted file mode 100644
index c3b9e3a8..00000000
--- a/queries/1291620.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >
-  message:"UnexpectedTaskStateError: Unexpected task state: expecting [None] but the actual state is powering-off" AND
-  filename:"console.html" AND
-  (build_name:"gate-nova-python27" OR build_name:"gate-nova-python26")
\ No newline at end of file
diff --git a/queries/1295876.yaml b/queries/1295876.yaml
deleted file mode 100644
index f2a40609..00000000
--- a/queries/1295876.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >
-  message:"cgroup\: No space left on device"
-  AND tags:"screen-n-cpu.txt"
diff --git a/queries/1303802.yaml b/queries/1303802.yaml
deleted file mode 100644
index 9cd46b2b..00000000
--- a/queries/1303802.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >-
-  message: "qemu-img: error" AND
-  tags:screen-n-cpu.txt
diff --git a/queries/1313655.yaml b/queries/1313655.yaml
deleted file mode 100644
index c3b5a3eb..00000000
--- a/queries/1313655.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >
-  message:"self.assertEqual(reservation_1.id, reservation_1a.id)"
-  AND tags:"console.html"
diff --git a/queries/1313851.yaml b/queries/1313851.yaml
deleted file mode 100644
index 391cfb8b..00000000
--- a/queries/1313851.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-query: >-
-  message:"(OperationalError) (1205, 'Lock wait timeout exceeded; try restarting transaction')" AND NOT
-  message:"Traceback (most recent call last" AND
-  tags:"screen-q-svc.txt" AND
-  message:"INSERT INTO ipallocations"
diff --git a/queries/1315668.yaml b/queries/1315668.yaml
deleted file mode 100644
index b6345dd7..00000000
--- a/queries/1315668.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >
-  message:"Caught error\: This result object does not return rows. It has been closed automatically." AND
-  tags:screen-n-api.txt
diff --git a/queries/1320617.yaml b/queries/1320617.yaml
deleted file mode 100644
index 2b53680c..00000000
--- a/queries/1320617.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-query: >
-  message:"Image"
-  AND message:"failed to reach ACTIVE status within the required time"
-  AND message:"Current status\: SAVING."
-  AND tags:console
diff --git a/queries/1323715.yaml b/queries/1323715.yaml
deleted file mode 100644
index 84987e93..00000000
--- a/queries/1323715.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >
-  message:"InternalServerError: Failed to check policy tenant_id:%(tenant_id)s because Unable to verify match:%(tenant_id)s as the parent resource: tenant was not found" AND
-  tags:screen-n-api.txt
diff --git a/queries/1327218.yaml b/queries/1327218.yaml
deleted file mode 100644
index 8f8a22c3..00000000
--- a/queries/1327218.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-query: >
-  message:"Exception during message handling"
-  AND message:"expected string or buffer"
-  AND message:"connection_info = jsonutils.loads(bdm.connection_info)"
-  AND tags:screen-n-cpu.txt
diff --git a/queries/1329563.yaml b/queries/1329563.yaml
deleted file mode 100644
index a98d9539..00000000
--- a/queries/1329563.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >
-  message:"HTTP exception thrown: Length in request body must be an integer value" AND
-  tags:"screen-n-api.txt"
diff --git a/queries/1330776.yaml b/queries/1330776.yaml
deleted file mode 100644
index f8423c25..00000000
--- a/queries/1330776.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-query: >
-  message:"Can\\'t remove open logical volume" AND
-  message:"Exit code: 5" AND
-  message:"Exception during message handling" AND
-  tags:"screen-c-vol.txt"
diff --git a/queries/1332287.yaml b/queries/1332287.yaml
deleted file mode 100644
index 86bac63c..00000000
--- a/queries/1332287.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-query: >
-  message:"IOError" AND
-  message:"No such file or directory" AND
-  message:"build/httpretty/readme.rst" AND
-  tags:"console" AND NOT (
-  build_queue:"periodic" OR build_queue:"post")
diff --git a/queries/1332917.yaml b/queries/1332917.yaml
deleted file mode 100644
index 0396db88..00000000
--- a/queries/1332917.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >-
-  message:"(OperationalError) (1213, 'Deadlock found when trying to get lock; try restarting transaction') 'DELETE FROM ipavailabilityranges"
-  AND tags:screen-q-svc.txt
diff --git a/queries/1334898.yaml b/queries/1334898.yaml
deleted file mode 100644
index ae96e934..00000000
--- a/queries/1334898.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-query: >-
-  message:"/opt/stack/new/pbr/tools/integration.sh" AND
-  message:"/home/jenkins/mirror_package_list.txt: No such file or directory" AND
-  tags:"console" AND (
-  build_name:"gate-requirements-integration-dsvm" OR
-  build_name:"check-requirements-integration-dsvm")
diff --git a/queries/1335878.yaml b/queries/1335878.yaml
deleted file mode 100644
index cb277686..00000000
--- a/queries/1335878.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-query: >-
-  message:"ConnectionError: HTTPConnectionPool" AND
-  message:"Max retries exceeded with url" AND
-  message:"class 'socket.error'" AND
-  message:"ECONNREFUSED" AND
-  tags:console AND
-  project:"openstack/glance"
diff --git a/queries/1336161.yaml b/queries/1336161.yaml
deleted file mode 100644
index 298f63cb..00000000
--- a/queries/1336161.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >-
-  message:"EnvironmentError: mysql_config not found" AND
-  tags:console
diff --git a/queries/1343274.yaml b/queries/1343274.yaml
deleted file mode 100644
index 67a39f29..00000000
--- a/queries/1343274.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >
-  message:"DBDeadlock" AND
-  message:"INSERT INTO quota_usages" AND
-  tags:"screen-c-api.txt"
diff --git a/queries/1351627.yaml b/queries/1351627.yaml
deleted file mode 100644
index ad16c988..00000000
--- a/queries/1351627.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-query: >
-  message:"Details: Sample for metric:image.update with query:('resource', 'eq'" AND
-  message:"has not been added to the database within" AND
-  tags:"console"
diff --git a/queries/1351629.yaml b/queries/1351629.yaml
deleted file mode 100644
index 04e0445d..00000000
--- a/queries/1351629.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-query: >
-  message:"format_stack_output" AND
-  message:"cinderclient" AND
-  message:"NotFound: The resource could not be found" AND
-  tags:"screen-h-eng.txt"
diff --git a/queries/1355929.yaml b/queries/1355929.yaml
deleted file mode 100644
index 745ca4ce..00000000
--- a/queries/1355929.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-query: >
-  message:"ERROR:  source database \"template1\" is being accessed by other users" AND
-  tags:"console" AND
-  build_branch:"stable/havana" AND
-  build_name:"gate-nova-python26"
diff --git a/queries/1355983.yaml b/queries/1355983.yaml
deleted file mode 100644
index e2c647b0..00000000
--- a/queries/1355983.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-query: >
-  message:"+ echo \'Could not find mongod command\'" AND
-  tags:"console" AND (
-  build_name:"periodic-ceilometer-python26-havana" OR
-  build_name:"gate-ceilometer-python26")
diff --git a/queries/1355998.yaml b/queries/1355998.yaml
deleted file mode 100644
index 366a6f9c..00000000
--- a/queries/1355998.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-query: >
-   message:"This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMMAX parameter"
-   AND tags:"console"