diff --git a/src/DIRAC/Core/Tornado/scripts/tornado_start_all.py b/src/DIRAC/Core/Tornado/scripts/tornado_start_all.py
index 56061542bc9..d543ab27513 100644
--- a/src/DIRAC/Core/Tornado/scripts/tornado_start_all.py
+++ b/src/DIRAC/Core/Tornado/scripts/tornado_start_all.py
@@ -12,7 +12,6 @@
 
 __RCSID__ = "$Id$"
 
-# Must be define BEFORE any dirac import
 import os
 import sys
 from DIRAC.Core.Utilities.DIRACScript import DIRACScript
@@ -20,6 +19,7 @@
 
 @DIRACScript()
 def main():
+  # Must be defined BEFORE any dirac import
   os.environ['DIRAC_USE_TORNADO_IOLOOP'] = "True"
 
   from DIRAC import gConfig
diff --git a/src/DIRAC/Core/scripts/dirac-agent.py b/src/DIRAC/Core/scripts/dirac-agent.py
index d5817ec0b61..e4cbd9b650e 100755
--- a/src/DIRAC/Core/scripts/dirac-agent.py
+++ b/src/DIRAC/Core/scripts/dirac-agent.py
@@ -1,49 +1,18 @@
 #!/usr/bin/env python
-########################################################################
-# File :   dirac-agent
-# Author : Adria Casajus, Andrei Tsaregorodtsev, Stuart Paterson
-########################################################################
+"""  This is a script to launch DIRAC agents
+"""
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-__RCSID__ = "$Id$"
 
-"""  This is a script to launch DIRAC agents
-"""
+__RCSID__ = "$Id$"
 
-import sys
-from DIRAC.ConfigurationSystem.Client.LocalConfiguration import LocalConfiguration
-from DIRAC import gLogger
-from DIRAC.Core.Base.AgentReactor import AgentReactor
-from DIRAC.Core.Utilities.DErrno import includeExtensionErrors
+# pylint fails as it doesn't realise this file is only used as a script
+import dirac_agent  # pylint: disable=import-error
 
 print("NOTE:", __file__, "is deprecated and will be removed in v7r3, for details see",
       "https://github.com/DIRACGrid/DIRAC/wiki/DIRAC-v7r2#rename-of-scripts")
 
-localCfg = LocalConfiguration()
-
-positionalArgs = localCfg.getPositionalArguments()
-if len(positionalArgs) == 0:
-  gLogger.fatal("You must specify which agent to run!")
-  sys.exit(1)
-
-agentName = positionalArgs[0]
-localCfg.setConfigurationForAgent(agentName)
-localCfg.addMandatoryEntry("/DIRAC/Setup")
-localCfg.addDefaultEntry("/DIRAC/Security/UseServerCertificate", "yes")
-localCfg.addDefaultEntry("LogLevel", "INFO")
-localCfg.addDefaultEntry("LogColor", True)
-resultDict = localCfg.loadUserData()
-if not resultDict['OK']:
-  gLogger.error("There were errors when loading configuration", resultDict['Message'])
-  sys.exit(1)
-
-includeExtensionErrors()
 
-agentReactor = AgentReactor(positionalArgs[0])
-result = agentReactor.loadAgentModules(positionalArgs)
-if result['OK']:
-  agentReactor.go()
-else:
-  gLogger.error("Error while loading agent module", result['Message'])
-  sys.exit(2)
+if __name__ == "__main__":
+  dirac_agent.main()
diff --git a/src/DIRAC/Core/scripts/dirac-executor.py b/src/DIRAC/Core/scripts/dirac-executor.py
index bf03863132f..f2e0bc18113 100755
--- a/src/DIRAC/Core/scripts/dirac-executor.py
+++ b/src/DIRAC/Core/scripts/dirac-executor.py
@@ -1,59 +1,18 @@
 #!/usr/bin/env python
-########################################################################
-# File :   dirac-executor
-# Author : Adria Casajus
-########################################################################
+"""  This is a script to launch DIRAC executors
+"""
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-__RCSID__ = "$Id$"
 
-"""  This is a script to launch DIRAC executors
-"""
+__RCSID__ = "$Id$"
 
