diff --git a/src/DIRAC/Core/Utilities/Grid.py b/src/DIRAC/Core/Utilities/Grid.py
index c973bef1360..1f9a4d99f79 100644
--- a/src/DIRAC/Core/Utilities/Grid.py
+++ b/src/DIRAC/Core/Utilities/Grid.py
@@ -2,7 +2,7 @@
 The Grid module contains several utilities for grid operations
 """
 
-from DIRAC.Core.Utilities.ReturnValues import S_OK, S_ERROR
+from DIRAC.Core.Utilities.ReturnValues import S_ERROR, S_OK
 from DIRAC.Core.Utilities.Subprocess import shellCall
 
 
diff --git a/src/DIRAC/Resources/Computing/ARCComputingElement.py b/src/DIRAC/Resources/Computing/ARCComputingElement.py
index 5c804f03152..1f79899fac9 100755
--- a/src/DIRAC/Resources/Computing/ARCComputingElement.py
+++ b/src/DIRAC/Resources/Computing/ARCComputingElement.py
@@ -51,16 +51,16 @@
 import uuid
 
 import arc  # Has to work if this module is called #pylint: disable=import-error
-from DIRAC import S_OK, S_ERROR
-from DIRAC.Core.Utilities.Subprocess import shellCall
-from DIRAC.Core.Utilities.List import breakListIntoChunks
+
+from DIRAC import S_ERROR, S_OK
 from DIRAC.Core.Security.ProxyInfo import getVOfromProxyGroup
 from DIRAC.Core.Utilities.Decorators import deprecated
+from DIRAC.Core.Utilities.List import breakListIntoChunks
+from DIRAC.Core.Utilities.Subprocess import shellCall
 from DIRAC.Resources.Computing.ComputingElement import ComputingElement
 from DIRAC.Resources.Computing.PilotBundle import writeScript
 from DIRAC.WorkloadManagementSystem.Client import PilotStatus
 
-
 MANDATORY_PARAMETERS = ["Queue"]  # Mandatory for ARC CEs in GLUE2?
 # See https://www.nordugrid.org/arc/arc6/tech/rest/rest.html#rest-interface-job-states
 # We let "Deleted, Hold, Undefined" for the moment as we are not sure whether they are still used
@@ -127,7 +127,6 @@ def __init__(self, ceUniqueID):
         self.pilotProxy = ""
         self.queue = ""
         self.arcQueue = ""
-        self.gridEnv = ""
         self.ceHost = self.ceName
         self.endpointType = "Gridftp"
         self.usercfg = arc.common.UserConfig()
@@ -272,7 +271,6 @@ def _reset(self):
         self.arcQueue = self.queue.split("-", 2)[2]
 
         self.ceHost = self.ceParameters.get("Host", self.ceHost)
-        self.gridEnv = self.ceParameters.get("GridEnv", self.gridEnv)
 
         # extra XRSL data (should respect the XRSL format)
         self.xrslExtraString = self.ceParameters.get("XRSLExtraString", self.xrslExtraString)
diff --git a/src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py b/src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py
index 55e025c82d9..9a12b910959 100644
--- a/src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py
+++ b/src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py
@@ -49,20 +49,20 @@
 import os
 import subprocess
 import tempfile
-import threading
 import textwrap
+import threading
 import uuid
 
 from DIRAC import S_ERROR, S_OK, gConfig
-from DIRAC.Core.Utilities.File import makeGuid, mkDir
-from DIRAC.Core.Utilities.Subprocess import systemCall
+from DIRAC.Core.Security.Locations import getCAsLocation
+from DIRAC.Core.Utilities.File import mkDir
 from DIRAC.Core.Utilities.List import breakListIntoChunks
+from DIRAC.Core.Utilities.Subprocess import systemCall
+from DIRAC.FrameworkSystem.private.authorization.utils.Tokens import writeToTokenFile
+from DIRAC.Resources.Computing.BatchSystems.Condor import HOLD_REASON_SUBCODE, parseCondorStatus, subTemplate
 from DIRAC.Resources.Computing.ComputingElement import ComputingElement
 from DIRAC.WorkloadManagementSystem.Client import PilotStatus
 from DIRAC.WorkloadManagementSystem.Client.PilotManagerClient import PilotManagerClient
-from DIRAC.FrameworkSystem.private.authorization.utils.Tokens import writeToTokenFile
-from DIRAC.Core.Security.Locations import getCAsLocation
-from DIRAC.Resources.Computing.BatchSystems.Condor import HOLD_REASON_SUBCODE, subTemplate, parseCondorStatus
 
 MANDATORY_PARAMETERS = ["Queue"]
 DEFAULT_WORKINGDIRECTORY = "/opt/dirac/pro/runit/WorkloadManagement/SiteDirectorHT"
diff --git a/src/DIRAC/Resources/Computing/test/Test_HTCondorCEComputingElement.py b/src/DIRAC/Resources/Computing/test/Test_HTCondorCEComputingElement.py
index 0a17e26378e..9d0436bdbaa 100644
--- a/src/DIRAC/Resources/Computing/test/Test_HTCondorCEComputingElement.py
+++ b/src/DIRAC/Resources/Computing/test/Test_HTCondorCEComputingElement.py
@@ -3,11 +3,12 @@
 tests for HTCondorCEComputingElement module
 """
 import uuid
+
 import pytest
 
+from DIRAC import S_OK
 from DIRAC.Resources.Computing import HTCondorCEComputingElement as HTCE
 from DIRAC.Resources.Computing.BatchSystems import Condor
-from DIRAC import S_OK
 
 MODNAME = "DIRAC.Resources.Computing.HTCondorCEComputingElement"
 
diff --git a/src/DIRAC/WorkloadManagementSystem/Service/WMSUtilities.py b/src/DIRAC/WorkloadManagementSystem/Service/WMSUtilities.py
index 4d90e575a6d..289914943c9 100644
--- a/src/DIRAC/WorkloadManagementSystem/Service/WMSUtilities.py
+++ b/src/DIRAC/WorkloadManagementSystem/Service/WMSUtilities.py
@@ -4,7 +4,7 @@
 import shutil
 from tempfile import mkdtemp
 
-from DIRAC import S_ERROR, S_OK, gConfig, gLogger
+from DIRAC import S_ERROR, S_OK, gLogger
 from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 from DIRAC.ConfigurationSystem.Client.Helpers.Registry import (
     getDNForUsername,
diff --git a/src/DIRAC/WorkloadManagementSystem/Utilities/test/Test_QueueUtilities.py b/src/DIRAC/WorkloadManagementSystem/Utilities/test/Test_QueueUtilities.py
index 6ed36f02988..28db38d959c 100644
--- a/src/DIRAC/WorkloadManagementSystem/Utilities/test/Test_QueueUtilities.py
+++ b/src/DIRAC/WorkloadManagementSystem/Utilities/test/Test_QueueUtilities.py
@@ -1,14 +1,12 @@
 """ Test class for QueueUtilities
 """
-import pytest
 import copy
 from unittest.mock import MagicMock
 
-
+import pytest
 from DIRAC import S_OK
 from DIRAC.WorkloadManagementSystem.Utilities.QueueUtilities import *
 
-
 siteDict1 = {
     "Site1": {
         "CE1": {"Queues": {"Queue1": {}, "Queue2": {}}, "CEType": "Type1"},