diff --git a/data/grid5000/sites/toulouse/clusters/estats/estats.json b/data/grid5000/sites/toulouse/clusters/estats/estats.json
deleted file mode 100644
index f321eef36c8edd4512bf5f048bc28216ff7114d8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/estats/estats.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "boot_type": "uefi",
-  "created_at": "Mon, 06 Mar 2023 00:00:00 GMT",
-  "exotic": false,
-  "kavlan": false,
-  "metrics": [
-
-  ],
-  "model": "Nvidia AGX A100",
-  "queues": [
-    "admin"
-  ],
-  "type": "cluster",
-  "uid": "estats"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-1.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-1.json
deleted file mode 100644
index 7151d1575c7589134ff74de334c09518ea41dc14..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-1.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 32,
-    "nb_procs": 2,
-    "nb_threads": 64,
-    "platform_type": "Unknown"
-  },
-  "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "bmc_version": "Unknown",
-  "chassis": {
-    "manufacturer": "Unknown",
-    "name": "Unknown chassis",
-    "serial": "Unknown"
-  },
-  "exotic": false,
-  "main_memory": {
-    "ram_size": 1024
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "ipmitool",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a0",
-      "size": 1024,
-      "technology": "Unknown"
-    }
-  ],
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.121.1",
-      "ip6": "2001:660:4406:900:a::1",
-      "kavlan": false,
-      "mac": "48:b0:2d:3a:ba:11",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "estats-1.toulouse.grid5000.fr",
-      "switch": "oobm",
-      "switch_port": "tengigabitethernet1/1/1"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "estats-1-bmc.toulouse.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "Unknown",
-    "cstate_governor": "Unknown",
-    "ht_enabled": false,
-    "pstate_driver": "Unknown",
-    "pstate_governor": "Unknown",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 33600000000,
-    "node_flops": 1075200000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 1024,
-    "cache_l1i": 1024,
-    "cache_l2": 1024,
-    "cache_l3": 1024,
-    "clock_speed": 2100000000,
-    "ht_capable": true,
-    "instruction_set": "arm64",
-    "microarchitecture": "Zen 2",
-    "microcode": "Unknown",
-    "model": "Unknown",
-    "other_description": "Unknown",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "unknown",
-      "size": 1024,
-      "storage": "SSD",
-      "vendor": "Unknown"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin"
-    ]
-  },
-  "type": "node",
-  "uid": "estats-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-10.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-10.json
deleted file mode 100644
index e8b9f4d515963d681a5ad57165abf36f0a15e00b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-10.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 32,
-    "nb_procs": 2,
-    "nb_threads": 64,
-    "platform_type": "Unknown"
-  },
-  "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "bmc_version": "Unknown",
-  "chassis": {
-    "manufacturer": "Unknown",
-    "name": "Unknown chassis",
-    "serial": "Unknown"
-  },
-  "exotic": false,
-  "main_memory": {
-    "ram_size": 1024
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "ipmitool",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a0",
-      "size": 1024,
-      "technology": "Unknown"
-    }
-  ],
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.121.10",
-      "ip6": "2001:660:4406:900:a::a",
-      "kavlan": false,
-      "mac": "48:b0:2d:3a:ba:1c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "estats-10.toulouse.grid5000.fr",
-      "switch": "oobm",
-      "switch_port": "tengigabitethernet1/1/10"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "estats-10-bmc.toulouse.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "Unknown",
-    "cstate_governor": "Unknown",
-    "ht_enabled": false,
-    "pstate_driver": "Unknown",
-    "pstate_governor": "Unknown",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 33600000000,
-    "node_flops": 1075200000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 1024,
-    "cache_l1i": 1024,
-    "cache_l2": 1024,
-    "cache_l3": 1024,
-    "clock_speed": 2100000000,
-    "ht_capable": true,
-    "instruction_set": "arm64",
-    "microarchitecture": "Zen 2",
-    "microcode": "Unknown",
-    "model": "Unknown",
-    "other_description": "Unknown",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "unknown",
-      "size": 1024,
-      "storage": "SSD",
-      "vendor": "Unknown"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin"
-    ]
-  },
-  "type": "node",
-  "uid": "estats-10"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-11.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-11.json
deleted file mode 100644
index d4796875348130b83e007dd58fb748a05a250ca0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-11.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 32,
-    "nb_procs": 2,
-    "nb_threads": 64,
-    "platform_type": "Unknown"
-  },
-  "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "bmc_version": "Unknown",
-  "chassis": {
-    "manufacturer": "Unknown",
-    "name": "Unknown chassis",
-    "serial": "Unknown"
-  },
-  "exotic": false,
-  "main_memory": {
-    "ram_size": 1024
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "ipmitool",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a0",
-      "size": 1024,
-      "technology": "Unknown"
-    }
-  ],
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.121.11",
-      "ip6": "2001:660:4406:900:a::b",
-      "kavlan": false,
-      "mac": "48:b0:2d:3a:ba:56",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "estats-11.toulouse.grid5000.fr",
-      "switch": "oobm",
-      "switch_port": "tengigabitethernet1/1/11"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "estats-11-bmc.toulouse.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "Unknown",
-    "cstate_governor": "Unknown",
-    "ht_enabled": false,
-    "pstate_driver": "Unknown",
-    "pstate_governor": "Unknown",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 33600000000,
-    "node_flops": 1075200000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 1024,
-    "cache_l1i": 1024,
-    "cache_l2": 1024,
-    "cache_l3": 1024,
-    "clock_speed": 2100000000,
-    "ht_capable": true,
-    "instruction_set": "arm64",
-    "microarchitecture": "Zen 2",
-    "microcode": "Unknown",
-    "model": "Unknown",
-    "other_description": "Unknown",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "unknown",
-      "size": 1024,
-      "storage": "SSD",
-      "vendor": "Unknown"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin"
-    ]
-  },
-  "type": "node",
-  "uid": "estats-11"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-12.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-12.json
deleted file mode 100644
index 2b7a22c8df20b72846ba6e2b993185624a13f027..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-12.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 32,
-    "nb_procs": 2,
-    "nb_threads": 64,
-    "platform_type": "Unknown"
-  },
-  "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "bmc_version": "Unknown",
-  "chassis": {
-    "manufacturer": "Unknown",
-    "name": "Unknown chassis",
-    "serial": "Unknown"
-  },
-  "exotic": false,
-  "main_memory": {
-    "ram_size": 1024
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "ipmitool",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a0",
-      "size": 1024,
-      "technology": "Unknown"
-    }
-  ],
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.121.12",
-      "ip6": "2001:660:4406:900:a::c",
-      "kavlan": false,
-      "mac": "48:b0:2d:3a:b9:d0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "estats-12.toulouse.grid5000.fr",
-      "switch": "oobm",
-      "switch_port": "tengigabitethernet1/1/12"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "estats-12-bmc.toulouse.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "Unknown",
-    "cstate_governor": "Unknown",
-    "ht_enabled": false,
-    "pstate_driver": "Unknown",
-    "pstate_governor": "Unknown",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 33600000000,
-    "node_flops": 1075200000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 1024,
-    "cache_l1i": 1024,
-    "cache_l2": 1024,
-    "cache_l3": 1024,
-    "clock_speed": 2100000000,
-    "ht_capable": true,
-    "instruction_set": "arm64",
-    "microarchitecture": "Zen 2",
-    "microcode": "Unknown",
-    "model": "Unknown",
-    "other_description": "Unknown",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "unknown",
-      "size": 1024,
-      "storage": "SSD",
-      "vendor": "Unknown"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin"
-    ]
-  },
-  "type": "node",
-  "uid": "estats-12"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-2.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-2.json
deleted file mode 100644
index dd2caae929c0c7d67bc8e163eed1b3152c825604..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-2.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 32,
-    "nb_procs": 2,
-    "nb_threads": 64,
-    "platform_type": "Unknown"
-  },
-  "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "bmc_version": "Unknown",
-  "chassis": {
-    "manufacturer": "Unknown",
-    "name": "Unknown chassis",
-    "serial": "Unknown"
-  },
-  "exotic": false,
-  "main_memory": {
-    "ram_size": 1024
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "ipmitool",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a0",
-      "size": 1024,
-      "technology": "Unknown"
-    }
-  ],
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.121.2",
-      "ip6": "2001:660:4406:900:a::2",
-      "kavlan": false,
-      "mac": "48:b0:2d:4d:44:87",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "estats-2.toulouse.grid5000.fr",
-      "switch": "oobm",
-      "switch_port": "tengigabitethernet1/1/2"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "estats-2-bmc.toulouse.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "Unknown",
-    "cstate_governor": "Unknown",
-    "ht_enabled": false,
-    "pstate_driver": "Unknown",
-    "pstate_governor": "Unknown",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 33600000000,
-    "node_flops": 1075200000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 1024,
-    "cache_l1i": 1024,
-    "cache_l2": 1024,
-    "cache_l3": 1024,
-    "clock_speed": 2100000000,
-    "ht_capable": true,
-    "instruction_set": "arm64",
-    "microarchitecture": "Zen 2",
-    "microcode": "Unknown",
-    "model": "Unknown",
-    "other_description": "Unknown",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "unknown",
-      "size": 1024,
-      "storage": "SSD",
-      "vendor": "Unknown"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin"
-    ]
-  },
-  "type": "node",
-  "uid": "estats-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-3.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-3.json
deleted file mode 100644
index d44d84fee6246d97d10d5d86f704d0ca07d9700e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-3.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 32,
-    "nb_procs": 2,
-    "nb_threads": 64,
-    "platform_type": "Unknown"
-  },
-  "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "bmc_version": "Unknown",
-  "chassis": {
-    "manufacturer": "Unknown",
-    "name": "Unknown chassis",
-    "serial": "Unknown"
-  },
-  "exotic": false,
-  "main_memory": {
-    "ram_size": 1024
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "ipmitool",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a0",
-      "size": 1024,
-      "technology": "Unknown"
-    }
-  ],
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.121.3",
-      "ip6": "2001:660:4406:900:a::3",
-      "kavlan": false,
-      "mac": "48:b0:2d:3a:ba:1e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "estats-3.toulouse.grid5000.fr",
-      "switch": "oobm",
-      "switch_port": "tengigabitethernet1/1/3"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "estats-3-bmc.toulouse.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "Unknown",
-    "cstate_governor": "Unknown",
-    "ht_enabled": false,
-    "pstate_driver": "Unknown",
-    "pstate_governor": "Unknown",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 33600000000,
-    "node_flops": 1075200000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 1024,
-    "cache_l1i": 1024,
-    "cache_l2": 1024,
-    "cache_l3": 1024,
-    "clock_speed": 2100000000,
-    "ht_capable": true,
-    "instruction_set": "arm64",
-    "microarchitecture": "Zen 2",
-    "microcode": "Unknown",
-    "model": "Unknown",
-    "other_description": "Unknown",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "unknown",
-      "size": 1024,
-      "storage": "SSD",
-      "vendor": "Unknown"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin"
-    ]
-  },
-  "type": "node",
-  "uid": "estats-3"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-4.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-4.json
deleted file mode 100644
index f050cddfa0efcbddddc431cf70b7276e46f6c1a0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-4.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 32,
-    "nb_procs": 2,
-    "nb_threads": 64,
-    "platform_type": "Unknown"
-  },
-  "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "bmc_version": "Unknown",
-  "chassis": {
-    "manufacturer": "Unknown",
-    "name": "Unknown chassis",
-    "serial": "Unknown"
-  },
-  "exotic": false,
-  "main_memory": {
-    "ram_size": 1024
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "ipmitool",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a0",
-      "size": 1024,
-      "technology": "Unknown"
-    }
-  ],
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.121.4",
-      "ip6": "2001:660:4406:900:a::4",
-      "kavlan": false,
-      "mac": "48:b0:2d:3a:ba:17",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "estats-4.toulouse.grid5000.fr",
-      "switch": "oobm",
-      "switch_port": "tengigabitethernet1/1/4"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "estats-4-bmc.toulouse.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "Unknown",
-    "cstate_governor": "Unknown",
-    "ht_enabled": false,
-    "pstate_driver": "Unknown",
-    "pstate_governor": "Unknown",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 33600000000,
-    "node_flops": 1075200000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 1024,
-    "cache_l1i": 1024,
-    "cache_l2": 1024,
-    "cache_l3": 1024,
-    "clock_speed": 2100000000,
-    "ht_capable": true,
-    "instruction_set": "arm64",
-    "microarchitecture": "Zen 2",
-    "microcode": "Unknown",
-    "model": "Unknown",
-    "other_description": "Unknown",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "unknown",
-      "size": 1024,
-      "storage": "SSD",
-      "vendor": "Unknown"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin"
-    ]
-  },
-  "type": "node",
-  "uid": "estats-4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-5.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-5.json
deleted file mode 100644
index e1fe98e6a5052002198fd55512bde488e9b0b7ae..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-5.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 32,
-    "nb_procs": 2,
-    "nb_threads": 64,
-    "platform_type": "Unknown"
-  },
-  "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "bmc_version": "Unknown",
-  "chassis": {
-    "manufacturer": "Unknown",
-    "name": "Unknown chassis",
-    "serial": "Unknown"
-  },
-  "exotic": false,
-  "main_memory": {
-    "ram_size": 1024
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "ipmitool",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a0",
-      "size": 1024,
-      "technology": "Unknown"
-    }
-  ],
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.121.5",
-      "ip6": "2001:660:4406:900:a::5",
-      "kavlan": false,
-      "mac": "48:b0:2d:3a:b9:a3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "estats-5.toulouse.grid5000.fr",
-      "switch": "oobm",
-      "switch_port": "tengigabitethernet1/1/5"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "estats-5-bmc.toulouse.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "Unknown",
-    "cstate_governor": "Unknown",
-    "ht_enabled": false,
-    "pstate_driver": "Unknown",
-    "pstate_governor": "Unknown",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 33600000000,
-    "node_flops": 1075200000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 1024,
-    "cache_l1i": 1024,
-    "cache_l2": 1024,
-    "cache_l3": 1024,
-    "clock_speed": 2100000000,
-    "ht_capable": true,
-    "instruction_set": "arm64",
-    "microarchitecture": "Zen 2",
-    "microcode": "Unknown",
-    "model": "Unknown",
-    "other_description": "Unknown",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "unknown",
-      "size": 1024,
-      "storage": "SSD",
-      "vendor": "Unknown"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin"
-    ]
-  },
-  "type": "node",
-  "uid": "estats-5"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-6.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-6.json
deleted file mode 100644
index 118b9d2eb39e54051e3cc4e214ed20751a8de76e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-6.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 32,
-    "nb_procs": 2,
-    "nb_threads": 64,
-    "platform_type": "Unknown"
-  },
-  "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "bmc_version": "Unknown",
-  "chassis": {
-    "manufacturer": "Unknown",
-    "name": "Unknown chassis",
-    "serial": "Unknown"
-  },
-  "exotic": false,
-  "main_memory": {
-    "ram_size": 1024
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "ipmitool",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a0",
-      "size": 1024,
-      "technology": "Unknown"
-    }
-  ],
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.121.6",
-      "ip6": "2001:660:4406:900:a::6",
-      "kavlan": false,
-      "mac": "48:b0:2d:3a:ba:0d",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "estats-6.toulouse.grid5000.fr",
-      "switch": "oobm",
-      "switch_port": "tengigabitethernet1/1/6"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "estats-6-bmc.toulouse.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "Unknown",
-    "cstate_governor": "Unknown",
-    "ht_enabled": false,
-    "pstate_driver": "Unknown",
-    "pstate_governor": "Unknown",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 33600000000,
-    "node_flops": 1075200000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 1024,
-    "cache_l1i": 1024,
-    "cache_l2": 1024,
-    "cache_l3": 1024,
-    "clock_speed": 2100000000,
-    "ht_capable": true,
-    "instruction_set": "arm64",
-    "microarchitecture": "Zen 2",
-    "microcode": "Unknown",
-    "model": "Unknown",
-    "other_description": "Unknown",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "unknown",
-      "size": 1024,
-      "storage": "SSD",
-      "vendor": "Unknown"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin"
-    ]
-  },
-  "type": "node",
-  "uid": "estats-6"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-7.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-7.json
deleted file mode 100644
index b72c47143cbc9d87ab3433ee5b86c2dae041756a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-7.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 32,
-    "nb_procs": 2,
-    "nb_threads": 64,
-    "platform_type": "Unknown"
-  },
-  "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "bmc_version": "Unknown",
-  "chassis": {
-    "manufacturer": "Unknown",
-    "name": "Unknown chassis",
-    "serial": "Unknown"
-  },
-  "exotic": false,
-  "main_memory": {
-    "ram_size": 1024
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "ipmitool",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a0",
-      "size": 1024,
-      "technology": "Unknown"
-    }
-  ],
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.121.7",
-      "ip6": "2001:660:4406:900:a::7",
-      "kavlan": false,
-      "mac": "48:b0:2d:3a:b9:ba",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "estats-7.toulouse.grid5000.fr",
-      "switch": "oobm",
-      "switch_port": "tengigabitethernet1/1/7"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "estats-7-bmc.toulouse.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "Unknown",
-    "cstate_governor": "Unknown",
-    "ht_enabled": false,
-    "pstate_driver": "Unknown",
-    "pstate_governor": "Unknown",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 33600000000,
-    "node_flops": 1075200000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 1024,
-    "cache_l1i": 1024,
-    "cache_l2": 1024,
-    "cache_l3": 1024,
-    "clock_speed": 2100000000,
-    "ht_capable": true,
-    "instruction_set": "arm64",
-    "microarchitecture": "Zen 2",
-    "microcode": "Unknown",
-    "model": "Unknown",
-    "other_description": "Unknown",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "unknown",
-      "size": 1024,
-      "storage": "SSD",
-      "vendor": "Unknown"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin"
-    ]
-  },
-  "type": "node",
-  "uid": "estats-7"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-8.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-8.json
deleted file mode 100644
index a7cbb546c7ce2fbb346491f8c3fada1c4f43fda0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-8.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 32,
-    "nb_procs": 2,
-    "nb_threads": 64,
-    "platform_type": "Unknown"
-  },
-  "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "bmc_version": "Unknown",
-  "chassis": {
-    "manufacturer": "Unknown",
-    "name": "Unknown chassis",
-    "serial": "Unknown"
-  },
-  "exotic": false,
-  "main_memory": {
-    "ram_size": 1024
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "ipmitool",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a0",
-      "size": 1024,
-      "technology": "Unknown"
-    }
-  ],
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.121.8",
-      "ip6": "2001:660:4406:900:a::8",
-      "kavlan": false,
-      "mac": "48:b0:2d:3a:ba:70",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "estats-8.toulouse.grid5000.fr",
-      "switch": "oobm",
-      "switch_port": "tengigabitethernet1/1/8"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "estats-8-bmc.toulouse.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "Unknown",
-    "cstate_governor": "Unknown",
-    "ht_enabled": false,
-    "pstate_driver": "Unknown",
-    "pstate_governor": "Unknown",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 33600000000,
-    "node_flops": 1075200000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 1024,
-    "cache_l1i": 1024,
-    "cache_l2": 1024,
-    "cache_l3": 1024,
-    "clock_speed": 2100000000,
-    "ht_capable": true,
-    "instruction_set": "arm64",
-    "microarchitecture": "Zen 2",
-    "microcode": "Unknown",
-    "model": "Unknown",
-    "other_description": "Unknown",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "unknown",
-      "size": 1024,
-      "storage": "SSD",
-      "vendor": "Unknown"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin"
-    ]
-  },
-  "type": "node",
-  "uid": "estats-8"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-9.json b/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-9.json
deleted file mode 100644
index c9b866776099b00e9ed14665744e9ebe68d090b3..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/estats/nodes/estats-9.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 32,
-    "nb_procs": 2,
-    "nb_threads": 64,
-    "platform_type": "Unknown"
-  },
-  "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "bmc_version": "Unknown",
-  "chassis": {
-    "manufacturer": "Unknown",
-    "name": "Unknown chassis",
-    "serial": "Unknown"
-  },
-  "exotic": false,
-  "main_memory": {
-    "ram_size": 1024
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "ipmitool",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a0",
-      "size": 1024,
-      "technology": "Unknown"
-    }
-  ],
-  "network_adapters": [
-    {
-      "device": "eth0",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.121.9",
-      "ip6": "2001:660:4406:900:a::9",
-      "kavlan": false,
-      "mac": "48:b0:2d:3a:b9:e6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "estats-9.toulouse.grid5000.fr",
-      "switch": "oobm",
-      "switch_port": "tengigabitethernet1/1/9"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "estats-9-bmc.toulouse.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "Unknown",
-    "cstate_governor": "Unknown",
-    "ht_enabled": false,
-    "pstate_driver": "Unknown",
-    "pstate_governor": "Unknown",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 33600000000,
-    "node_flops": 1075200000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 1024,
-    "cache_l1i": 1024,
-    "cache_l2": 1024,
-    "cache_l3": 1024,
-    "clock_speed": 2100000000,
-    "ht_capable": true,
-    "instruction_set": "arm64",
-    "microarchitecture": "Zen 2",
-    "microcode": "Unknown",
-    "model": "Unknown",
-    "other_description": "Unknown",
-    "vendor": "Unknown",
-    "version": "Unknown"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "unknown",
-      "size": 1024,
-      "storage": "SSD",
-      "vendor": "Unknown"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin"
-    ]
-  },
-  "type": "node",
-  "uid": "estats-9"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
index 7550766d13be36afaa7c0019c436cfca0d1cbd66..1015fa59c35fc0ae6b3f30217f0274d703ceb7e1 100644
--- a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
+++ b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
@@ -66,9 +66,6 @@
           "uid": "montcalm-9"
         },
         {
-          "kind": "server",
-          "snmp_name": "tengigabitethernet1/1/10",
-          "uid": "montcalm-10"
         },
         {
         },
