diff --git a/src/DIRAC/Resources/Storage/GFAL2_SRM2Storage.py b/src/DIRAC/Resources/Storage/GFAL2_SRM2Storage.py
index 73c42af5a62..888a74dd48f 100644
--- a/src/DIRAC/Resources/Storage/GFAL2_SRM2Storage.py
+++ b/src/DIRAC/Resources/Storage/GFAL2_SRM2Storage.py
@@ -71,8 +71,6 @@ def __setSRMOptionsToDefault(self):
         self.ctx.set_opt_string_list("SRM PLUGIN", "TURL_PROTOCOLS", self.protocolsList)
         self.ctx.set_opt_string_list("SRM PLUGIN", "TURL_3RD_PARTY_PROTOCOLS", self.protocolsList)
 
-        # self.ctx.set_opt_string_list("SRM PLUGIN", "TURL_PROTOCOLS", ["gsiftp"])
-
     def _updateMetadataDict(self, metadataDict, attributeDict):
         """Updating the metadata dictionary with srm specific attributes
 
diff --git a/src/DIRAC/Resources/Storage/StorageElement.py b/src/DIRAC/Resources/Storage/StorageElement.py
index cca3daebb8b..eb73b474b1f 100755
--- a/src/DIRAC/Resources/Storage/StorageElement.py
+++ b/src/DIRAC/Resources/Storage/StorageElement.py
@@ -92,7 +92,7 @@ class StorageElementItem(object):
 
       self.name is the resolved name of the StorageElement i.e CERN-tape
       self.options is dictionary containing the general options defined in the CS e.g. self.options['Backend] = 'Castor2'
-      self.storages is a dict of the stub objects created by StorageFactory for the protocols found in the CS index by the protocol section name.
+      self.storages is a dict of the stub objects created by StorageFactory for the protocols found in the CS. Index by the protocol section name.
       self.localProtocolSections is a list of the local protocols that were created by StorageFactory
       self.remoteProtocolSections is a list of the remote protocols that were created by StorageFactory
       self.protocolOptions is a list of dictionaries containing the options found in the CS. (should be removed)
diff --git a/src/DIRAC/Resources/Storage/StorageFactory.py b/src/DIRAC/Resources/Storage/StorageFactory.py
index a044a220a28..6e2d4438c22 100755
--- a/src/DIRAC/Resources/Storage/StorageFactory.py
+++ b/src/DIRAC/Resources/Storage/StorageFactory.py
@@ -338,12 +338,11 @@ def _getConfigStorageProtocols(self, storageName, derivedStorageName=None, seCon
 
         for protocolSectionName, protocolDict in self.protocols.items():
             # Now update the local and remote protocol lists.
-            # A warning will be given if the Access option is not set and the plugin is not already in remote or local.
+            # A warning will be given if the Access option is not set to local or remote.
             if protocolDict["Access"].lower() == "remote":
                 self.remoteProtocolSections.append(protocolSectionName)
             elif protocolDict["Access"].lower() == "local":
                 self.localProtocolSections.append(protocolSectionName)
-            # If it is a derived SE, this is normal, no warning
             else:
                 errStr = (
                     "StorageFactory.__getProtocolDetails: The 'Access' option \