diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/AthenaPool.py b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/AthenaPool.py
index 9b56e86baf61fb37666181ffe3187a95c8dbbc76..41e20311d43c2f6a54da4501b50e6fc0fc4a06d1 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/AthenaPool.py
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/AthenaPool.py
@@ -1,9 +1,8 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 ## @file AthenaPool_jobOptions.py
 ## @brief Core job options file for AthenaPOOL to setup the basic sercives.
 ## @author Peter van Gemmeren <gemmeren@anl.gov>
-## $Id: AthenaPool.py,v 1.10 2008-11-18 22:44:00 binet Exp $
 ###############################################################
 #
 # The core jobOptions for AthenaPOOL
@@ -18,7 +17,7 @@ def _loadBasicAthenaPool():
 
     from AthenaCommon import CfgMgr
     ## make sure we have been -at least- minimally correctly configured
-    import AthenaCommon.AtlasUnixStandardJob
+    import AthenaCommon.AtlasUnixStandardJob  # noqa: F401
 
     from AthenaCommon.Logging import logging
     from AthenaCommon.AppMgr  import ServiceMgr as svcMgr
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/ReadAthenaPool.py b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/ReadAthenaPool.py
index 26dbaebe095d6413e6c28dc9e32c3059b4ae990e..f7de2391f274106eade2860ae8665f4d59ad6576 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/ReadAthenaPool.py
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/ReadAthenaPool.py
@@ -3,7 +3,6 @@
 ## @file ReadAthena.py
 ## @brief AthenaPool python module for reading event objects.
 ## @author Peter van Gemmeren <gemmeren@bnl.gov>
-## $Id: ReadAthenaPool.py,v 1.11 2008-11-18 22:44:00 binet Exp $
 ###############################################################
 """
  This is a module for reading event objects in AthenaPool.
@@ -30,7 +29,7 @@ def _configureReadAthenaPool():
     from AthenaCommon.AppMgr import theApp
 
     # Load the basic services
-    import AthenaPoolCnvSvc.AthenaPool
+    import AthenaPoolCnvSvc.AthenaPool  # noqa: F401
 
     # Switch on TTreeCache for CollectionTree
     svcMgr.AthenaPoolCnvSvc.InputPoolAttributes += [ "DatabaseName = '*'; ContainerName = 'CollectionTree'; TREE_CACHE = '-1'" ]
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/ReadAthenaPoolDouble.py b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/ReadAthenaPoolDouble.py
index dc683bc12cc5247ee4b6b42d1b0ebb6ec8225894..d2cce04d9a36bce4fb7e5b61e503db4b5bdfc22a 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/ReadAthenaPoolDouble.py
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/ReadAthenaPoolDouble.py
@@ -3,7 +3,6 @@
 ## @file ReadAthena.py
 ## @brief AthenaPool python module for reading event objects.
 ## @author Peter van Gemmeren <gemmeren@bnl.gov>
-## $Id: ReadAthenaPool.py,v 1.11 2008-11-18 22:44:00 binet Exp $
 ###############################################################
 """
     Copy of the one made for standard EventSelector to work with
@@ -22,7 +21,7 @@ def _configureReadAthenaPoolDouble():
     from AthenaCommon.AppMgr import theApp
 
     # Load the basic services
-    import AthenaPoolCnvSvc.AthenaPool
+    import AthenaPoolCnvSvc.AthenaPool  # noqa: F401
 
     # Switch on TTreeCache for CollectionTree
     svcMgr.AthenaPoolCnvSvc.InputPoolAttributes += [ "DatabaseName = '*'; ContainerName = 'CollectionTree'; TREE_CACHE = '-1'" ]
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/WriteAthenaPool.py b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/WriteAthenaPool.py
index 5c7ca61ae79795dcffe4d8ee7c0661cc33615ae2..785c4881f37d41d0cf61a43931151eaeb1f20476 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/WriteAthenaPool.py
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/WriteAthenaPool.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 ## @file WriteAthenaPool_jobOptions.py
 ## @brief AthenaPool job options file for writing event objects.
@@ -29,7 +29,7 @@ def _configureWriteAthenaPool():
     msg.debug( "Configuring Athena for writing POOL files..." )
 
     # Load the basic services
-    import AthenaPoolCnvSvc.AthenaPool
+    import AthenaPoolCnvSvc.AthenaPool  # noqa: F401
 
     from AthenaCommon.AppMgr  import ServiceMgr as svcMgr
     # Switch off splitting by setting default SplitLevel to 0