diff --git a/data/grid5000/sites/nancy/clusters/grisou/grisou.json b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
index a8a9c4d8ed89f857d329f13204f964bfa6ce75a3..8dbc07099b6b17bc492050f4d3eb2e8e4f5d2250 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/grisou.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
@@ -692,54 +692,6 @@
         "interface": "eth4"
       },
       "name": "network_ifacein_bytes_total",
-      "only_for": [
-        "grisou-1",
-        "grisou-2",
-        "grisou-3",
-        "grisou-4",
-        "grisou-5",
-        "grisou-6",
-        "grisou-7",
-        "grisou-8",
-        "grisou-9",
-        "grisou-10",
-        "grisou-11",
-        "grisou-12",
-        "grisou-13",
-        "grisou-14",
-        "grisou-15",
-        "grisou-16",
-        "grisou-17",
-        "grisou-18",
-        "grisou-19",
-        "grisou-20",
-        "grisou-21",
-        "grisou-22",
-        "grisou-23",
-        "grisou-24",
-        "grisou-25",
-        "grisou-26",
-        "grisou-27",
-        "grisou-28",
-        "grisou-29",
-        "grisou-30",
-        "grisou-31",
-        "grisou-32",
-        "grisou-34",
-        "grisou-35",
-        "grisou-36",
-        "grisou-37",
-        "grisou-38",
-        "grisou-39",
-        "grisou-40",
-        "grisou-41",
-        "grisou-42",
-        "grisou-43",
-        "grisou-45",
-        "grisou-46",
-        "grisou-47",
-        "grisou-48"
-      ],
       "period": 15000,
       "source": {
         "protocol": "network_equipment"
@@ -751,54 +703,6 @@
         "interface": "eth4"
       },
       "name": "network_ifaceout_bytes_total",
-      "only_for": [
-        "grisou-1",
-        "grisou-2",
-        "grisou-3",
-        "grisou-4",
-        "grisou-5",
-        "grisou-6",
-        "grisou-7",
-        "grisou-8",
-        "grisou-9",
-        "grisou-10",
-        "grisou-11",
-        "grisou-12",
-        "grisou-13",
-        "grisou-14",
-        "grisou-15",
-        "grisou-16",
-        "grisou-17",
-        "grisou-18",
-        "grisou-19",
-        "grisou-20",
-        "grisou-21",
-        "grisou-22",
-        "grisou-23",
-        "grisou-24",
-        "grisou-25",
-        "grisou-26",
-        "grisou-27",
-        "grisou-28",
-        "grisou-29",
-        "grisou-30",
-        "grisou-31",
-        "grisou-32",
-        "grisou-34",
-        "grisou-35",
-        "grisou-36",
-        "grisou-37",
-        "grisou-38",
-        "grisou-39",
-        "grisou-40",
-        "grisou-41",
-        "grisou-42",
-        "grisou-43",
-        "grisou-45",
-        "grisou-46",
-        "grisou-47",
-        "grisou-48"
-      ],
       "period": 15000,
       "source": {
         "protocol": "network_equipment"
@@ -810,54 +714,6 @@
         "interface": "eth4"
       },
       "name": "network_ifacein_packets_total",
-      "only_for": [
-        "grisou-1",
-        "grisou-2",
-        "grisou-3",
-        "grisou-4",
-        "grisou-5",
-        "grisou-6",
-        "grisou-7",
-        "grisou-8",
-        "grisou-9",
-        "grisou-10",
-        "grisou-11",
-        "grisou-12",
-        "grisou-13",
-        "grisou-14",
-        "grisou-15",
-        "grisou-16",
-        "grisou-17",
-        "grisou-18",
-        "grisou-19",
-        "grisou-20",
-        "grisou-21",
-        "grisou-22",
-        "grisou-23",
-        "grisou-24",
-        "grisou-25",
-        "grisou-26",
-        "grisou-27",
-        "grisou-28",
-        "grisou-29",
-        "grisou-30",
-        "grisou-31",
-        "grisou-32",
-        "grisou-34",
-        "grisou-35",
-        "grisou-36",
-        "grisou-37",
-        "grisou-38",
-        "grisou-39",
-        "grisou-40",
-        "grisou-41",
-        "grisou-42",
-        "grisou-43",
-        "grisou-45",
-        "grisou-46",
-        "grisou-47",
-        "grisou-48"
-      ],
       "period": 15000,
       "source": {
         "protocol": "network_equipment"
@@ -869,54 +725,6 @@
         "interface": "eth4"
       },
       "name": "network_ifaceout_packets_total",
-      "only_for": [
-        "grisou-1",
-        "grisou-2",
-        "grisou-3",
-        "grisou-4",
-        "grisou-5",
-        "grisou-6",
-        "grisou-7",
-        "grisou-8",
-        "grisou-9",
-        "grisou-10",
-        "grisou-11",
-        "grisou-12",
-        "grisou-13",
-        "grisou-14",
-        "grisou-15",
-        "grisou-16",
-        "grisou-17",
-        "grisou-18",
-        "grisou-19",
-        "grisou-20",
-        "grisou-21",
-        "grisou-22",
-        "grisou-23",
-        "grisou-24",
-        "grisou-25",
-        "grisou-26",
-        "grisou-27",
-        "grisou-28",
-        "grisou-29",
-        "grisou-30",
-        "grisou-31",
-        "grisou-32",
-        "grisou-34",
-        "grisou-35",
-        "grisou-36",
-        "grisou-37",
-        "grisou-38",
-        "grisou-39",
-        "grisou-40",
-        "grisou-41",
-        "grisou-42",
-        "grisou-43",
-        "grisou-45",
-        "grisou-46",
-        "grisou-47",
-        "grisou-48"
-      ],
       "period": 15000,
       "source": {
         "protocol": "network_equipment"
@@ -928,54 +736,6 @@
         "interface": "eth4"
       },
       "name": "network_ifacein_packets_discard_total",
-      "only_for": [
-        "grisou-1",
-        "grisou-2",
-        "grisou-3",
-        "grisou-4",
-        "grisou-5",
-        "grisou-6",
-        "grisou-7",
-        "grisou-8",
-        "grisou-9",
-        "grisou-10",
-        "grisou-11",
-        "grisou-12",
-        "grisou-13",
-        "grisou-14",
-        "grisou-15",
-        "grisou-16",
-        "grisou-17",
-        "grisou-18",
-        "grisou-19",
-        "grisou-20",
-        "grisou-21",
-        "grisou-22",
-        "grisou-23",
-        "grisou-24",
-        "grisou-25",
-        "grisou-26",
-        "grisou-27",
-        "grisou-28",
-        "grisou-29",
-        "grisou-30",
-        "grisou-31",
-        "grisou-32",
-        "grisou-34",
-        "grisou-35",
-        "grisou-36",
-        "grisou-37",
-        "grisou-38",
-        "grisou-39",
-        "grisou-40",
-        "grisou-41",
-        "grisou-42",
-        "grisou-43",
-        "grisou-45",
-        "grisou-46",
-        "grisou-47",
-        "grisou-48"
-      ],
       "period": 15000,
       "source": {
         "protocol": "network_equipment"
@@ -987,54 +747,6 @@
         "interface": "eth4"
       },
       "name": "network_ifaceout_packets_discard_total",
-      "only_for": [
-        "grisou-1",
-        "grisou-2",
-        "grisou-3",
-        "grisou-4",
-        "grisou-5",
-        "grisou-6",
-        "grisou-7",
-        "grisou-8",
-        "grisou-9",
-        "grisou-10",
-        "grisou-11",
-        "grisou-12",
-        "grisou-13",
-        "grisou-14",
-        "grisou-15",
-        "grisou-16",
-        "grisou-17",
-        "grisou-18",
-        "grisou-19",
-        "grisou-20",
-        "grisou-21",
-        "grisou-22",
-        "grisou-23",
-        "grisou-24",
-        "grisou-25",
-        "grisou-26",
-        "grisou-27",
-        "grisou-28",
-        "grisou-29",
-        "grisou-30",
-        "grisou-31",
-        "grisou-32",
-        "grisou-34",
-        "grisou-35",
-        "grisou-36",
-        "grisou-37",
-        "grisou-38",
-        "grisou-39",
-        "grisou-40",
-        "grisou-41",
-        "grisou-42",
-        "grisou-43",
-        "grisou-45",
-        "grisou-46",
-        "grisou-47",
-        "grisou-48"
-      ],
       "period": 15000,
       "source": {
         "protocol": "network_equipment"
@@ -1046,54 +758,6 @@
         "interface": "eth4"
       },
       "name": "network_ifacein_packets_error_total",