-import sys
-from DIRAC.ConfigurationSystem.Client.LocalConfiguration import LocalConfiguration
-from DIRAC import gLogger
-from DIRAC.Core.Base.ExecutorReactor import ExecutorReactor
-from DIRAC.Core.Utilities.DErrno import includeExtensionErrors
+# pylint fails as it doesn't realise this file is only used as a script
+import dirac_executor  # pylint: disable=import-error
 
 print("NOTE:", __file__, "is deprecated and will be removed in v7r3, for details see",
       "https://github.com/DIRACGrid/DIRAC/wiki/DIRAC-v7r2#rename-of-scripts")
 
-localCfg = LocalConfiguration()
-
-positionalArgs = localCfg.getPositionalArguments()
-if len(positionalArgs) == 0:
-  gLogger.fatal("You must specify which executor to run!")
-  sys.exit(1)
-
-if len(positionalArgs) == 1 and positionalArgs[0].find("/") > -1:
-  mainName = positionalArgs[0]
-else:
-  mainName = "Framework/MultiExecutor"
-
-localCfg.setConfigurationForExecutor(mainName)
-localCfg.addMandatoryEntry("/DIRAC/Setup")
-localCfg.addDefaultEntry("/DIRAC/Security/UseServerCertificate", "yes")
-localCfg.addDefaultEntry("LogLevel", "INFO")
-localCfg.addDefaultEntry("LogColor", True)
-resultDict = localCfg.loadUserData()
-if not resultDict['OK']:
-  gLogger.fatal("There were errors when loading configuration", resultDict['Message'])
-  sys.exit(1)
-
-includeExtensionErrors()
-executorReactor = ExecutorReactor()
-
-result = executorReactor.loadModules(positionalArgs)
-if not result['OK']:
-  gLogger.fatal("Error while loading executor", result['Message'])
-  sys.exit(1)
-
-result = executorReactor.go()
-if not result['OK']:
-  gLogger.fatal(result['Message'])
-  sys.exit(1)
 
-gLogger.notice("Graceful exit. Bye!")
-sys.exit(0)
+if __name__ == "__main__":
+  dirac_executor.main()
diff --git a/src/DIRAC/Core/scripts/dirac-service.py b/src/DIRAC/Core/scripts/dirac-service.py
index 39b54703879..9653aef574c 100755
--- a/src/DIRAC/Core/scripts/dirac-service.py
+++ b/src/DIRAC/Core/scripts/dirac-service.py
@@ -1,56 +1,16 @@
 #!/usr/bin/env python
-########################################################################
-# File :   dirac-service
-# Author : Adria Casajus
-########################################################################
-
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-import sys
-
-from DIRAC.ConfigurationSystem.Client.LocalConfiguration import LocalConfiguration
-from DIRAC.FrameworkSystem.Client.Logger import gLogger
-from DIRAC.Core.DISET.ServiceReactor import ServiceReactor
-from DIRAC.Core.Utilities.DErrno import includeExtensionErrors
 
 __RCSID__ = "$Id$"
 
+# pylint fails as it doesn't realise this file is only used as a script
+import dirac_service  # pylint: disable=import-error
+
 print("NOTE:", __file__, "is deprecated and will be removed in v7r3, for details see",
       "https://github.com/DIRACGrid/DIRAC/wiki/DIRAC-v7r2#rename-of-scripts")
 
-localCfg = LocalConfiguration()
-
-
-positionalArgs = localCfg.getPositionalArguments()
-if len(positionalArgs) == 0:
-  gLogger.fatal("You must specify which server to run!")
-  sys.exit(1)
-
-serverName = positionalArgs[0]
-localCfg.setConfigurationForServer(serverName)
-localCfg.addMandatoryEntry("Port")
-# localCfg.addMandatoryEntry( "HandlerPath" )
-localCfg.addMandatoryEntry("/DIRAC/Setup")
-localCfg.addDefaultEntry("/DIRAC/Security/UseServerCertificate", "yes")
-localCfg.addDefaultEntry("LogLevel", "INFO")
-localCfg.addDefaultEntry("LogColor", True)
-resultDict = localCfg.loadUserData()
-if not resultDict['OK']:
-  gLogger.initialize(serverName, "/")
-  gLogger.error("There were errors when loading configuration", resultDict['Message'])
-  sys.exit(1)
-
-includeExtensionErrors()
-
-
-serverToLaunch = ServiceReactor()
-result = serverToLaunch.initialize(positionalArgs)
-if not result['OK']:
-  gLogger.error(result['Message'])
-  sys.exit(1)
 
-result = serverToLaunch.serve()
-if not result['OK']:
-  gLogger.error(result['Message'])
-  sys.exit(1)
+if __name__ == "__main__":
+  dirac_service.main()