diff --git a/DetectorDescription/DetDescrCnvSvc/CMakeLists.txt b/DetectorDescription/DetDescrCnvSvc/CMakeLists.txt
index 4c554ff2279f6eaf7b0ebd504c762b6c222917ab..6aa548919590f30ae50c23e9c2a281c7287b1cc8 100644
--- a/DetectorDescription/DetDescrCnvSvc/CMakeLists.txt
+++ b/DetectorDescription/DetDescrCnvSvc/CMakeLists.txt
@@ -1,27 +1,20 @@
-################################################################################
-# Package: DetDescrCnvSvc
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( DetDescrCnvSvc )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/StoreGate )
-
 # Component(s) in the package:
 atlas_add_library( DetDescrCnvSvcLib
                    src/*.cxx
                    PUBLIC_HEADERS DetDescrCnvSvc
-                   LINK_LIBRARIES GaudiKernel StoreGateLib SGtests )
+                   LINK_LIBRARIES GaudiKernel
+                   PRIVATE_LINK_LIBRARIES StoreGateLib )
 
 atlas_add_component( DetDescrCnvSvc
                      src/components/*.cxx
-                     LINK_LIBRARIES GaudiKernel StoreGateLib SGtests DetDescrCnvSvcLib )
+                     LINK_LIBRARIES DetDescrCnvSvcLib )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
 
diff --git a/DetectorDescription/DetDescrCnvSvc/python/DetStoreConfig.py b/DetectorDescription/DetDescrCnvSvc/python/DetStoreConfig.py
index e14007180aacd961effc971c54c8d436ee3f9b46..a4b0ec6b8b273d09afac5f3472b5326aab0784cc 100755
--- a/DetectorDescription/DetDescrCnvSvc/python/DetStoreConfig.py
+++ b/DetectorDescription/DetDescrCnvSvc/python/DetStoreConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 #
 # Joboptions for bootstrapping the loading of the DetectorStore with
@@ -6,11 +6,10 @@
 #
 
 def _setupDetStoreConfig():
-    from AthenaCommon.AppMgr import theApp
     from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 
     # first, make sure we create a DetectorStore
-    import AthenaCommon.AtlasUnixStandardJob
+    import AthenaCommon.AtlasUnixStandardJob  # noqa: F401
     #theApp.CreateSvc += [ svcMgr.DetectorStore.getFullName() ]
 
     # now configure the Detector Description converter service
diff --git a/DetectorDescription/DetDescrCnvSvc/share/DetStore.py b/DetectorDescription/DetDescrCnvSvc/share/DetStore.py
deleted file mode 100755
index 2a82ceb54d7087f627ec131df3f73e07b2fc98f8..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCnvSvc/share/DetStore.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Joboptions for bootstrapping the loading of the DetectorStore with
-# the DetDescrCnvSvc
-#
-
-# Adds and instantiates the DetDescrCnvSvc service. It is assumed that
-# a view of the application manager is available as 'theApp'
-
-
-from AthenaCommon.AppMgr import theApp
-theApp.Dlls   += [ 'DetDescrCnvSvc' ]
-theApp.ExtSvc += [ 'DetDescrCnvSvc' ]
-
-# Create service and add to list of conversion services
-#
-#  NOTE: the following does not yet work for the detector store
-# theApp.ExtSvc += { "DetPersistencySvc/DetectorPersistencySvc", 
-#  		      "DetDescrCnvSvc" };
-#DetectorPersistencySvc.CnvServices += { "DetDescrCnvSvc" };
-DetDescrCnvSvc = Service( "DetDescrCnvSvc" )
-EventPersistencySvc.CnvServices = [ "DetDescrCnvSvc" ]
-
-# Specify primary Identifier dictionary to be used
-DetDescrCnvSvc.IdDictName = "IdDictParser/ATLAS_IDS.xml";
-
-# Specify whether CSC/sTgc/MM muon chambers are part of the detector
-from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
-DetDescrCnvSvc.HasCSC = MuonGeometryFlags.hasCSC()
-DetDescrCnvSvc.HasSTgc = MuonGeometryFlags.hasSTGC()
-DetDescrCnvSvc.HasMM = MuonGeometryFlags.hasMM()