-      "only_for": [
-        "grisou-1",
-        "grisou-2",
-        "grisou-3",
-        "grisou-4",
-        "grisou-5",
-        "grisou-6",
-        "grisou-7",
-        "grisou-8",
-        "grisou-9",
-        "grisou-10",
-        "grisou-11",
-        "grisou-12",
-        "grisou-13",
-        "grisou-14",
-        "grisou-15",
-        "grisou-16",
-        "grisou-17",
-        "grisou-18",
-        "grisou-19",
-        "grisou-20",
-        "grisou-21",
-        "grisou-22",
-        "grisou-23",
-        "grisou-24",
-        "grisou-25",
-        "grisou-26",
-        "grisou-27",
-        "grisou-28",
-        "grisou-29",
-        "grisou-30",
-        "grisou-31",
-        "grisou-32",
-        "grisou-34",
-        "grisou-35",
-        "grisou-36",
-        "grisou-37",
-        "grisou-38",
-        "grisou-39",
-        "grisou-40",
-        "grisou-41",
-        "grisou-42",
-        "grisou-43",
-        "grisou-45",
-        "grisou-46",
-        "grisou-47",
-        "grisou-48"
-      ],
       "period": 15000,
       "source": {
         "protocol": "network_equipment"
@@ -1105,54 +769,6 @@
         "interface": "eth4"
       },
       "name": "network_ifaceout_packets_error_total",
