diff --git a/DetectorDescription/IdDictDetDescr/IdDictDetDescr/ATLAS_CHECK_THREAD_SAFETY b/DetectorDescription/IdDictDetDescr/IdDictDetDescr/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..250ccf9d0ef1631121723a339ad8cdf107dc598d
--- /dev/null
+++ b/DetectorDescription/IdDictDetDescr/IdDictDetDescr/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+DetectorDescription/IdDictDetDescr
diff --git a/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt b/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
index 01cc2ba353e7a1e65e4f0c24496adccc55ac3d64..22bfe74b9205a21764d95424df7c8a98a472a62d 100644
--- a/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
+++ b/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
@@ -1,34 +1,12 @@
-################################################################################
-# Package: IdDictDetDescrCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( IdDictDetDescrCnv )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          Database/RDBAccessSvc
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/DetDescrCnvSvc
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          DetectorDescription/IdDictDetDescr
-                          DetectorDescription/IdDictParser
-                          DetectorDescription/Identifier
-                          GaudiKernel )
-
-# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-
 # Component(s) in the package:
 atlas_add_component( IdDictDetDescrCnv
                      src/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests AtlasDetDescr DetDescrCnvSvcLib GeoModelUtilities IdDictDetDescr IdDictParser Identifier GaudiKernel RDBAccessSvcLib )
+                     LINK_LIBRARIES AthenaBaseComps AthenaKernel AtlasDetDescr DetDescrCnvSvcLib GaudiKernel GeoModelInterfaces GeoModelUtilities IdDictDetDescr IdDictParser Identifier RDBAccessSvcLib StoreGateLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/DetectorDescription/IdDictDetDescrCnv/share/Load_IdDictCnvTest_joboptions.py b/DetectorDescription/IdDictDetDescrCnv/share/Load_IdDictCnvTest_joboptions.py
deleted file mode 100755
index 3cd94169d335c558d96684747716b13bd8156132..0000000000000000000000000000000000000000
--- a/DetectorDescription/IdDictDetDescrCnv/share/Load_IdDictCnvTest_joboptions.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Test joboptions for the loading of the IdDictCnvTest
-#
-# For MC EventSelector:
-theApp.setup( MONTECARLO )
-
-# For ZebraTDR EventSelector
-##include "AthenaCommon/Atlas_ZebraTDR.UnixStandardJob.txt"
-include( "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py" )
-
-# Turn on the reading of the dictionary
-DetDescrCnvSvc = Service( "DetDescrCnvSvc" )
-DetDescrCnvSvc.DecodeIdDict = TRUE
-# Algs
-theApp.TopAlg += [ "IdDictCnvTest" ]
-# Set xml file to read in for each system 
-#  - only needed if default is not ok
-#DetDescrCnvSvc.AtlasIDFileName = "IdDictATLAS.xml";
-#DetDescrCnvSvc.InDetIDFileName = "IdDictInnerDetector.xml";
-#DetDescrCnvSvc.LArIDFileName   = "IdDictLArCalorimeter.xml";
-#DetDescrCnvSvc.TileIDFileName  = "IdDictTileCalorimeter.xml";
-#DetDescrCnvSvc.LVL1IDFileName  = "IdDictLVL1Calorimeter.xml";
-DetDescrCnvSvc.MuonIDFileName  = "IdDictMuonSpectrometer_P.03.xml";
-# One may turn off the read of one of more system iddict files
-#DetDescrCnvSvc.InDetIDFileName = "NULL";
-#DetDescrCnvSvc.LArIDFileName   = "NULL";
-#DetDescrCnvSvc.TileIDFileName  = "NULL";
-#DetDescrCnvSvc.LVL1IDFileName  = "NULL";
-#DetDescrCnvSvc.MuonIDFileName  = "NULL";
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-MessageSvc = Service( "MessageSvc" )
-MessageSvc.OutputLevel      = 2
-# Provide dictionary file
-#DetDescrCnvSvc.IdDictName = "ATLAS_IDS.xml";
-# Number of events to be processed (default is 10)
-theApp.EvtMax = 2
-# Provide a first/last range or a list
-#EventSelector.runs = {1, 100000};
-#EventSelector.firstRun = 1;
-#EventSelector.lastRun  = 100000;