diff --git a/DaVinciTests/tests/options/DVTestDecayTreeTuple-MC.py b/DaVinciTests/tests/options/DVTestDecayTreeTuple-MC.py
deleted file mode 100755
index 333067d89c96107cb9644edbb7ab4143f5f97be2..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/DVTestDecayTreeTuple-MC.py
+++ /dev/null
@@ -1,60 +0,0 @@
-###############################################################################
-# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
-# #
-# This software is distributed under the terms of the GNU General Public #
-# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
-# #
-# In applying this licence, CERN does not waive the privileges and immunities #
-# granted to it by virtue of its status as an Intergovernmental Organization #
-# or submit itself to any jurisdiction. #
-###############################################################################
- ## @file DVTestHltDecayTreeTuple-TisTos.py
- #
- # See DecayTreeTuple documentation
- #
- # @author P. Koppenburg
- # @date 2008-03-07
- #
-
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import *
-########################################################################
-#
-# The Decay Tuple
-#
-from Configurables import DecayTreeTuple
-tuple = DecayTreeTuple("Tuple")
-tuple.ToolList += [
- "TupleToolTrigger"
- , "TupleToolGeometry"
- , "TupleToolKinematic"
- , "TupleToolPrimaries"
- , "TupleToolEventInfo"
- , "TupleToolMCTruth"
- , "TupleToolTISTOS"
- ]
-tuple.Inputs = ["Phys/StdLooseJpsi2MuMu"]
-tuple.Decay = "J/psi(1S) -> ^mu+ ^mu-"
-#tuple.OutputLevel = 1
-########################################################################
-#
-# DaVinci
-#
-from Configurables import DaVinci
-DaVinci().EvtMax = 100
-DaVinci().PrintFreq = 1
-DaVinci().SkipEvents = 0
-DaVinci().DataType = "MC09"
-DaVinci().Simulation = True
-DaVinci().TupleFile = "DecayTreeTuple_TisTos.root" # Ntuple
-DaVinci().MoniSequence = [ tuple ]
-DaVinci().ReplaceL0BanksWithEmulated = True
-DaVinci().Hlt = True
-DaVinci().HltThresholdSettings = 'Physics_10000Vis_1000L0_40Hlt1_EffectiveHlt2_Jul09'
-
-#-- GAUDI jobOptions generated on Mon Jun 22 17:05:57 2009
-#-- Contains event types :
-#-- 24142000 - 8 files - 123545 events - 27.24 GBytes
-
-
-MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/DVTestDecayTreeTuple-TisTos.py b/DaVinciTests/tests/options/DVTestDecayTreeTuple-TisTos.py
deleted file mode 100755
index 59be4cce66dd86478730958ba95ddd7dafda5c24..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/DVTestDecayTreeTuple-TisTos.py
+++ /dev/null
@@ -1,56 +0,0 @@
-###############################################################################
-# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
-# #
-# This software is distributed under the terms of the GNU General Public #
-# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
-# #
-# In applying this licence, CERN does not waive the privileges and immunities #
-# granted to it by virtue of its status as an Intergovernmental Organization #
-# or submit itself to any jurisdiction. #
-###############################################################################
- ## @file DVTestHltDecayTreeTuple-TisTos.py
- #
- # See DecayTreeTuple documentation
- #
- # @author P. Koppenburg
- # @date 2008-03-07
- #
-
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import *
-########################################################################
-#
-# The Decay Tuple
-#
-from Configurables import DecayTreeTuple
-tuple = DecayTreeTuple("Tuple")
-tuple.ToolList += [
- "TupleToolTrigger"
- , "TupleToolGeometry"
- , "TupleToolKinematic"
- , "TupleToolPrimaries"
- , "TupleToolEventInfo"
- , "TupleToolMCTruth"
- , "TupleToolTISTOS"
- ]
-tuple.Inputs = ["Phys/StdLooseJpsi2MuMu"]
-tuple.Decay = "J/psi(1S) -> ^mu+ ^mu-"
-#tuple.OutputLevel = 1
-########################################################################
-#
-# DaVinci
-#
-from Configurables import DaVinci
-DaVinci().EvtMax = 100
-DaVinci().PrintFreq = 1
-DaVinci().SkipEvents = 0
-DaVinci().DataType = "MC09"
-DaVinci().Simulation = True
-DaVinci().CondDBtag = 'MC09-20100430-vc-md100'
-DaVinci().TupleFile = "DecayTreeTuple_TisTos.root" # Ntuple
-DaVinci().MoniSequence = [ tuple ]
-DaVinci().ReplaceL0BanksWithEmulated = True
-DaVinci().Hlt = True
-DaVinci().HltThresholdSettings = 'Physics_10000Vis_1000L0_40Hlt1_EffectiveHlt2_Jul09'
-
-MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/PID/DaVinci-DST-ANNPID-Upgrade-Test.py b/DaVinciTests/tests/options/PID/DaVinci-DST-ANNPID-Upgrade-Test.py
index 1193d553d4da329385105f2472b25c07f09b4d68..e339fae64c3535b5df0bb71b18534ca065fc43d3 100755
--- a/DaVinciTests/tests/options/PID/DaVinci-DST-ANNPID-Upgrade-Test.py
+++ b/DaVinciTests/tests/options/PID/DaVinci-DST-ANNPID-Upgrade-Test.py
@@ -30,9 +30,6 @@ DaVinci().HistogramFile = "dst-annpid.root"
########################################################################
-from Configurables import L0Conf
-L0Conf().EnsureKnownTCK=False
-
from Configurables import ANNGlobalPID__ChargedProtoANNPIDMoni
DaVinci().UserAlgorithms += [ ANNGlobalPID__ChargedProtoANNPIDMoni("ANNPIDMoni") ]
diff --git a/DaVinciTests/tests/options/Packing/DaVinci-DSTUnpacking-Upgrade-Test.py b/DaVinciTests/tests/options/Packing/DaVinci-DSTUnpacking-Upgrade-Test.py
index 95716a4ddff12bd65fd214b7d46ac60108727c27..3105818681b0b48e0e6ed50c1627bd32ba3a7b1f 100755
--- a/DaVinciTests/tests/options/Packing/DaVinci-DSTUnpacking-Upgrade-Test.py
+++ b/DaVinciTests/tests/options/Packing/DaVinci-DSTUnpacking-Upgrade-Test.py
@@ -30,9 +30,6 @@ DaVinci().HistogramFile = "dst-unpacking.root"
########################################################################
-from Configurables import L0Conf
-L0Conf().EnsureKnownTCK=False
-
from Configurables import TrackMonitor
DaVinci().UserAlgorithms += [ TrackMonitor() ]
diff --git a/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Upgrade.py b/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Upgrade.py
index 71a7b2c671f169ade3b851162e16bafa2add3be8..0d922ae5f9caab03719c76cdc12c73560c1d8676 100644
--- a/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Upgrade.py
+++ b/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Upgrade.py
@@ -87,9 +87,6 @@ CondDB().Upgrade = True
DaVinci().CondDBtag = "sim-20171127-vc-md100"
DaVinci().DDDBtag = "dddb-20171126"
-from Configurables import L0Conf
-L0Conf().EnsureKnownTCK=False
-
from Configurables import StoreExplorerAlg, PrintDecayTree
PrintDecayTree().Inputs = [ location ]
DaVinci().MoniSequence = [
diff --git a/DaVinciTests/tests/options/dtfdict.py b/DaVinciTests/tests/options/dtfdict.py
index 8dbc713b9392abc16cb4a3724a096538477f7b79..23ec8ef3f72304ce7b4955c1b3c413b7577a6c92 100644
--- a/DaVinciTests/tests/options/dtfdict.py
+++ b/DaVinciTests/tests/options/dtfdict.py
@@ -54,9 +54,6 @@ CondDB().Upgrade = True
DaVinci().CondDBtag = "sim-20171127-vc-md100"
DaVinci().DDDBtag = "dddb-20171126"
-from Configurables import L0Conf
-L0Conf().EnsureKnownTCK=False
-
#for MDST
DaVinci(StrippingStream = 'AllStreams', InputType = 'LDST')
diff --git a/Phys/DaVinci/options/DaVinci-Example.py b/Phys/DaVinci/options/DaVinci-Example.py
index 8f7b7c2ba6266d6534f0a0b4be6e3cfd9e1fca51..d4ed134db7c3f89d1e69d3e08b5556bfa9ea7588 100644
--- a/Phys/DaVinci/options/DaVinci-Example.py
+++ b/Phys/DaVinci/options/DaVinci-Example.py
@@ -32,9 +32,6 @@ TimingAuditor().TIMER.NameSize = 60
MessageSvc().Format = "% F%80W%S%7W%R%T %0W%M"
-from Configurables import L0Conf
-L0Conf().EnsureKnownTCK=False
-
DaVinci().EvtMax=-1
DaVinci().TupleFile = 'DVNtuple.root'
#DaVinci().HistogramFile = 'DVHistos.root'