-      "only_for": [
-        "grisou-1",
-        "grisou-2",
-        "grisou-3",
-        "grisou-4",
-        "grisou-5",
-        "grisou-6",
-        "grisou-7",
-        "grisou-8",
-        "grisou-9",
-        "grisou-10",
-        "grisou-11",
-        "grisou-12",
-        "grisou-13",
-        "grisou-14",
-        "grisou-15",
-        "grisou-16",
-        "grisou-17",
-        "grisou-18",
-        "grisou-19",
-        "grisou-20",
-        "grisou-21",
-        "grisou-22",
-        "grisou-23",
-        "grisou-24",
-        "grisou-25",
-        "grisou-26",
-        "grisou-27",
-        "grisou-28",
-        "grisou-29",
-        "grisou-30",
-        "grisou-31",
-        "grisou-32",
-        "grisou-34",
-        "grisou-35",
-        "grisou-36",
-        "grisou-37",
-        "grisou-38",
-        "grisou-39",
-        "grisou-40",
-        "grisou-41",
-        "grisou-42",
-        "grisou-43",
-        "grisou-45",
-        "grisou-46",
-        "grisou-47",
-        "grisou-48"
-      ],
       "period": 15000,
       "source": {
         "protocol": "network_equipment"
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
deleted file mode 100644
index 6b5ef836cbe2d64ab87ce75f3c33550c076508e1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
+++ /dev/null
@@ -1,449 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 16,
-    "nb_procs": 2,
-    "nb_threads": 32,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "05/14/2021",
-    "vendor": "Dell Inc.",
-    "version": "2.13.0"
-  },
-  "bmc_version": "2.81.81.81",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R630",
-    "serial": "2RG2J82"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.200.49",
-      "kavlan-11": "10.7.209.49",
-      "kavlan-12": "10.11.209.49",
-      "kavlan-13": "10.15.209.49",
-      "kavlan-14": "10.19.209.49",
-      "kavlan-16": "10.27.209.49",
-      "kavlan-18": "10.35.209.49",
-      "kavlan-2": "192.168.216.49",
-      "kavlan-20": "10.43.209.49",
-      "kavlan-21": "10.47.209.49",
-      "kavlan-3": "192.168.232.49",
-      "kavlan-4": "10.16.8.49",
-      "kavlan-5": "10.16.72.49",
-      "kavlan-6": "10.16.136.49",
-      "kavlan-7": "10.16.200.49",
-      "kavlan-8": "10.17.8.49",
-      "kavlan-9": "10.17.72.49"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.200.149",
-      "kavlan-11": "10.7.209.149",
-      "kavlan-12": "10.11.209.149",
-      "kavlan-13": "10.15.209.149",
-      "kavlan-14": "10.19.209.149",
-      "kavlan-16": "10.27.209.149",
-      "kavlan-18": "10.35.209.149",
-      "kavlan-2": "192.168.216.149",
-      "kavlan-20": "10.43.209.149",
-      "kavlan-21": "10.47.209.149",
-      "kavlan-3": "192.168.232.149",
-      "kavlan-4": "10.16.8.149",
-      "kavlan-5": "10.16.72.149",
-      "kavlan-6": "10.16.136.149",
-      "kavlan-7": "10.16.200.149",
-      "kavlan-8": "10.17.8.149",
-      "kavlan-9": "10.17.72.149"
-    },
-    "eth2": {
-      "kavlan-1": "192.168.200.249",
-      "kavlan-11": "10.7.209.249",
-      "kavlan-12": "10.11.209.249",
-      "kavlan-13": "10.15.209.249",
-      "kavlan-14": "10.19.209.249",
-      "kavlan-16": "10.27.209.249",
-      "kavlan-18": "10.35.209.249",
-      "kavlan-2": "192.168.216.249",
-      "kavlan-20": "10.43.209.249",
-      "kavlan-21": "10.47.209.249",
-      "kavlan-3": "192.168.232.249",
-      "kavlan-4": "10.16.8.249",
-      "kavlan-5": "10.16.72.249",
-      "kavlan-6": "10.16.136.249",
-      "kavlan-7": "10.16.200.249",
-      "kavlan-8": "10.17.8.249",
-      "kavlan-9": "10.17.72.249"
-    },
-    "eth3": {
-      "kavlan-1": "192.168.201.49",
-      "kavlan-11": "10.7.210.49",
-      "kavlan-12": "10.11.210.49",
-      "kavlan-13": "10.15.210.49",
-      "kavlan-14": "10.19.210.49",
-      "kavlan-16": "10.27.210.49",
-      "kavlan-18": "10.35.210.49",
-      "kavlan-2": "192.168.217.49",
-      "kavlan-20": "10.43.210.49",
-      "kavlan-21": "10.47.210.49",
-      "kavlan-3": "192.168.233.49",
-      "kavlan-4": "10.16.9.49",
-      "kavlan-5": "10.16.73.49",
-      "kavlan-6": "10.16.137.49",
-      "kavlan-7": "10.16.201.49",
-      "kavlan-8": "10.17.9.49",
-      "kavlan-9": "10.17.73.49"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:580:9::31",
-      "kavlan-11": "2001:660:4406:1a0:509::31",
-      "kavlan-12": "2001:660:4406:2a0:509::31",
-      "kavlan-13": "2001:660:4406:4a0:509::31",
-      "kavlan-14": "2001:660:4406:5a0:509::31",
-      "kavlan-16": "2001:660:4406:7a0:509::31",
-      "kavlan-18": "2001:660:4406:8a0:509::31",
-      "kavlan-2": "2001:660:4406:581:9::31",
-      "kavlan-20": "2001:660:4406:3a0:509::31",
-      "kavlan-21": "2001:660:4406:6a0:509::31",
-      "kavlan-3": "2001:660:4406:582:9::31",
-      "kavlan-4": "2001:660:4406:590:9::31",
-      "kavlan-5": "2001:660:4406:591:9::31",
-      "kavlan-6": "2001:660:4406:592:9::31",
-      "kavlan-7": "2001:660:4406:593:9::31",
-      "kavlan-8": "2001:660:4406:594:9::31",
-      "kavlan-9": "2001:660:4406:595:9::31"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:580:9:1:0:31",
-      "kavlan-11": "2001:660:4406:1a0:509:1:0:31",
-      "kavlan-12": "2001:660:4406:2a0:509:1:0:31",
-      "kavlan-13": "2001:660:4406:4a0:509:1:0:31",
-      "kavlan-14": "2001:660:4406:5a0:509:1:0:31",
-      "kavlan-16": "2001:660:4406:7a0:509:1:0:31",
-      "kavlan-18": "2001:660:4406:8a0:509:1:0:31",
-      "kavlan-2": "2001:660:4406:581:9:1:0:31",
-      "kavlan-20": "2001:660:4406:3a0:509:1:0:31",
-      "kavlan-21": "2001:660:4406:6a0:509:1:0:31",
-      "kavlan-3": "2001:660:4406:582:9:1:0:31",
-      "kavlan-4": "2001:660:4406:590:9:1:0:31",
-      "kavlan-5": "2001:660:4406:591:9:1:0:31",
-      "kavlan-6": "2001:660:4406:592:9:1:0:31",
-      "kavlan-7": "2001:660:4406:593:9:1:0:31",
-      "kavlan-8": "2001:660:4406:594:9:1:0:31",
-      "kavlan-9": "2001:660:4406:595:9:1:0:31"
-    },
-    "eth2": {
-      "kavlan-1": "2001:660:4406:580:9:2:0:31",
-      "kavlan-11": "2001:660:4406:1a0:509:2:0:31",
-      "kavlan-12": "2001:660:4406:2a0:509:2:0:31",
-      "kavlan-13": "2001:660:4406:4a0:509:2:0:31",
-      "kavlan-14": "2001:660:4406:5a0:509:2:0:31",
-      "kavlan-16": "2001:660:4406:7a0:509:2:0:31",
-      "kavlan-18": "2001:660:4406:8a0:509:2:0:31",
-      "kavlan-2": "2001:660:4406:581:9:2:0:31",
-      "kavlan-20": "2001:660:4406:3a0:509:2:0:31",
-      "kavlan-21": "2001:660:4406:6a0:509:2:0:31",
-      "kavlan-3": "2001:660:4406:582:9:2:0:31",
-      "kavlan-4": "2001:660:4406:590:9:2:0:31",
-      "kavlan-5": "2001:660:4406:591:9:2:0:31",
-      "kavlan-6": "2001:660:4406:592:9:2:0:31",
-      "kavlan-7": "2001:660:4406:593:9:2:0:31",
-      "kavlan-8": "2001:660:4406:594:9:2:0:31",
-      "kavlan-9": "2001:660:4406:595:9:2:0:31"
-    },
-    "eth3": {
-      "kavlan-1": "2001:660:4406:580:9:3:0:31",
-      "kavlan-11": "2001:660:4406:1a0:509:3:0:31",
-      "kavlan-12": "2001:660:4406:2a0:509:3:0:31",
-      "kavlan-13": "2001:660:4406:4a0:509:3:0:31",
-      "kavlan-14": "2001:660:4406:5a0:509:3:0:31",
-      "kavlan-16": "2001:660:4406:7a0:509:3:0:31",
-      "kavlan-18": "2001:660:4406:8a0:509:3:0:31",
-      "kavlan-2": "2001:660:4406:581:9:3:0:31",
-      "kavlan-20": "2001:660:4406:3a0:509:3:0:31",
-      "kavlan-21": "2001:660:4406:6a0:509:3:0:31",
-      "kavlan-3": "2001:660:4406:582:9:3:0:31",
-      "kavlan-4": "2001:660:4406:590:9:3:0:31",
-      "kavlan-5": "2001:660:4406:591:9:3:0:31",
-      "kavlan-6": "2001:660:4406:592:9:3:0:31",
-      "kavlan-7": "2001:660:4406:593:9:3:0:31",
-      "kavlan-8": "2001:660:4406:594:9:3:0:31",
-      "kavlan-9": "2001:660:4406:595:9:3:0:31"
-    }
-  },
-  "main_memory": {
-    "ram_size": 137438953472
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "racadm",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a1",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_a2",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_a3",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_a4",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b1",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b2",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b3",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b4",
-      "size": 17179869184,
-      "technology": "dram"
-    }
-  ],
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095c, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.72.49",
-      "ip6": "2001:660:4406:500:9::31",
-      "kavlan": true,
-      "mac": "24:6e:96:03:0e:80",
-      "management": false,
-      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "grisou-49.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet1/35",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095c, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.72.149",
-      "ip6": "2001:660:4406:500:9:1:0:31",
-      "kavlan": true,
-      "mac": "24:6e:96:03:0e:82",
-      "management": false,
-      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "grisou-49-eth1.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet6/25",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095d, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.72.249",
-      "ip6": "2001:660:4406:500:9:2:0:31",
-      "kavlan": true,
-      "mac": "a0:36:9f:7e:4d:cc",
-      "management": false,
-      "model": "Ethernet 10G 2P X520 Adapter",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp4s0f0",
-      "network_address": "grisou-49-eth2.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet6/26",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095d, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.73.149",
-      "ip6": "2001:660:4406:500:9:3:0:31",
-      "kavlan": true,
-      "mac": "a0:36:9f:7e:4d:ce",
-      "management": false,
-      "model": "Ethernet 10G 2P X520 Adapter",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp4s0f1",
-      "network_address": "grisou-49-eth3.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet6/27",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth4",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.67, 0x80000fab, 19.5.12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "24:6e:96:03:0e:84",
-      "management": false,
-      "model": "I350 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno3",
-      "sriov": false,
-      "sriov_totalvfs": 0,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth5",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.67, 0x80000fab, 19.5.12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "24:6e:96:03:0e:85",
-      "management": false,
-      "model": "I350 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno4",
-      "sriov": false,
-      "sriov_totalvfs": 0,
-      "vendor": "Intel"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.72.49",
-      "kavlan": false,
-      "mac": "64:00:6a:c0:dc:5c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "grisou-49-bmc.nancy.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": true,
-    "pstate_driver": "intel_cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "pdu": [
-    {
-      "port": 22,
-      "uid": "grimoire-pdu1"
-    }
-  ],
-  "performance": {
-    "core_flops": 38400000000,
-    "node_flops": 614400000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 20971520,
-    "clock_speed": 2400000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Haswell",
-    "microcode": "0x49",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
-    "vendor": "Intel",
-    "version": "E5-2630 v3"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5008e43b94b",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
-      "firmware_version": "TT31",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "ST600MM0088",
-      "size": 600127266816,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4396e7",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
-      "firmware_version": "TT31",
-      "id": "disk1",
-      "interface": "SAS",
-      "model": "ST600MM0088",
-      "size": 600127266816,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin",
-      "default"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "grisou-49"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
deleted file mode 100644
index 678a9d53b68272cf826282afdcc47dffb0df157c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
+++ /dev/null
@@ -1,474 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 16,
-    "nb_procs": 2,
-    "nb_threads": 32,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "05/14/2021",
-    "vendor": "Dell Inc.",
-    "version": "2.13.0"
-  },
-  "bmc_version": "2.81.81.81",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R630",
-    "serial": "3F1ZH82"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.200.50",
-      "kavlan-11": "10.7.209.50",
-      "kavlan-12": "10.11.209.50",
-      "kavlan-13": "10.15.209.50",
-      "kavlan-14": "10.19.209.50",
-      "kavlan-16": "10.27.209.50",
-      "kavlan-18": "10.35.209.50",
-      "kavlan-2": "192.168.216.50",
-      "kavlan-20": "10.43.209.50",
-      "kavlan-21": "10.47.209.50",
-      "kavlan-3": "192.168.232.50",
-      "kavlan-4": "10.16.8.50",
-      "kavlan-5": "10.16.72.50",
-      "kavlan-6": "10.16.136.50",
-      "kavlan-7": "10.16.200.50",
-      "kavlan-8": "10.17.8.50",
-      "kavlan-9": "10.17.72.50"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.200.150",
-      "kavlan-11": "10.7.209.150",
-      "kavlan-12": "10.11.209.150",
-      "kavlan-13": "10.15.209.150",
-      "kavlan-14": "10.19.209.150",
-      "kavlan-16": "10.27.209.150",
-      "kavlan-18": "10.35.209.150",
-      "kavlan-2": "192.168.216.150",
-      "kavlan-20": "10.43.209.150",
-      "kavlan-21": "10.47.209.150",
-      "kavlan-3": "192.168.232.150",
-      "kavlan-4": "10.16.8.150",
-      "kavlan-5": "10.16.72.150",
-      "kavlan-6": "10.16.136.150",
-      "kavlan-7": "10.16.200.150",
-      "kavlan-8": "10.17.8.150",
-      "kavlan-9": "10.17.72.150"
-    },
-    "eth2": {
-      "kavlan-1": "192.168.200.250",
-      "kavlan-11": "10.7.209.250",
-      "kavlan-12": "10.11.209.250",
-      "kavlan-13": "10.15.209.250",
-      "kavlan-14": "10.19.209.250",
-      "kavlan-16": "10.27.209.250",
-      "kavlan-18": "10.35.209.250",
-      "kavlan-2": "192.168.216.250",
-      "kavlan-20": "10.43.209.250",
-      "kavlan-21": "10.47.209.250",
-      "kavlan-3": "192.168.232.250",
-      "kavlan-4": "10.16.8.250",
-      "kavlan-5": "10.16.72.250",
-      "kavlan-6": "10.16.136.250",
-      "kavlan-7": "10.16.200.250",
-      "kavlan-8": "10.17.8.250",
-      "kavlan-9": "10.17.72.250"
-    },
-    "eth3": {
-      "kavlan-1": "192.168.201.50",
-      "kavlan-11": "10.7.210.50",
-      "kavlan-12": "10.11.210.50",
-      "kavlan-13": "10.15.210.50",
-      "kavlan-14": "10.19.210.50",
-      "kavlan-16": "10.27.210.50",
-      "kavlan-18": "10.35.210.50",
-      "kavlan-2": "192.168.217.50",
-      "kavlan-20": "10.43.210.50",
-      "kavlan-21": "10.47.210.50",
-      "kavlan-3": "192.168.233.50",
-      "kavlan-4": "10.16.9.50",
-      "kavlan-5": "10.16.73.50",
-      "kavlan-6": "10.16.137.50",
-      "kavlan-7": "10.16.201.50",
-      "kavlan-8": "10.17.9.50",
-      "kavlan-9": "10.17.73.50"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:580:9::32",
-      "kavlan-11": "2001:660:4406:1a0:509::32",
-      "kavlan-12": "2001:660:4406:2a0:509::32",
-      "kavlan-13": "2001:660:4406:4a0:509::32",
-      "kavlan-14": "2001:660:4406:5a0:509::32",
-      "kavlan-16": "2001:660:4406:7a0:509::32",
-      "kavlan-18": "2001:660:4406:8a0:509::32",
-      "kavlan-2": "2001:660:4406:581:9::32",
-      "kavlan-20": "2001:660:4406:3a0:509::32",
-      "kavlan-21": "2001:660:4406:6a0:509::32",
-      "kavlan-3": "2001:660:4406:582:9::32",
-      "kavlan-4": "2001:660:4406:590:9::32",
-      "kavlan-5": "2001:660:4406:591:9::32",
-      "kavlan-6": "2001:660:4406:592:9::32",
-      "kavlan-7": "2001:660:4406:593:9::32",
-      "kavlan-8": "2001:660:4406:594:9::32",
-      "kavlan-9": "2001:660:4406:595:9::32"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:580:9:1:0:32",
-      "kavlan-11": "2001:660:4406:1a0:509:1:0:32",
-      "kavlan-12": "2001:660:4406:2a0:509:1:0:32",
-      "kavlan-13": "2001:660:4406:4a0:509:1:0:32",
-      "kavlan-14": "2001:660:4406:5a0:509:1:0:32",
-      "kavlan-16": "2001:660:4406:7a0:509:1:0:32",
-      "kavlan-18": "2001:660:4406:8a0:509:1:0:32",
-      "kavlan-2": "2001:660:4406:581:9:1:0:32",
-      "kavlan-20": "2001:660:4406:3a0:509:1:0:32",
-      "kavlan-21": "2001:660:4406:6a0:509:1:0:32",
-      "kavlan-3": "2001:660:4406:582:9:1:0:32",
-      "kavlan-4": "2001:660:4406:590:9:1:0:32",
-      "kavlan-5": "2001:660:4406:591:9:1:0:32",
-      "kavlan-6": "2001:660:4406:592:9:1:0:32",
-      "kavlan-7": "2001:660:4406:593:9:1:0:32",
-      "kavlan-8": "2001:660:4406:594:9:1:0:32",
-      "kavlan-9": "2001:660:4406:595:9:1:0:32"
-    },
-    "eth2": {
-      "kavlan-1": "2001:660:4406:580:9:2:0:32",
-      "kavlan-11": "2001:660:4406:1a0:509:2:0:32",
-      "kavlan-12": "2001:660:4406:2a0:509:2:0:32",
-      "kavlan-13": "2001:660:4406:4a0:509:2:0:32",
-      "kavlan-14": "2001:660:4406:5a0:509:2:0:32",
-      "kavlan-16": "2001:660:4406:7a0:509:2:0:32",
-      "kavlan-18": "2001:660:4406:8a0:509:2:0:32",
-      "kavlan-2": "2001:660:4406:581:9:2:0:32",
-      "kavlan-20": "2001:660:4406:3a0:509:2:0:32",
-      "kavlan-21": "2001:660:4406:6a0:509:2:0:32",
-      "kavlan-3": "2001:660:4406:582:9:2:0:32",
-      "kavlan-4": "2001:660:4406:590:9:2:0:32",
-      "kavlan-5": "2001:660:4406:591:9:2:0:32",
-      "kavlan-6": "2001:660:4406:592:9:2:0:32",
-      "kavlan-7": "2001:660:4406:593:9:2:0:32",
-      "kavlan-8": "2001:660:4406:594:9:2:0:32",
-      "kavlan-9": "2001:660:4406:595:9:2:0:32"
-    },
-    "eth3": {
-      "kavlan-1": "2001:660:4406:580:9:3:0:32",
-      "kavlan-11": "2001:660:4406:1a0:509:3:0:32",
-      "kavlan-12": "2001:660:4406:2a0:509:3:0:32",
-      "kavlan-13": "2001:660:4406:4a0:509:3:0:32",
-      "kavlan-14": "2001:660:4406:5a0:509:3:0:32",
-      "kavlan-16": "2001:660:4406:7a0:509:3:0:32",
-      "kavlan-18": "2001:660:4406:8a0:509:3:0:32",
-      "kavlan-2": "2001:660:4406:581:9:3:0:32",
-      "kavlan-20": "2001:660:4406:3a0:509:3:0:32",
-      "kavlan-21": "2001:660:4406:6a0:509:3:0:32",
-      "kavlan-3": "2001:660:4406:582:9:3:0:32",
-      "kavlan-4": "2001:660:4406:590:9:3:0:32",
-      "kavlan-5": "2001:660:4406:591:9:3:0:32",
-      "kavlan-6": "2001:660:4406:592:9:3:0:32",
-      "kavlan-7": "2001:660:4406:593:9:3:0:32",
-      "kavlan-8": "2001:660:4406:594:9:3:0:32",
-      "kavlan-9": "2001:660:4406:595:9:3:0:32"
-    }
-  },
-  "main_memory": {
-    "ram_size": 137438953472
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "racadm",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a1",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_a2",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_a3",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_a4",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b1",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b2",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b3",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b4",
-      "size": 17179869184,
-      "technology": "dram"
-    }
-  ],
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095c, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.72.50",
-      "ip6": "2001:660:4406:500:9::32",
-      "kavlan": true,
-      "mac": "e4:43:4b:1f:c1:c8",
-      "management": false,
-      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "grisou-50.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet1/36",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095c, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.72.150",
-      "ip6": "2001:660:4406:500:9:1:0:32",
-      "kavlan": true,
-      "mac": "e4:43:4b:1f:c1:ca",
-      "management": false,
-      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "grisou-50-eth1.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet6/28",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095d, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.72.250",
-      "ip6": "2001:660:4406:500:9:2:0:32",
-      "kavlan": true,
-      "mac": "a0:36:9f:7e:4c:24",
-      "management": false,
-      "model": "Ethernet 10G 2P X520 Adapter",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp129s0f0",
-      "network_address": "grisou-50-eth2.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet6/29",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095d, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.73.150",
-      "ip6": "2001:660:4406:500:9:3:0:32",
-      "kavlan": true,
-      "mac": "a0:36:9f:7e:4c:26",
-      "management": false,
-      "model": "Ethernet 10G 2P X520 Adapter",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp129s0f1",
-      "network_address": "grisou-50-eth3.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet6/30",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth4",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.67, 0x80000fab, 19.5.12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "e4:43:4b:1f:c1:cc",
-      "management": false,
-      "model": "I350 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno3",
-      "sriov": false,
-      "sriov_totalvfs": 0,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth5",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.67, 0x80000fab, 19.5.12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "e4:43:4b:1f:c1:cd",
-      "management": false,
-      "model": "I350 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno4",
-      "sriov": false,
-      "sriov_totalvfs": 0,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.34.5000",
-      "guid": "0xe41d2d0300bf5071",
-      "hwid": null,
-      "ib_switch_card": null,
-      "ib_switch_card_pos": null,
-      "interface": "InfiniBand",
-      "ip": "172.18.72.50",
-      "kavlan": false,
-      "mac": "e4:1d:2d:03:00:bf:50:71",
-      "management": false,
-      "model": "MT27500 Family [ConnectX-3]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "grisou-50-ib0.nancy.grid5000.fr",
-      "rate": 56000000000,
-      "switch": "sgraoullyib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.72.50",
-      "kavlan": false,
-      "mac": "64:00:6a:c1:56:9a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "grisou-50-bmc.nancy.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": true,
-    "pstate_driver": "intel_cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "pdu": [
-    {
-      "port": 22,
-      "uid": "graoully-pdu2"
-    }
-  ],
-  "performance": {
-    "core_flops": 38400000000,
-    "node_flops": 614400000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 20971520,
-    "clock_speed": 2400000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Haswell",
-    "microcode": "0x49",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
-    "vendor": "Intel",
-    "version": "E5-2630 v3"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5008e50e807",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
-      "firmware_version": "TT31",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "ST600MM0088",
-      "size": 600127266816,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5008e513b17",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
-      "firmware_version": "TT31",
-      "id": "disk1",
-      "interface": "SAS",
-      "model": "ST600MM0088",
-      "size": 600127266816,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin",
-      "default"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "grisou-50"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
deleted file mode 100644
index 24674e3ddbb3a9505f6c5484fe96daf4d61aa6f6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
+++ /dev/null
@@ -1,474 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 16,
-    "nb_procs": 2,
-    "nb_threads": 32,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "05/14/2021",
-    "vendor": "Dell Inc.",
-    "version": "2.13.0"
-  },
-  "bmc_version": "2.81.81.81",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R630",
-    "serial": "2S11J82"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.200.51",
-      "kavlan-11": "10.7.209.51",
-      "kavlan-12": "10.11.209.51",
-      "kavlan-13": "10.15.209.51",
-      "kavlan-14": "10.19.209.51",
-      "kavlan-16": "10.27.209.51",
-      "kavlan-18": "10.35.209.51",
-      "kavlan-2": "192.168.216.51",
-      "kavlan-20": "10.43.209.51",
-      "kavlan-21": "10.47.209.51",
-      "kavlan-3": "192.168.232.51",
-      "kavlan-4": "10.16.8.51",
-      "kavlan-5": "10.16.72.51",
-      "kavlan-6": "10.16.136.51",
-      "kavlan-7": "10.16.200.51",
-      "kavlan-8": "10.17.8.51",
-      "kavlan-9": "10.17.72.51"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.200.151",
-      "kavlan-11": "10.7.209.151",
-      "kavlan-12": "10.11.209.151",
-      "kavlan-13": "10.15.209.151",
-      "kavlan-14": "10.19.209.151",
-      "kavlan-16": "10.27.209.151",
-      "kavlan-18": "10.35.209.151",
-      "kavlan-2": "192.168.216.151",
-      "kavlan-20": "10.43.209.151",
-      "kavlan-21": "10.47.209.151",
-      "kavlan-3": "192.168.232.151",
-      "kavlan-4": "10.16.8.151",
-      "kavlan-5": "10.16.72.151",
-      "kavlan-6": "10.16.136.151",
-      "kavlan-7": "10.16.200.151",
-      "kavlan-8": "10.17.8.151",
-      "kavlan-9": "10.17.72.151"
-    },
-    "eth2": {
-      "kavlan-1": "192.168.200.251",
-      "kavlan-11": "10.7.209.251",
-      "kavlan-12": "10.11.209.251",
-      "kavlan-13": "10.15.209.251",
-      "kavlan-14": "10.19.209.251",
-      "kavlan-16": "10.27.209.251",
-      "kavlan-18": "10.35.209.251",
-      "kavlan-2": "192.168.216.251",
-      "kavlan-20": "10.43.209.251",
-      "kavlan-21": "10.47.209.251",
-      "kavlan-3": "192.168.232.251",
-      "kavlan-4": "10.16.8.251",
-      "kavlan-5": "10.16.72.251",
-      "kavlan-6": "10.16.136.251",
-      "kavlan-7": "10.16.200.251",
-      "kavlan-8": "10.17.8.251",
-      "kavlan-9": "10.17.72.251"
-    },
-    "eth3": {
-      "kavlan-1": "192.168.201.51",
-      "kavlan-11": "10.7.210.51",
-      "kavlan-12": "10.11.210.51",
-      "kavlan-13": "10.15.210.51",
-      "kavlan-14": "10.19.210.51",
-      "kavlan-16": "10.27.210.51",
-      "kavlan-18": "10.35.210.51",
-      "kavlan-2": "192.168.217.51",
-      "kavlan-20": "10.43.210.51",
-      "kavlan-21": "10.47.210.51",
-      "kavlan-3": "192.168.233.51",
-      "kavlan-4": "10.16.9.51",
-      "kavlan-5": "10.16.73.51",
-      "kavlan-6": "10.16.137.51",
-      "kavlan-7": "10.16.201.51",
-      "kavlan-8": "10.17.9.51",
-      "kavlan-9": "10.17.73.51"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:580:9::33",
-      "kavlan-11": "2001:660:4406:1a0:509::33",
-      "kavlan-12": "2001:660:4406:2a0:509::33",
-      "kavlan-13": "2001:660:4406:4a0:509::33",
-      "kavlan-14": "2001:660:4406:5a0:509::33",
-      "kavlan-16": "2001:660:4406:7a0:509::33",
-      "kavlan-18": "2001:660:4406:8a0:509::33",
-      "kavlan-2": "2001:660:4406:581:9::33",
-      "kavlan-20": "2001:660:4406:3a0:509::33",
-      "kavlan-21": "2001:660:4406:6a0:509::33",
-      "kavlan-3": "2001:660:4406:582:9::33",
-      "kavlan-4": "2001:660:4406:590:9::33",
-      "kavlan-5": "2001:660:4406:591:9::33",
-      "kavlan-6": "2001:660:4406:592:9::33",
-      "kavlan-7": "2001:660:4406:593:9::33",
-      "kavlan-8": "2001:660:4406:594:9::33",
-      "kavlan-9": "2001:660:4406:595:9::33"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:580:9:1:0:33",
-      "kavlan-11": "2001:660:4406:1a0:509:1:0:33",
-      "kavlan-12": "2001:660:4406:2a0:509:1:0:33",
-      "kavlan-13": "2001:660:4406:4a0:509:1:0:33",
-      "kavlan-14": "2001:660:4406:5a0:509:1:0:33",
-      "kavlan-16": "2001:660:4406:7a0:509:1:0:33",
-      "kavlan-18": "2001:660:4406:8a0:509:1:0:33",
-      "kavlan-2": "2001:660:4406:581:9:1:0:33",
-      "kavlan-20": "2001:660:4406:3a0:509:1:0:33",
-      "kavlan-21": "2001:660:4406:6a0:509:1:0:33",
-      "kavlan-3": "2001:660:4406:582:9:1:0:33",
-      "kavlan-4": "2001:660:4406:590:9:1:0:33",
-      "kavlan-5": "2001:660:4406:591:9:1:0:33",
-      "kavlan-6": "2001:660:4406:592:9:1:0:33",
-      "kavlan-7": "2001:660:4406:593:9:1:0:33",
-      "kavlan-8": "2001:660:4406:594:9:1:0:33",
-      "kavlan-9": "2001:660:4406:595:9:1:0:33"
-    },
-    "eth2": {
-      "kavlan-1": "2001:660:4406:580:9:2:0:33",
-      "kavlan-11": "2001:660:4406:1a0:509:2:0:33",
-      "kavlan-12": "2001:660:4406:2a0:509:2:0:33",
-      "kavlan-13": "2001:660:4406:4a0:509:2:0:33",
-      "kavlan-14": "2001:660:4406:5a0:509:2:0:33",
-      "kavlan-16": "2001:660:4406:7a0:509:2:0:33",
-      "kavlan-18": "2001:660:4406:8a0:509:2:0:33",
-      "kavlan-2": "2001:660:4406:581:9:2:0:33",
-      "kavlan-20": "2001:660:4406:3a0:509:2:0:33",
-      "kavlan-21": "2001:660:4406:6a0:509:2:0:33",
-      "kavlan-3": "2001:660:4406:582:9:2:0:33",
-      "kavlan-4": "2001:660:4406:590:9:2:0:33",
-      "kavlan-5": "2001:660:4406:591:9:2:0:33",
-      "kavlan-6": "2001:660:4406:592:9:2:0:33",
-      "kavlan-7": "2001:660:4406:593:9:2:0:33",
-      "kavlan-8": "2001:660:4406:594:9:2:0:33",
-      "kavlan-9": "2001:660:4406:595:9:2:0:33"
-    },
-    "eth3": {
-      "kavlan-1": "2001:660:4406:580:9:3:0:33",
-      "kavlan-11": "2001:660:4406:1a0:509:3:0:33",
-      "kavlan-12": "2001:660:4406:2a0:509:3:0:33",
-      "kavlan-13": "2001:660:4406:4a0:509:3:0:33",
-      "kavlan-14": "2001:660:4406:5a0:509:3:0:33",
-      "kavlan-16": "2001:660:4406:7a0:509:3:0:33",
-      "kavlan-18": "2001:660:4406:8a0:509:3:0:33",
-      "kavlan-2": "2001:660:4406:581:9:3:0:33",
-      "kavlan-20": "2001:660:4406:3a0:509:3:0:33",
-      "kavlan-21": "2001:660:4406:6a0:509:3:0:33",
-      "kavlan-3": "2001:660:4406:582:9:3:0:33",
-      "kavlan-4": "2001:660:4406:590:9:3:0:33",
-      "kavlan-5": "2001:660:4406:591:9:3:0:33",
-      "kavlan-6": "2001:660:4406:592:9:3:0:33",
-      "kavlan-7": "2001:660:4406:593:9:3:0:33",
-      "kavlan-8": "2001:660:4406:594:9:3:0:33",
-      "kavlan-9": "2001:660:4406:595:9:3:0:33"
-    }
-  },
-  "main_memory": {
-    "ram_size": 137438953472
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "racadm",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a1",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_a2",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_a3",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_a4",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b1",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b2",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b3",
-      "size": 17179869184,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b4",
-      "size": 17179869184,
-      "technology": "dram"
-    }
-  ],
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095c, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.72.51",
-      "ip6": "2001:660:4406:500:9::33",
-      "kavlan": true,
-      "mac": "24:6e:96:03:24:20",
-      "management": false,
-      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "grisou-51.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet1/37",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095c, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.72.151",
-      "ip6": "2001:660:4406:500:9:1:0:33",
-      "kavlan": true,
-      "mac": "24:6e:96:03:24:22",
-      "management": false,
-      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "grisou-51-eth1.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet6/31",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095d, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.72.251",
-      "ip6": "2001:660:4406:500:9:2:0:33",
-      "kavlan": true,
-      "mac": "a0:36:9f:7e:4c:e8",
-      "management": false,
-      "model": "Ethernet 10G 2P X520 Adapter",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp129s0f0",
-      "network_address": "grisou-51-eth2.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet6/32",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095d, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.73.151",
-      "ip6": "2001:660:4406:500:9:3:0:33",
-      "kavlan": true,
-      "mac": "a0:36:9f:7e:4c:ea",
-      "management": false,
-      "model": "Ethernet 10G 2P X520 Adapter",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp129s0f1",
-      "network_address": "grisou-51-eth3.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet6/33",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth4",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.67, 0x80000fab, 19.5.12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "24:6e:96:03:24:24",
-      "management": false,
-      "model": "I350 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno3",
-      "sriov": false,
-      "sriov_totalvfs": 0,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth5",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.67, 0x80000fab, 19.5.12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "24:6e:96:03:24:25",
-      "management": false,
-      "model": "I350 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno4",
-      "sriov": false,
-      "sriov_totalvfs": 0,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.34.5000",
-      "guid": "0xe41d2d0300bf4f81",
-      "hwid": null,
-      "ib_switch_card": null,
-      "ib_switch_card_pos": null,
-      "interface": "InfiniBand",
-      "ip": "172.18.72.51",
-      "kavlan": false,
-      "mac": "e4:1d:2d:03:00:bf:4f:81",
-      "management": false,
-      "model": "MT27500 Family [ConnectX-3]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "grisou-51-ib0.nancy.grid5000.fr",
-      "rate": 56000000000,
-      "switch": "sgraoullyib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.72.51",
-      "kavlan": false,
-      "mac": "64:00:6a:c0:e5:ba",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "grisou-51-bmc.nancy.grid5000.fr"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": true,
-    "pstate_driver": "intel_cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "pdu": [
-    {
-      "port": 22,
-      "uid": "graoully-pdu1"
-    }
-  ],
-  "performance": {
-    "core_flops": 38400000000,
-    "node_flops": 614400000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 20971520,
-    "clock_speed": 2400000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Haswell",
-    "microcode": "0x49",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz",
-    "vendor": "Intel",
-    "version": "E5-2630 v3"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2023050410",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5008e513b77",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
-      "firmware_version": "TT31",
-      "id": "disk0",
-      "interface": "SAS",
-      "model": "ST600MM0088",
-      "size": 600127266816,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4fcd27",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
-      "firmware_version": "TT31",
-      "id": "disk1",
-      "interface": "SAS",
-      "model": "ST600MM0088",
-      "size": 600127266816,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "admin",
-      "default"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "grisou-51"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json
index 0637a779ad56add54c4616b7144d1e9d481c0718..8989538e4c7c8fd2edaa0e827eface126b900ad3 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw.json
@@ -241,22 +241,10 @@
           "uid": "grisou-48"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet1/35",
-          "uid": "grisou-49"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet1/36",
-          "uid": "grisou-50"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet1/37",
-          "uid": "grisou-51"
         },
         {
           "kind": "server",
@@ -1647,58 +1635,22 @@
           "uid": "grisou-48"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "Ethernet6/25",
-          "uid": "grisou-49"
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet6/26",
-          "uid": "grisou-49"
         },
         {
-          "kind": "node",
-          "port": "eth3",
-          "snmp_name": "Ethernet6/27",
-          "uid": "grisou-49"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "Ethernet6/28",
-          "uid": "grisou-50"
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet6/29",
-          "uid": "grisou-50"
         },
         {
-          "kind": "node",
-          "port": "eth3",
-          "snmp_name": "Ethernet6/30",
-          "uid": "grisou-50"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "Ethernet6/31",
-          "uid": "grisou-51"
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet6/32",
-          "uid": "grisou-51"
         },
         {
-          "kind": "node",
-          "port": "eth3",
-          "snmp_name": "Ethernet6/33",
-          "uid": "grisou-51"
         },
         {
           "kind": "node",
diff --git a/data/grid5000/sites/nancy/pdus/graoully-pdu1.json b/data/grid5000/sites/nancy/pdus/graoully-pdu1.json
index ce9cdc97cd71f6eba3f59bcc9c45843ac47ae773..6706614af03fb1b2cc3e2667b4682bc509e09ca7 100644
--- a/data/grid5000/sites/nancy/pdus/graoully-pdu1.json
+++ b/data/grid5000/sites/nancy/pdus/graoully-pdu1.json
@@ -26,7 +26,6 @@
     "2": "graphite-2",
     "20": "graoully-11",
     "21": "graoully-15",
-    "22": "grisou-51",
     "3": "graphite-3",
     "4": "graphite-4",
     "5": "graphique-2",
diff --git a/data/grid5000/sites/nancy/pdus/graoully-pdu2.json b/data/grid5000/sites/nancy/pdus/graoully-pdu2.json
index 4eb6f5a6f0ac699564c798616c5740bb0b21d1bb..2af2f42720721f900804710dfccb78119d8c8dd8 100644
--- a/data/grid5000/sites/nancy/pdus/graoully-pdu2.json
+++ b/data/grid5000/sites/nancy/pdus/graoully-pdu2.json
@@ -26,7 +26,6 @@
     "2": "graphite-2",
     "20": "graoully-14",
     "21": "graoully-16",
-    "22": "grisou-50",
     "23": "graphique-2",
     "3": "graphite-3",
     "4": "graphite-4",
diff --git a/data/grid5000/sites/nancy/pdus/grimoire-pdu1.json b/data/grid5000/sites/nancy/pdus/grimoire-pdu1.json
index be24bb4bf937b511755306b90f54c804c7d3f075..acd22a0a7e0989116af7fe4682fbbd3ee543ddc9 100644
--- a/data/grid5000/sites/nancy/pdus/grimoire-pdu1.json
+++ b/data/grid5000/sites/nancy/pdus/grimoire-pdu1.json
@@ -21,7 +21,6 @@
     "2": "grisou-37",
     "20": "grimoire-7",
     "21": "grisou-47",
-    "22": "grisou-49",
     "3": "grisou-38",
     "4": "grisou-39",
     "5": "grisou-40",
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
index 637b1eb41e4707902d5ee88315f10dc39bdfd735..a20f6c81cd6cb7972bc5019b3adb3fb551998dec 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
@@ -13,6 +13,8 @@ nodes:
     status: retired
   grisou-44:
     status: retired
+  grisou-[49-51]:
+    status: retired
   # Global node properties
   grisou-[1-51]:
     processor:
@@ -73,6 +75,7 @@ nodes:
         mounted: false
         mountable: false
 
+  # Leave this section even if node is retired
   grisou-49:
     network_adapters:
       eth0:
@@ -110,6 +113,7 @@ nodes:
         enabled: true
         mounted: false
         mountable: false
+  # Leave this section even if nodes are retired
   # Node with infiniband
   grisou-[50-51]:
     network_adapters:
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou_pdu.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou_pdu.yaml
index 1c554f4eddb0d9bc9af83d3b639dd68978b8b57b..2932094276a55f9e5e938915191ee827cc1cdc8d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou_pdu.yaml
@@ -184,15 +184,3 @@ nodes:
     pdu:
       - uid: grimoire-pdu2
         port: 22
-  grisou-49:
-    pdu:
-      - uid: grimoire-pdu1
-        port: 22
-  grisou-50:
-    pdu:
-      - uid: graoully-pdu2
-        port: 22
-  grisou-51:
-    pdu:
-      - uid: graoully-pdu1
-        port: 22
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
deleted file mode 100644
index 3ff052ba472da8882d8c82574f0ab9ab063229c5..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
+++ /dev/null
@@ -1,157 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-grisou-49:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 16
-    nb_procs: 2
-    nb_threads: 32
-    platform_type: x86_64
-  bios:
-    release_date: 05/14/2021
-    vendor: Dell Inc.
-    version: 2.13.0
-  bmc_version: 2.81.81.81
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
-    serial: 2RG2J82
-  main_memory:
-    ram_size: 137438953472
-  memory_devices:
-    dimm_a1:
-      size: 17179869184
-      technology: dram
-    dimm_a2:
-      size: 17179869184
-      technology: dram
-    dimm_a3:
-      size: 17179869184
-      technology: dram
-    dimm_a4:
-      size: 17179869184
-      technology: dram
-    dimm_b1:
-      size: 17179869184
-      technology: dram
-    dimm_b2:
-      size: 17179869184
-      technology: dram
-    dimm_b3:
-      size: 17179869184
-      technology: dram
-    dimm_b4:
-      size: 17179869184
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.72.49
-      mac: 64:00:6a:c0:dc:5c
-      management: true
-    eth0:
-      driver: ixgbe
-      firmware_version: 0x8000095c, 19.5.12
-      interface: Ethernet
-      ip: 172.16.72.49
-      mac: 24:6e:96:03:0e:80
-      management: false
-      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
-      name: eno1
-      rate: 10000000000
-      sriov: true
-      sriov_totalvfs: 63
-      vendor: Intel
-    eth1:
-      driver: ixgbe
-      firmware_version: 0x8000095c, 19.5.12
-      interface: Ethernet
-      mac: 24:6e:96:03:0e:82
-      management: false
-      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
-      name: eno2
-      rate: 10000000000
-      sriov: true
-      sriov_totalvfs: 63
-      vendor: Intel
-    eth2:
-      driver: ixgbe
-      firmware_version: 0x8000095d, 19.5.12
-      interface: Ethernet
-      mac: a0:36:9f:7e:4d:cc
-      management: false
-      model: Ethernet 10G 2P X520 Adapter
-      name: enp4s0f0
-      rate: 10000000000
-      sriov: true
-      sriov_totalvfs: 63
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: 0x8000095d, 19.5.12
-      interface: Ethernet
-      mac: a0:36:9f:7e:4d:ce
-      management: false
-      model: Ethernet 10G 2P X520 Adapter
-      name: enp4s0f1
-      rate: 10000000000
-      sriov: true
-      sriov_totalvfs: 63
-      vendor: Intel
-    eth4:
-      driver: igb
-      firmware_version: 1.67, 0x80000fab, 19.5.12
-      interface: Ethernet
-      mac: 24:6e:96:03:0e:84
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno3
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Intel
-    eth5:
-      driver: igb
-      firmware_version: 1.67, 0x80000fab, 19.5.12
-      interface: Ethernet
-      mac: 24:6e:96:03:0e:85
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno4
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Intel
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: true
-    pstate_driver: intel_cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0x49'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-  storage_devices:
-    pci-0000:03:00.0-scsi-0:0:0:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5008e43b94b"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
-      firmware_version: TT31
-      model: ST600MM0088
-      size: 600127266816
-      storage: HDD
-    pci-0000:03:00.0-scsi-0:0:1:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5008e4396e7"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
-      firmware_version: TT31
-      model: ST600MM0088
-      size: 600127266816
-      storage: HDD
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
deleted file mode 100644
index c979740e4b22bd29275328b9a0c0edacf9472add..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
+++ /dev/null
@@ -1,169 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-grisou-50:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 16
-    nb_procs: 2
-    nb_threads: 32
-    platform_type: x86_64
-  bios:
-    release_date: 05/14/2021
-    vendor: Dell Inc.
-    version: 2.13.0
-  bmc_version: 2.81.81.81
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
-    serial: 3F1ZH82
-  main_memory:
-    ram_size: 137438953472
-  memory_devices:
-    dimm_a1:
-      size: 17179869184
-      technology: dram
-    dimm_a2:
-      size: 17179869184
-      technology: dram
-    dimm_a3:
-      size: 17179869184
-      technology: dram
-    dimm_a4:
-      size: 17179869184
-      technology: dram
-    dimm_b1:
-      size: 17179869184
-      technology: dram
-    dimm_b2:
-      size: 17179869184
-      technology: dram
-    dimm_b3:
-      size: 17179869184
-      technology: dram
-    dimm_b4:
-      size: 17179869184
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.72.50
-      mac: 64:00:6a:c1:56:9a
-      management: true
-    eth0:
-      driver: ixgbe
-      firmware_version: 0x8000095c, 19.5.12
-      interface: Ethernet
-      ip: 172.16.72.50
-      mac: e4:43:4b:1f:c1:c8
-      management: false
-      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
-      name: eno1
-      rate: 10000000000
-      sriov: true
-      sriov_totalvfs: 63
-      vendor: Intel
-    eth1:
-      driver: ixgbe
-      firmware_version: 0x8000095c, 19.5.12
-      interface: Ethernet
-      mac: e4:43:4b:1f:c1:ca
-      management: false
-      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
-      name: eno2
-      rate: 10000000000
-      sriov: true
-      sriov_totalvfs: 63
-      vendor: Intel
-    eth2:
-      driver: ixgbe
-      firmware_version: 0x8000095d, 19.5.12
-      interface: Ethernet
-      mac: a0:36:9f:7e:4c:24
-      management: false
-      model: Ethernet 10G 2P X520 Adapter
-      name: enp129s0f0
-      rate: 10000000000
-      sriov: true
-      sriov_totalvfs: 63
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: 0x8000095d, 19.5.12
-      interface: Ethernet
-      mac: a0:36:9f:7e:4c:26
-      management: false
-      model: Ethernet 10G 2P X520 Adapter
-      name: enp129s0f1
-      rate: 10000000000
-      sriov: true
-      sriov_totalvfs: 63
-      vendor: Intel
-    eth4:
-      driver: igb
-      firmware_version: 1.67, 0x80000fab, 19.5.12
-      interface: Ethernet
-      mac: e4:43:4b:1f:c1:cc
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno3
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Intel
-    eth5:
-      driver: igb
-      firmware_version: 1.67, 0x80000fab, 19.5.12
-      interface: Ethernet
-      mac: e4:43:4b:1f:c1:cd
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno4
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.34.5000
-      guid: '0xe41d2d0300bf5071'
-      interface: InfiniBand
-      ip: 172.18.72.50
-      mac: e4:1d:2d:03:00:bf:50:71
-      management: false
-      model: MT27500 Family [ConnectX-3]
-      name: ib0
-      rate: 56000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: true
-    pstate_driver: intel_cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0x49'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-  storage_devices:
-    pci-0000:03:00.0-scsi-0:0:0:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e807"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
-      firmware_version: TT31
-      model: ST600MM0088
-      size: 600127266816
-      storage: HDD
-    pci-0000:03:00.0-scsi-0:0:1:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b17"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
-      firmware_version: TT31
-      model: ST600MM0088
-      size: 600127266816
-      storage: HDD
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
deleted file mode 100644
index 2a4bf189ec0211df1b4e99c1ea082eaa1dbe6a1a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
+++ /dev/null
@@ -1,169 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-grisou-51:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 16
-    nb_procs: 2
-    nb_threads: 32
-    platform_type: x86_64
-  bios:
-    release_date: 05/14/2021
-    vendor: Dell Inc.
-    version: 2.13.0
-  bmc_version: 2.81.81.81
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
-    serial: 2S11J82
-  main_memory:
-    ram_size: 137438953472
-  memory_devices:
-    dimm_a1:
-      size: 17179869184
-      technology: dram
-    dimm_a2:
-      size: 17179869184
-      technology: dram
-    dimm_a3:
-      size: 17179869184
-      technology: dram
-    dimm_a4:
-      size: 17179869184
-      technology: dram
-    dimm_b1:
-      size: 17179869184
-      technology: dram
-    dimm_b2:
-      size: 17179869184
-      technology: dram
-    dimm_b3:
-      size: 17179869184
-      technology: dram
-    dimm_b4:
-      size: 17179869184
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.72.51
-      mac: 64:00:6a:c0:e5:ba
-      management: true
-    eth0:
-      driver: ixgbe
-      firmware_version: 0x8000095c, 19.5.12
-      interface: Ethernet
-      ip: 172.16.72.51
-      mac: 24:6e:96:03:24:20
-      management: false
-      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
-      name: eno1
-      rate: 10000000000
-      sriov: true
-      sriov_totalvfs: 63
-      vendor: Intel
-    eth1:
-      driver: ixgbe
-      firmware_version: 0x8000095c, 19.5.12
-      interface: Ethernet
-      mac: 24:6e:96:03:24:22
-      management: false
-      model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
-      name: eno2
-      rate: 10000000000
-      sriov: true
-      sriov_totalvfs: 63
-      vendor: Intel
-    eth2:
-      driver: ixgbe
-      firmware_version: 0x8000095d, 19.5.12
-      interface: Ethernet
-      mac: a0:36:9f:7e:4c:e8
-      management: false
-      model: Ethernet 10G 2P X520 Adapter
-      name: enp129s0f0
-      rate: 10000000000
-      sriov: true
-      sriov_totalvfs: 63
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: 0x8000095d, 19.5.12
-      interface: Ethernet
-      mac: a0:36:9f:7e:4c:ea
-      management: false
-      model: Ethernet 10G 2P X520 Adapter
-      name: enp129s0f1
-      rate: 10000000000
-      sriov: true
-      sriov_totalvfs: 63
-      vendor: Intel
-    eth4:
-      driver: igb
-      firmware_version: 1.67, 0x80000fab, 19.5.12
-      interface: Ethernet
-      mac: 24:6e:96:03:24:24
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno3
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Intel
-    eth5:
-      driver: igb
-      firmware_version: 1.67, 0x80000fab, 19.5.12
-      interface: Ethernet
-      mac: 24:6e:96:03:24:25
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno4
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.34.5000
-      guid: '0xe41d2d0300bf4f81'
-      interface: InfiniBand
-      ip: 172.18.72.51
-      mac: e4:1d:2d:03:00:bf:4f:81
-      management: false
-      model: MT27500 Family [ConnectX-3]
-      name: ib0
-      rate: 56000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: true
-    pstate_driver: intel_cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0x49'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-  storage_devices:
-    pci-0000:03:00.0-scsi-0:0:0:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b77"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
-      firmware_version: TT31
-      model: ST600MM0088
-      size: 600127266816
-      storage: HDD
-    pci-0000:03:00.0-scsi-0:0:1:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fcd27"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
-      firmware_version: TT31
-      model: ST600MM0088
-      size: 600127266816
-      storage: HDD
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index 664f5488540b210707562b89de6ea080e307da6c..329f2a6d4baf2eb674dbc748fbae7482b1e3b139 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -193,12 +193,6 @@ gw:
           uid: grisou-47
         34:
           uid: grisou-48
-        35:
-          uid: grisou-49
-        36:
-          uid: grisou-50
-        37:
-          uid: grisou-51
         38:
           uid: srv2
           kind: server
@@ -684,24 +678,6 @@ gw:
           uid: grisou-48-eth2
         24:
           uid: grisou-48-eth3
-        25:
-          uid: grisou-49-eth1
-        26:
-          uid: grisou-49-eth2
-        27:
-          uid: grisou-49-eth3
-        28:
-          uid: grisou-50-eth1
-        29:
-          uid: grisou-50-eth2
-        30:
-          uid: grisou-50-eth3
-        31:
-          uid: grisou-51-eth1
-        32:
-          uid: grisou-51-eth2
-        33:
-          uid: grisou-51-eth3
         34:
           uid: graffiti-8-eth2
         35: