diff --git a/docs/source/AdministratorGuide/Systems/WorkloadManagement/Pilots/index.rst b/docs/source/AdministratorGuide/Systems/WorkloadManagement/Pilots/index.rst
index 7d1e80c3c09..0fa83304ae2 100644
--- a/docs/source/AdministratorGuide/Systems/WorkloadManagement/Pilots/index.rst
+++ b/docs/source/AdministratorGuide/Systems/WorkloadManagement/Pilots/index.rst
@@ -215,10 +215,6 @@ A simple example using the LHCbPilot extension follows::
       DIRAC_SITE="${i#*=}"
       shift
       ;;
-      --lhcb-setup=*)
-      LHCBDIRAC_SETUP="${i#*=}"
-      shift
-      ;;
       --ce-name=*)
       CE_NAME="${i#*=}"
       shift
@@ -237,8 +233,6 @@ A simple example using the LHCbPilot extension follows::
   esac
   done
 
-  # Default if not given explicitly
-  LHCBDIRAC_SETUP=${LHCBDIRAC_SETUP:-LHCb-Production}
 
   # JOB_ID is used by when reporting LocalJobID by DIRAC watchdog
   #export JOB_ID="$VMTYPE:$VM_UUID"
@@ -270,7 +264,6 @@ A simple example using the LHCbPilot extension follows::
 
   #run the dirac-pilot script
   python dirac-pilot.py \
-   --setup $LHCBDIRAC_SETUP \
    --project LHCb \
    --Name "$CE_NAME" \
    --name "$1" \
diff --git a/src/DIRAC/MonitoringSystem/Service/MonitoringHandler.py b/src/DIRAC/MonitoringSystem/Service/MonitoringHandler.py
index 84b7cc4f488..18ee70a9f2a 100644
--- a/src/DIRAC/MonitoringSystem/Service/MonitoringHandler.py
+++ b/src/DIRAC/MonitoringSystem/Service/MonitoringHandler.py
@@ -71,8 +71,6 @@ def initializeHandler(cls, serviceInfo):
             return S_ERROR(f"Data location is not writable: {repr(err)}")
         gDataCache.setGraphsLocation(dataPath)
 
-        cls.diracSetup = CSGlobals.getSetup().lower()
-
         return S_OK()
 
     types_listUniqueKeyValues = [str]
@@ -277,7 +275,6 @@ def export_addRecords(self, indexname, monitoringType, data):
         :param list data: data to insert
         :returns: S_OK or S_ERROR
         """
-        indexname = f"{self.diracSetup.lower()}_{indexname}"
         gLogger.debug("Bulk index:", indexname)
         mapping = self.__db.getMapping(monitoringType)
         gLogger.debug("Mapping:", mapping)
@@ -292,7 +289,6 @@ def export_deleteIndex(self, indexName):
 
         :param str indexName: name of the index
         """
-        indexName = f"{self.diracSetup.lower()}_{indexName}"
         gLogger.debug("delete index:", indexName)
         return self.__db.deleteIndex(indexName)
 
diff --git a/tests/CI/install_client.sh b/tests/CI/install_client.sh
index 85db87fb450..c2e72e586a3 100755
--- a/tests/CI/install_client.sh
+++ b/tests/CI/install_client.sh
@@ -51,7 +51,6 @@ echo -e "*** $(date -u) **** Got the DIRAC tests ****\n"
 
 source "${DIRAC_CI_SETUP_SCRIPT}"
 # shellcheck disable=SC2034
-DIRACSETUP=$(< "${INSTALL_CFG_FILE}" grep "Setup = " | cut -f5 -d " ")
 
 echo -e "*** $(date -u) **** Client INSTALLATION START ****\n"