@@ -79,12 +76,12 @@
         {
         },
         {
-          "kind": "switch",
+          "kind": "server",
           "snmp_name": "tengigabitethernet1/1/15",
           "uid": "oobm"
         },
         {
-          "kind": "switch",
+          "kind": "server",
           "snmp_name": "tengigabitethernet1/1/16",
           "uid": "oobm"
         },
diff --git a/data/grid5000/sites/toulouse/network_equipments/oobm.json b/data/grid5000/sites/toulouse/network_equipments/oobm.json
deleted file mode 100644
index bb9b50e3c3844c173d4f58bd46fcd9625c5983eb..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/network_equipments/oobm.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "kind": "switch",
-  "linecards": [
-    {
-    },
-    {
-      "kavlan_pattern": "%PORT%",
-      "kind": "node",
-      "ports": [
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/1",
-          "uid": "estats-1"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/2",
-          "uid": "estats-2"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/3",
-          "uid": "estats-3"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/4",
-          "uid": "estats-4"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/5",
-          "uid": "estats-5"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/6",
-          "uid": "estats-6"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/7",
-          "uid": "estats-7"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/8",
-          "uid": "estats-8"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/9",
-          "uid": "estats-9"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/10",
-          "uid": "estats-10"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/11",
-          "uid": "estats-11"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "tengigabitethernet1/1/12",
-          "uid": "estats-12"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "tengigabitethernet1/%LINECARD%/%PORT%"
-    }
-  ],
-  "model": "oobm",
-  "serial": "unknown",
-  "site": "toulouse",
-  "snmp_community": "unknown",
-  "type": "network_equipment",
-  "uid": "oobm"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/montcalm-10.json b/data/grid5000/sites/toulouse/servers/montcalm-10.json
deleted file mode 100644
index 315e38016ffebfca69969e5d649f22fae5e0ff73..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/servers/montcalm-10.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "alias": [
-    "montcalm-x"
-  ],
-  "kind": "physical",
-  "network_adapters": {
-    "bmc": {
-      "ip": "172.17.120.10",
-      "mac": "5c:ed:8c:3b:14:92"
-    },
-    "default": {
-      "ip": "172.16.120.10",
-      "mac": "84:16:0c:4b:3d:c4"
-    }
-  },
-  "type": "server",
-  "uid": "montcalm-10"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/servers/oobm.json b/data/grid5000/sites/toulouse/servers/oobm.json
index 20aeb64b77d3e264e878668cfec0a04190574a59..e2b4ddebe93e1f9959a0f7939d3027bd7ba6e033 100644
--- a/data/grid5000/sites/toulouse/servers/oobm.json
+++ b/data/grid5000/sites/toulouse/servers/oobm.json
@@ -1,6 +1,6 @@
 {
   "alias": [
-    "estats-bmc"
+    "x-bmc"
   ],
   "kind": "physical",
   "network_adapters": {
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index 432cd7ad675534ac4b606d68566076c4b6a29c9a..235be02d8e7d12e9959ec0ab769353be0eca6c5d 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -75,4 +75,3 @@ ipv4:
       rennes parasilo eth1 0 0 1 100
       sophia uvb eth0 0 0 4 0
       toulouse montcalm eth0 0 0 8 0
-      toulouse estats eth0 0 0 9 0
diff --git a/input/grid5000/sites/toulouse/clusters/estats/estats.yaml b/input/grid5000/sites/toulouse/clusters/estats/estats.yaml
deleted file mode 100644
index 4906e81cb7f75ed8501e5d7fcfce796092858c7d..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/toulouse/clusters/estats/estats.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-model: Nvidia AGX A100
-created_at: 2023-03-06
-kavlan: false
-boot_type: uefi 
-exotic: false
-queues:
-  - admin
-nodes:
-  estats-[1-12]:  
-    supported_job_types:
-      deploy: true
-      besteffort: true
-      max_walltime: 0
-    architecture:
-      nb_procs: 2
-      nb_cores: 32
-      nb_threads: 64
-      platform_type: Unknown
-      cpu_core_numbering: contiguous
-    processor:
-      microarchitecture: Zen 2
-      clock_speed: 2100000000
-      cache_l1d: 1024
-      cache_l1i: 1024
-      cache_l2: 1024
-      cache_l3: 1024
-      instruction_set: arm64
-      microcode: Unknown
-      model: Unknown
-      other_description: Unknown
-      vendor: Unknown
-      version: Unknown
-      ht_capable: true
-    bios:
-      release_date: 01/01/2000
-      vendor: Unknown
-      version: Unknown
-    bmc_version: Unknown
-    chassis:
-      manufacturer: Unknown
-      name: Unknown chassis
-      serial: Unknown
-    main_memory:
-      ram_size: 1024
-    memory_devices:
-      dimm_a0:
-        size: 1024
-        technology: Unknown
-    software:
-      standard-environment: debian11-x64-std
-    management_tools:
-      bmc_vendor_tool: ipmitool
-    network_adapters:
-      bmc:
-        interface: Ethernet
-        management: true
-        enabled: true 
-        mountable: false
-        mounted: false 
-      eth0:
-        interface: Ethernet
-        management: false
-        enabled: true
-        mountable: true
-        mounted: true
-    operating_system:
-      cstate_driver: Unknown
-      cstate_governor: Unknown
-      ht_enabled: false
-      pstate_driver: Unknown
-      pstate_governor: Unknown
-      turboboost_enabled: false
-    storage_devices:
-      disk0:
-        id: disk0
-        interface: SAS
-        storage: SSD
-        model: unknown
-        size: 1024
-        by_path: "/dev/disk/by-path/dummy"
diff --git a/input/grid5000/sites/toulouse/clusters/estats/estats_ip.yaml.erb b/input/grid5000/sites/toulouse/clusters/estats/estats_ip.yaml.erb
deleted file mode 100644
index 181b86d606d97ed0c6abca187279106b08c75038..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/toulouse/clusters/estats/estats_ip.yaml.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-nodes:
-  <% (1..12).each { |i| %>
-  estats-<%= i %>:
-    network_adapters:
-      eth0:
-        ip: 172.16.121.<%= i %>
-        mac: <%= %w(
-            48:b0:2d:3a:ba:11
-            48:b0:2d:4d:44:87
-            48:b0:2d:3a:ba:1e
-            48:b0:2d:3a:ba:17
-            48:b0:2d:3a:b9:a3
-            48:b0:2d:3a:ba:0d
-            48:b0:2d:3a:b9:ba
-            48:b0:2d:3a:ba:70
-            48:b0:2d:3a:b9:e6
-            48:b0:2d:3a:ba:1c
-            48:b0:2d:3a:ba:56
-            48:b0:2d:3a:b9:d0
-        )[i-1] %>
-  <% } %>
diff --git a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml b/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
index 6ee4da496ad501e37d2ab110ac320ae0ba817976..60aec13db83f15def4d2504b61c8846d5f7c709a 100644
--- a/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
+++ b/input/grid5000/sites/toulouse/networks/gw-toulouse.yaml
@@ -74,15 +74,12 @@ gw-toulouse:
         7: montcalm-7
         8: montcalm-8
         9: montcalm-9
-        10:
-          uid: montcalm-10
-          kind: server
         15:
           uid: oobm
-          kind: switch
+          kind: server
         16:
           uid: oobm
-          kind: switch
+          kind: server
         17:
           uid: pve-1
           kind: server
diff --git a/input/grid5000/sites/toulouse/networks/oobm.yaml b/input/grid5000/sites/toulouse/networks/oobm.yaml
deleted file mode 100644
index 3e503d9f70e3c3b8c9ab704194bd1f36b8ba1702..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/toulouse/networks/oobm.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-oobm:
-  model: oobm
-  serial: unknown
-  kind: switch
-  site: toulouse
-  snmp_community: unknown
-  linecards:
-    1:
-      rate: 10000000000
-      snmp_pattern: "tengigabitethernet1/%LINECARD%/%PORT%"
-      kavlan_pattern: "%PORT%"
-      kind: node
-      ports:
-        1: estats-1
-        2: estats-2
-        3: estats-3
-        4: estats-4
-        5: estats-5
-        6: estats-6
-        7: estats-7
-        8: estats-8
-        9: estats-9
-        10: estats-10
-        11: estats-11
-        12: estats-12
-
diff --git a/input/grid5000/sites/toulouse/servers/physical.yaml b/input/grid5000/sites/toulouse/servers/physical.yaml
index b0a6ecd1465aa3a9469b6591623ddaadf6b92b0d..df9b54cba40baefd909829e17e973ef4e6693ed7 100644
--- a/input/grid5000/sites/toulouse/servers/physical.yaml
+++ b/input/grid5000/sites/toulouse/servers/physical.yaml
@@ -42,18 +42,8 @@ srv-data:
 
 oobm:
   kind: physical
-  alias: [estats-bmc]
+  alias: [x-bmc]
   network_adapters:
     default:
       ip: 172.17.121.1
       mac: 00:30:64:37:c8:c8
-montcalm-10:
-  kind: physical
-  alias: [montcalm-x]
-  network_adapters:
-    default:
-      ip: 172.16.120.10
-      mac: 84:16:0c:4b:3d:c4
-    bmc:
-      ip: 172.17.120.10
-      mac: 5c:ed:8c:3b:14:92