diff --git a/Database/RegistrationServices/python/IOVRegistrationSvc.py b/Database/RegistrationServices/python/IOVRegistrationSvc.py
index cbc2056a8d5f5aa983989ea311fb69ca1abf748c..3265cca213380de7524edaf0fed74975a48c82b1 100644
--- a/Database/RegistrationServices/python/IOVRegistrationSvc.py
+++ b/Database/RegistrationServices/python/IOVRegistrationSvc.py
@@ -1,9 +1,8 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 ## @file IOVRegistrationSvc.py
 ## @brief Job options file for iov registration service setup
 ## @author RD Schaffer <R.D.Schaffer@cern.ch>
-## $Id: IOVRegistrationSvc.py,v 1.1 2007-07-13 17:22:53 schaffer Exp $
 ###############################################################
 #
 # Job options file for iov registration service setup
@@ -15,22 +14,13 @@ def _loadBasicIOVRegistrationSvc():
     """Loads the basic services for IOVRegistrationSvc"""
 
     ## make sure we have been -at least- minimally correctly configured
-    import AthenaCommon.AtlasUnixStandardJob
+    import AthenaCommon.AtlasUnixStandardJob   # noqa: F401
 
     # add in service
     from AthenaCommon.AppMgr import ServiceMgr
     from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
     ServiceMgr += IOVRegistrationSvc()
 
-    #
-    #  Definitions and default values 
-    #
-    
-    # Min and max for run and LB numbers
-    IOVRunNumberMin       = 0
-    IOVRunNumberMax       = 2147483647 #0x7FFFFFFF
-    IOVLBNumberMin        = 0
-    IOVLBNumberMax        = 4294967295 #0xFFFFFFFF
 
 ## load basic services configuration at module import
 _loadBasicIOVRegistrationSvc()
diff --git a/Database/RegistrationServices/python/OutputConditionsAlg.py b/Database/RegistrationServices/python/OutputConditionsAlg.py
index ec55f1f0375f50016e003839f12984551229ece0..480e7b0f66df13b27a56edef3be579be4b40daa0 100644
--- a/Database/RegistrationServices/python/OutputConditionsAlg.py
+++ b/Database/RegistrationServices/python/OutputConditionsAlg.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
 
 # OutputConditionsAlg.py - configuration class for OutputConditionsAlg
 # usage:
@@ -12,14 +12,14 @@
 
 def OutputConditionsAlg(name='OutputConditionsAlg',outputFile='condobjs.root',
                         ObjectList=[],IOVTagList=[],WriteIOV=True):
-    import AthenaCommon.AtlasUnixStandardJob
+    import AthenaCommon.AtlasUnixStandardJob  # noqa: F401
 
     # get a handle on the top-level Algorithm sequence
     from AthenaCommon.AlgSequence import AlgSequence
     topSequence = AlgSequence()
 
     # Load POOL support
-    import AthenaPoolCnvSvc.WriteAthenaPool
+    import AthenaPoolCnvSvc.WriteAthenaPool  # noqa: F401
 
     from RegistrationServices.RegistrationServicesConf import OutputConditionsAlg as OPCAlg
     myAlg=OPCAlg(name,
diff --git a/Database/RegistrationServices/python/RegistrationStream.py b/Database/RegistrationServices/python/RegistrationStream.py
deleted file mode 100644
index fb7a815f3afe6dc621ca51d634fa8b4e124b05a4..0000000000000000000000000000000000000000
--- a/Database/RegistrationServices/python/RegistrationStream.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-## @file RegistrationStream.py
-## @brief Job options file for registration stream setup
-## @author RD Schaffer <R.D.Schaffer@cern.ch>
-## $Id: RegistrationStream.py,v 1.1 2007-07-13 17:22:54 schaffer Exp $
-###############################################################
-#
-# Job options file for registration stream setup
-#
-#==============================================================
-#
-
-def _loadBasicRegistrationStream():
-    """Loads the basic services for RegistrationStreamSvc"""
-
-    ## make sure we have been -at least- minimally correctly configured
-    import AthenaCommon.AtlasUnixStandardJob
-
-    ## get a handle on the top-level Algorithm sequence
-    from AthenaCommon.AlgSequence import AlgSequence
-    topSequence = AlgSequence()
-
-    #--------------------------------------------------------------
-    # Example for Event Collection Registration
-    #--------------------------------------------------------------
-    #
-    # For each output collection, use a separate registration stream
-    #
-    # Run RegistrationStream as an algorithm
-    from RegistrationServices.RegistrationServicesConf import RegistrationStream
-    topSequence += RegistrationStream( "RegStream1",
-                                       CollectionType   = "ExplicitROOT",
-                                       OutputCollection = "NewEventCollection",
-                                       OutputLevel      = INFO )
-
-    # # backward compat
-    RegStream1 = topSequence.RegStream1
-
-    # List of DO's to register:
-
-    # First element is used to obtain a token to the DataHeader 
-    RegStream1.ItemList += [ "DataHeader#*" ]
-    # The second element is the AthenaAttributeList to be written into the
-    # collection as the tag:
-    RegStream1.ItemList += [ "AthenaAttributeList#SimpleTag" ]
-
-
-    msg.debug( "Loading basic services for RegistrationStream... [DONE]" )
-    return
-
-## load basic services configuration at module import
-_loadBasicRegistrationStream()
-
-## clean-up: avoid running multiple times this method
-del _loadBasicRegistrationStream
-
-
-
-