diff --git a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/deferral.qms/hlt1only.qmt b/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/deferral.qms/hlt1only.qmt
deleted file mode 100755
index ecbaa6d9b76503c32a146b795ec7d6d99723834c..0000000000000000000000000000000000000000
--- a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/deferral.qms/hlt1only.qmt
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
-<!--
-#######################################################
-# SUMMARY OF THIS TEST
-# ...................
-# Author: rlambert
-# Purpose: Run Hlt1 stand-alone to test against when it's run with Hlt2 after,m and to make an intermediate file for testing Hlt2 on top of later
-# Prerequisites:
-# Common failure modes, severities and cures:
-# . SEVERE: Segfault or raised exception, stderr, nonzero return code
-# . MAJOR: additional FATAL/ERROR messages always a major problem. no ERROR messages should ever be printed when running this test.
-# . MAJOR: HLT1, at least, should run the same independent of HLT2
-# . MINOR: additional WARNING messages, it is unclear how severe these may be, you will need to hunt down the cause and either fix the problem or suppress the warning.
-# . TRIVIAL: sometimes one or two lines will take too long and fire the error event stream in teh nighly tests. This is safe to ignore.
-#######################################################
--->
-<extension class="GaudiTest.GaudiExeTest" kind="test">
- <argument name="program"><text>gaudirun.py</text></argument>
- <argument name="timeout">
- <integer>1200</integer>
- </argument>
- <argument name="args"><set>
- <text>../options/Moore_Hlt1And2.py</text>
- <text>../options/Input_Default.py</text>
- <text>../options/default-threshold.py</text>
- <text>../options/Moore_Hlt1Only.py</text>
- <text>--option</text>
- <text>from Configurables import Moore; Moore().EnableTimer="deferral.hlt1only.csv"; Moore().RemoveInputHltRawBanks = True; Moore().OutputLevel = 3</text>
- </set></argument>
- <argument name="prerequisites"><set>
- <tuple><text>moore.physics.2016_draft</text><enumeral>PASS</enumeral></tuple>
- </set></argument>
- <argument name="validator"><text>
-myname='moore.physics.deferral.hlt1only'
-
-from Moore.QMTest.MooreTests import compareTimingTableFiles
-
-compareTimingTableFiles(myname,result,causes,"deferral.hlt1only.csv","physics.2016_draft.csv","Hlt1")
-
-#count error lines, shouldn't be any warnings or errors, ideally
-
-countErrorLines({"FATAL":0,"ERROR":0,"WARNING":0})
-
-</text></argument>
-</extension>
-
diff --git a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/deferral.qms/hlt2only.qmt b/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/deferral.qms/hlt2only.qmt
deleted file mode 100644
index 42ea4913ea05a676d82afaa7798742f83a95f553..0000000000000000000000000000000000000000
--- a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/deferral.qms/hlt2only.qmt
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
-<!--
-#######################################################
-# SUMMARY OF THIS TEST
-# ...................
-# Author: rlambert
-# Purpose: Run HLT2 stand alone and independentlyusing Gerhard's sledehammer and compare it to a reference timing table
-# Prerequisites:
-# Common failure modes, severities and cures:
-# . SEVERE: Segfault or raised exception, stderr, nonzero return code
-# . MAJOR: additional FATAL/ERROR messages always a major problem. no ERROR messages should ever be printed when running this test.
-# . MINOR: additional WARNING messages, it is unclear how severe these may be, you will need to hunt down the cause and either fix the problem or suppress the warning.
-#######################################################
--->
-<extension class="GaudiTest.GaudiExeTest" kind="test">
- <argument name="program"><text>gaudirun.py</text></argument>
- <argument name="timeout">
- <integer>1200</integer>
- </argument>
- <argument name="args"><set>
- <text>../options/Moore_Hlt1And2.py</text>
- <text>../options/Input_Default.py</text>
- <text>../options/default-threshold.py</text>
- <text>../options/Moore_Hlt2Only.py</text>
- <text>--option</text>
- <text>from Configurables import Moore; Moore().EnableTimer="deferral.hlt2only.csv"; from Gaudi.Configuration import EventSelector; EventSelector().PrintFreq = 100; from Configurables import HltConf ; HltConf().PruneHltANNSvc = False</text>
- </set></argument>
- <argument name="unsupported_platforms"><set><text>win.*</text></set></argument>
- <argument name="validator"><text>
-myname='moore.physics.deferral.hlt2only'
-
-from Moore.QMTest.MooreTests import compareTimingTableFiles
-
-compareTimingTableFiles(myname,result,causes,"deferral.hlt2only.csv","../refs/deferral.hlt2only.csv","Hlt2")
-
-#count error lines, shouldn't be any warnings or errors, ideally
-countErrorLines({"FATAL":0,"ERROR":0,"WARNING":21})
-findReferenceBlock("""
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: RoutingBits RawBanks: requested to update bank, but non-zero third entry
-Hlt2RoutingBitsWriter WARNING HltRoutingBitsWriter:: The WARNING message is suppressed : ' RoutingBits RawBanks: requested to update bank, but non-zero third entry'
-""", id = "OverwriteRoutingBits" )
-
-</text></argument>
-</extension>
-