diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
deleted file mode 100644
index eac2b856b08dfb2a21982045ceb127b15c7d4439..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
+++ /dev/null
@@ -1,493 +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": "2RR1J82"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.200.33",
-      "kavlan-11": "10.7.209.33",
-      "kavlan-12": "10.11.209.33",
-      "kavlan-13": "10.15.209.33",
-      "kavlan-14": "10.19.209.33",
-      "kavlan-16": "10.27.209.33",
-      "kavlan-18": "10.35.209.33",
-      "kavlan-2": "192.168.216.33",
-      "kavlan-20": "10.43.209.33",
-      "kavlan-21": "10.47.209.33",
-      "kavlan-3": "192.168.232.33",
-      "kavlan-4": "10.16.8.33",
-      "kavlan-5": "10.16.72.33",
-      "kavlan-6": "10.16.136.33",
-      "kavlan-7": "10.16.200.33",
-      "kavlan-8": "10.17.8.33",
-      "kavlan-9": "10.17.72.33"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.200.133",
-      "kavlan-11": "10.7.209.133",
-      "kavlan-12": "10.11.209.133",
-      "kavlan-13": "10.15.209.133",
-      "kavlan-14": "10.19.209.133",
-      "kavlan-16": "10.27.209.133",
-      "kavlan-18": "10.35.209.133",
-      "kavlan-2": "192.168.216.133",
-      "kavlan-20": "10.43.209.133",
-      "kavlan-21": "10.47.209.133",
-      "kavlan-3": "192.168.232.133",
-      "kavlan-4": "10.16.8.133",
-      "kavlan-5": "10.16.72.133",
-      "kavlan-6": "10.16.136.133",
-      "kavlan-7": "10.16.200.133",
-      "kavlan-8": "10.17.8.133",
-      "kavlan-9": "10.17.72.133"
-    },
-    "eth2": {
-      "kavlan-1": "192.168.200.233",
-      "kavlan-11": "10.7.209.233",
-      "kavlan-12": "10.11.209.233",
-      "kavlan-13": "10.15.209.233",
-      "kavlan-14": "10.19.209.233",
-      "kavlan-16": "10.27.209.233",
-      "kavlan-18": "10.35.209.233",
-      "kavlan-2": "192.168.216.233",
-      "kavlan-20": "10.43.209.233",
-      "kavlan-21": "10.47.209.233",
-      "kavlan-3": "192.168.232.233",
-      "kavlan-4": "10.16.8.233",
-      "kavlan-5": "10.16.72.233",
-      "kavlan-6": "10.16.136.233",
-      "kavlan-7": "10.16.200.233",
-      "kavlan-8": "10.17.8.233",
-      "kavlan-9": "10.17.72.233"
-    },
-    "eth3": {
-      "kavlan-1": "192.168.201.33",
-      "kavlan-11": "10.7.210.33",
-      "kavlan-12": "10.11.210.33",
-      "kavlan-13": "10.15.210.33",
-      "kavlan-14": "10.19.210.33",
-      "kavlan-16": "10.27.210.33",
-      "kavlan-18": "10.35.210.33",
-      "kavlan-2": "192.168.217.33",
-      "kavlan-20": "10.43.210.33",
-      "kavlan-21": "10.47.210.33",
-      "kavlan-3": "192.168.233.33",
-      "kavlan-4": "10.16.9.33",
-      "kavlan-5": "10.16.73.33",
-      "kavlan-6": "10.16.137.33",
-      "kavlan-7": "10.16.201.33",
-      "kavlan-8": "10.17.9.33",
-      "kavlan-9": "10.17.73.33"
-    },
-    "eth4": {
-      "kavlan-1": "192.168.201.133",
-      "kavlan-11": "10.7.210.133",
-      "kavlan-12": "10.11.210.133",
-      "kavlan-13": "10.15.210.133",
-      "kavlan-14": "10.19.210.133",
-      "kavlan-16": "10.27.210.133",
-      "kavlan-18": "10.35.210.133",
-      "kavlan-2": "192.168.217.133",
-      "kavlan-20": "10.43.210.133",
-      "kavlan-21": "10.47.210.133",
-      "kavlan-3": "192.168.233.133",
-      "kavlan-4": "10.16.9.133",
-      "kavlan-5": "10.16.73.133",
-      "kavlan-6": "10.16.137.133",
-      "kavlan-7": "10.16.201.133",
-      "kavlan-8": "10.17.9.133",
-      "kavlan-9": "10.17.73.133"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:580:9::21",
-      "kavlan-11": "2001:660:4406:1a0:509::21",
-      "kavlan-12": "2001:660:4406:2a0:509::21",
-      "kavlan-13": "2001:660:4406:4a0:509::21",
-      "kavlan-14": "2001:660:4406:5a0:509::21",
-      "kavlan-16": "2001:660:4406:7a0:509::21",
-      "kavlan-18": "2001:660:4406:8a0:509::21",
-      "kavlan-2": "2001:660:4406:581:9::21",
-      "kavlan-20": "2001:660:4406:3a0:509::21",
-      "kavlan-21": "2001:660:4406:6a0:509::21",
-      "kavlan-3": "2001:660:4406:582:9::21",
-      "kavlan-4": "2001:660:4406:590:9::21",
-      "kavlan-5": "2001:660:4406:591:9::21",
-      "kavlan-6": "2001:660:4406:592:9::21",
-      "kavlan-7": "2001:660:4406:593:9::21",
-      "kavlan-8": "2001:660:4406:594:9::21",
-      "kavlan-9": "2001:660:4406:595:9::21"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:580:9:1:0:21",
-      "kavlan-11": "2001:660:4406:1a0:509:1:0:21",
-      "kavlan-12": "2001:660:4406:2a0:509:1:0:21",
-      "kavlan-13": "2001:660:4406:4a0:509:1:0:21",
-      "kavlan-14": "2001:660:4406:5a0:509:1:0:21",
-      "kavlan-16": "2001:660:4406:7a0:509:1:0:21",
-      "kavlan-18": "2001:660:4406:8a0:509:1:0:21",
-      "kavlan-2": "2001:660:4406:581:9:1:0:21",
-      "kavlan-20": "2001:660:4406:3a0:509:1:0:21",
-      "kavlan-21": "2001:660:4406:6a0:509:1:0:21",
-      "kavlan-3": "2001:660:4406:582:9:1:0:21",
-      "kavlan-4": "2001:660:4406:590:9:1:0:21",
-      "kavlan-5": "2001:660:4406:591:9:1:0:21",
-      "kavlan-6": "2001:660:4406:592:9:1:0:21",
-      "kavlan-7": "2001:660:4406:593:9:1:0:21",
-      "kavlan-8": "2001:660:4406:594:9:1:0:21",
-      "kavlan-9": "2001:660:4406:595:9:1:0:21"
-    },
-    "eth2": {
-      "kavlan-1": "2001:660:4406:580:9:2:0:21",
-      "kavlan-11": "2001:660:4406:1a0:509:2:0:21",
-      "kavlan-12": "2001:660:4406:2a0:509:2:0:21",
-      "kavlan-13": "2001:660:4406:4a0:509:2:0:21",
-      "kavlan-14": "2001:660:4406:5a0:509:2:0:21",
-      "kavlan-16": "2001:660:4406:7a0:509:2:0:21",
-      "kavlan-18": "2001:660:4406:8a0:509:2:0:21",
-      "kavlan-2": "2001:660:4406:581:9:2:0:21",
-      "kavlan-20": "2001:660:4406:3a0:509:2:0:21",
-      "kavlan-21": "2001:660:4406:6a0:509:2:0:21",
-      "kavlan-3": "2001:660:4406:582:9:2:0:21",
-      "kavlan-4": "2001:660:4406:590:9:2:0:21",
-      "kavlan-5": "2001:660:4406:591:9:2:0:21",
-      "kavlan-6": "2001:660:4406:592:9:2:0:21",
-      "kavlan-7": "2001:660:4406:593:9:2:0:21",
-      "kavlan-8": "2001:660:4406:594:9:2:0:21",
-      "kavlan-9": "2001:660:4406:595:9:2:0:21"
-    },
-    "eth3": {
-      "kavlan-1": "2001:660:4406:580:9:3:0:21",
-      "kavlan-11": "2001:660:4406:1a0:509:3:0:21",
-      "kavlan-12": "2001:660:4406:2a0:509:3:0:21",
-      "kavlan-13": "2001:660:4406:4a0:509:3:0:21",
-      "kavlan-14": "2001:660:4406:5a0:509:3:0:21",
-      "kavlan-16": "2001:660:4406:7a0:509:3:0:21",
-      "kavlan-18": "2001:660:4406:8a0:509:3:0:21",
-      "kavlan-2": "2001:660:4406:581:9:3:0:21",
-      "kavlan-20": "2001:660:4406:3a0:509:3:0:21",
-      "kavlan-21": "2001:660:4406:6a0:509:3:0:21",
-      "kavlan-3": "2001:660:4406:582:9:3:0:21",
-      "kavlan-4": "2001:660:4406:590:9:3:0:21",
-      "kavlan-5": "2001:660:4406:591:9:3:0:21",
-      "kavlan-6": "2001:660:4406:592:9:3:0:21",
-      "kavlan-7": "2001:660:4406:593:9:3:0:21",
-      "kavlan-8": "2001:660:4406:594:9:3:0:21",
-      "kavlan-9": "2001:660:4406:595:9:3:0:21"
-    },
-    "eth4": {
-      "kavlan-1": "2001:660:4406:580:9:4:0:21",
-      "kavlan-11": "2001:660:4406:1a0:509:4:0:21",
-      "kavlan-12": "2001:660:4406:2a0:509:4:0:21",
-      "kavlan-13": "2001:660:4406:4a0:509:4:0:21",
-      "kavlan-14": "2001:660:4406:5a0:509:4:0:21",
-      "kavlan-16": "2001:660:4406:7a0:509:4:0:21",
-      "kavlan-18": "2001:660:4406:8a0:509:4:0:21",
-      "kavlan-2": "2001:660:4406:581:9:4:0:21",
-      "kavlan-20": "2001:660:4406:3a0:509:4:0:21",
-      "kavlan-21": "2001:660:4406:6a0:509:4:0:21",
-      "kavlan-3": "2001:660:4406:582:9:4:0:21",
-      "kavlan-4": "2001:660:4406:590:9:4:0:21",
-      "kavlan-5": "2001:660:4406:591:9:4:0:21",
-      "kavlan-6": "2001:660:4406:592:9:4:0:21",
-      "kavlan-7": "2001:660:4406:593:9:4:0:21",
-      "kavlan-8": "2001:660:4406:594:9:4:0:21",
-      "kavlan-9": "2001:660:4406:595:9:4:0:21"
-    }
-  },
-  "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.33",
-      "ip6": "2001:660:4406:500:9::21",
-      "kavlan": true,
-      "mac": "24:6e:96:03:09:b0",
-      "management": false,
-      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "grisou-33.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet2/33",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095c, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.72.133",
-      "ip6": "2001:660:4406:500:9:1:0:21",
-      "kavlan": true,
-      "mac": "24:6e:96:03:09:b2",
-      "management": false,
-      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "grisou-33-eth1.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet3/33",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095d, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.72.233",
-      "ip6": "2001:660:4406:500:9:2:0:21",
-      "kavlan": true,
-      "mac": "a0:36:9f:7e:4c:e4",
-      "management": false,
-      "model": "Ethernet 10G 2P X520 Adapter",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp4s0f0",
-      "network_address": "grisou-33-eth2.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet4/33",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095d, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.73.133",
-      "ip6": "2001:660:4406:500:9:3:0:21",
-      "kavlan": true,
-      "mac": "a0:36:9f:7e:4c:e6",
-      "management": false,
-      "model": "Ethernet 10G 2P X520 Adapter",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp4s0f1",
-      "network_address": "grisou-33-eth3.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet5/33",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth4",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "1.67, 0x80000fab, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.73.233",
-      "ip6": "2001:660:4406:500:9:4:0:21",
-      "kavlan": true,
-      "mac": "24:6e:96:03:09:b4",
-      "management": false,
-      "model": "I350 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno3",
-      "network_address": "grisou-33-eth4.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "sriov": false,
-      "sriov_totalvfs": 0,
-      "switch": "sgrisou1",
-      "switch_port": "GigabitEthernet 1/33",
-      "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:09:b5",
-      "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.33",
-      "kavlan": false,
-      "mac": "64:00:6a:c0:e3:e6",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "grisou-33-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": 2,
-      "uid": "grimoire-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": "0x46",
-    "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.2022012700",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4ff507",
-      "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-0x5000c5008e513b77",
-      "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-33"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
deleted file mode 100644
index 17c2ef818b54675798442de61a654bb0a9f4936f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
+++ /dev/null
@@ -1,493 +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": "2M72J82"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.200.44",
-      "kavlan-11": "10.7.209.44",
-      "kavlan-12": "10.11.209.44",
-      "kavlan-13": "10.15.209.44",
-      "kavlan-14": "10.19.209.44",
-      "kavlan-16": "10.27.209.44",
-      "kavlan-18": "10.35.209.44",
-      "kavlan-2": "192.168.216.44",
-      "kavlan-20": "10.43.209.44",
-      "kavlan-21": "10.47.209.44",
-      "kavlan-3": "192.168.232.44",
-      "kavlan-4": "10.16.8.44",
-      "kavlan-5": "10.16.72.44",
-      "kavlan-6": "10.16.136.44",
-      "kavlan-7": "10.16.200.44",
-      "kavlan-8": "10.17.8.44",
-      "kavlan-9": "10.17.72.44"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.200.144",
-      "kavlan-11": "10.7.209.144",
-      "kavlan-12": "10.11.209.144",
-      "kavlan-13": "10.15.209.144",
-      "kavlan-14": "10.19.209.144",
-      "kavlan-16": "10.27.209.144",
-      "kavlan-18": "10.35.209.144",
-      "kavlan-2": "192.168.216.144",
-      "kavlan-20": "10.43.209.144",
-      "kavlan-21": "10.47.209.144",
-      "kavlan-3": "192.168.232.144",
-      "kavlan-4": "10.16.8.144",
-      "kavlan-5": "10.16.72.144",
-      "kavlan-6": "10.16.136.144",
-      "kavlan-7": "10.16.200.144",
-      "kavlan-8": "10.17.8.144",
-      "kavlan-9": "10.17.72.144"
-    },
-    "eth2": {
-      "kavlan-1": "192.168.200.244",
-      "kavlan-11": "10.7.209.244",
-      "kavlan-12": "10.11.209.244",
-      "kavlan-13": "10.15.209.244",
-      "kavlan-14": "10.19.209.244",
-      "kavlan-16": "10.27.209.244",
-      "kavlan-18": "10.35.209.244",
-      "kavlan-2": "192.168.216.244",
-      "kavlan-20": "10.43.209.244",
-      "kavlan-21": "10.47.209.244",
-      "kavlan-3": "192.168.232.244",
-      "kavlan-4": "10.16.8.244",
-      "kavlan-5": "10.16.72.244",
-      "kavlan-6": "10.16.136.244",
-      "kavlan-7": "10.16.200.244",
-      "kavlan-8": "10.17.8.244",
-      "kavlan-9": "10.17.72.244"
-    },
-    "eth3": {
-      "kavlan-1": "192.168.201.44",
-      "kavlan-11": "10.7.210.44",
-      "kavlan-12": "10.11.210.44",
-      "kavlan-13": "10.15.210.44",
-      "kavlan-14": "10.19.210.44",
-      "kavlan-16": "10.27.210.44",
-      "kavlan-18": "10.35.210.44",
-      "kavlan-2": "192.168.217.44",
-      "kavlan-20": "10.43.210.44",
-      "kavlan-21": "10.47.210.44",
-      "kavlan-3": "192.168.233.44",
-      "kavlan-4": "10.16.9.44",
-      "kavlan-5": "10.16.73.44",
-      "kavlan-6": "10.16.137.44",
-      "kavlan-7": "10.16.201.44",
-      "kavlan-8": "10.17.9.44",
-      "kavlan-9": "10.17.73.44"
-    },
-    "eth4": {
-      "kavlan-1": "192.168.201.144",
-      "kavlan-11": "10.7.210.144",
-      "kavlan-12": "10.11.210.144",
-      "kavlan-13": "10.15.210.144",
-      "kavlan-14": "10.19.210.144",
-      "kavlan-16": "10.27.210.144",
-      "kavlan-18": "10.35.210.144",
-      "kavlan-2": "192.168.217.144",
-      "kavlan-20": "10.43.210.144",
-      "kavlan-21": "10.47.210.144",
-      "kavlan-3": "192.168.233.144",
-      "kavlan-4": "10.16.9.144",
-      "kavlan-5": "10.16.73.144",
-      "kavlan-6": "10.16.137.144",
-      "kavlan-7": "10.16.201.144",
-      "kavlan-8": "10.17.9.144",
-      "kavlan-9": "10.17.73.144"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:580:9::2c",
-      "kavlan-11": "2001:660:4406:1a0:509::2c",
-      "kavlan-12": "2001:660:4406:2a0:509::2c",
-      "kavlan-13": "2001:660:4406:4a0:509::2c",
-      "kavlan-14": "2001:660:4406:5a0:509::2c",
-      "kavlan-16": "2001:660:4406:7a0:509::2c",
-      "kavlan-18": "2001:660:4406:8a0:509::2c",
-      "kavlan-2": "2001:660:4406:581:9::2c",
-      "kavlan-20": "2001:660:4406:3a0:509::2c",
-      "kavlan-21": "2001:660:4406:6a0:509::2c",
-      "kavlan-3": "2001:660:4406:582:9::2c",
-      "kavlan-4": "2001:660:4406:590:9::2c",
-      "kavlan-5": "2001:660:4406:591:9::2c",
-      "kavlan-6": "2001:660:4406:592:9::2c",
-      "kavlan-7": "2001:660:4406:593:9::2c",
-      "kavlan-8": "2001:660:4406:594:9::2c",
-      "kavlan-9": "2001:660:4406:595:9::2c"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:580:9:1:0:2c",
-      "kavlan-11": "2001:660:4406:1a0:509:1:0:2c",
-      "kavlan-12": "2001:660:4406:2a0:509:1:0:2c",
-      "kavlan-13": "2001:660:4406:4a0:509:1:0:2c",
-      "kavlan-14": "2001:660:4406:5a0:509:1:0:2c",
-      "kavlan-16": "2001:660:4406:7a0:509:1:0:2c",
-      "kavlan-18": "2001:660:4406:8a0:509:1:0:2c",
-      "kavlan-2": "2001:660:4406:581:9:1:0:2c",
-      "kavlan-20": "2001:660:4406:3a0:509:1:0:2c",
-      "kavlan-21": "2001:660:4406:6a0:509:1:0:2c",
-      "kavlan-3": "2001:660:4406:582:9:1:0:2c",
-      "kavlan-4": "2001:660:4406:590:9:1:0:2c",
-      "kavlan-5": "2001:660:4406:591:9:1:0:2c",
-      "kavlan-6": "2001:660:4406:592:9:1:0:2c",
-      "kavlan-7": "2001:660:4406:593:9:1:0:2c",
-      "kavlan-8": "2001:660:4406:594:9:1:0:2c",
-      "kavlan-9": "2001:660:4406:595:9:1:0:2c"
-    },
-    "eth2": {
-      "kavlan-1": "2001:660:4406:580:9:2:0:2c",
-      "kavlan-11": "2001:660:4406:1a0:509:2:0:2c",
-      "kavlan-12": "2001:660:4406:2a0:509:2:0:2c",
-      "kavlan-13": "2001:660:4406:4a0:509:2:0:2c",
-      "kavlan-14": "2001:660:4406:5a0:509:2:0:2c",
-      "kavlan-16": "2001:660:4406:7a0:509:2:0:2c",
-      "kavlan-18": "2001:660:4406:8a0:509:2:0:2c",
-      "kavlan-2": "2001:660:4406:581:9:2:0:2c",
-      "kavlan-20": "2001:660:4406:3a0:509:2:0:2c",
-      "kavlan-21": "2001:660:4406:6a0:509:2:0:2c",
-      "kavlan-3": "2001:660:4406:582:9:2:0:2c",
-      "kavlan-4": "2001:660:4406:590:9:2:0:2c",
-      "kavlan-5": "2001:660:4406:591:9:2:0:2c",
-      "kavlan-6": "2001:660:4406:592:9:2:0:2c",
-      "kavlan-7": "2001:660:4406:593:9:2:0:2c",
-      "kavlan-8": "2001:660:4406:594:9:2:0:2c",
-      "kavlan-9": "2001:660:4406:595:9:2:0:2c"
-    },
-    "eth3": {
-      "kavlan-1": "2001:660:4406:580:9:3:0:2c",
-      "kavlan-11": "2001:660:4406:1a0:509:3:0:2c",
-      "kavlan-12": "2001:660:4406:2a0:509:3:0:2c",
-      "kavlan-13": "2001:660:4406:4a0:509:3:0:2c",
-      "kavlan-14": "2001:660:4406:5a0:509:3:0:2c",
-      "kavlan-16": "2001:660:4406:7a0:509:3:0:2c",
-      "kavlan-18": "2001:660:4406:8a0:509:3:0:2c",
-      "kavlan-2": "2001:660:4406:581:9:3:0:2c",
-      "kavlan-20": "2001:660:4406:3a0:509:3:0:2c",
-      "kavlan-21": "2001:660:4406:6a0:509:3:0:2c",
-      "kavlan-3": "2001:660:4406:582:9:3:0:2c",
-      "kavlan-4": "2001:660:4406:590:9:3:0:2c",
-      "kavlan-5": "2001:660:4406:591:9:3:0:2c",
-      "kavlan-6": "2001:660:4406:592:9:3:0:2c",
-      "kavlan-7": "2001:660:4406:593:9:3:0:2c",
-      "kavlan-8": "2001:660:4406:594:9:3:0:2c",
-      "kavlan-9": "2001:660:4406:595:9:3:0:2c"
-    },
-    "eth4": {
-      "kavlan-1": "2001:660:4406:580:9:4:0:2c",
-      "kavlan-11": "2001:660:4406:1a0:509:4:0:2c",
-      "kavlan-12": "2001:660:4406:2a0:509:4:0:2c",
-      "kavlan-13": "2001:660:4406:4a0:509:4:0:2c",
-      "kavlan-14": "2001:660:4406:5a0:509:4:0:2c",
-      "kavlan-16": "2001:660:4406:7a0:509:4:0:2c",
-      "kavlan-18": "2001:660:4406:8a0:509:4:0:2c",
-      "kavlan-2": "2001:660:4406:581:9:4:0:2c",
-      "kavlan-20": "2001:660:4406:3a0:509:4:0:2c",
-      "kavlan-21": "2001:660:4406:6a0:509:4:0:2c",
-      "kavlan-3": "2001:660:4406:582:9:4:0:2c",
-      "kavlan-4": "2001:660:4406:590:9:4:0:2c",
-      "kavlan-5": "2001:660:4406:591:9:4:0:2c",
-      "kavlan-6": "2001:660:4406:592:9:4:0:2c",
-      "kavlan-7": "2001:660:4406:593:9:4:0:2c",
-      "kavlan-8": "2001:660:4406:594:9:4:0:2c",
-      "kavlan-9": "2001:660:4406:595:9:4:0:2c"
-    }
-  },
-  "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.44",
-      "ip6": "2001:660:4406:500:9::2c",
-      "kavlan": true,
-      "mac": "24:6e:96:03:0c:10",
-      "management": false,
-      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "grisou-44.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet1/30",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095c, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.72.144",
-      "ip6": "2001:660:4406:500:9:1:0:2c",
-      "kavlan": true,
-      "mac": "24:6e:96:03:0c:12",
-      "management": false,
-      "model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "grisou-44-eth1.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet6/10",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095d, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.72.244",
-      "ip6": "2001:660:4406:500:9:2:0:2c",
-      "kavlan": true,
-      "mac": "a0:36:9f:7e:4e:d8",
-      "management": false,
-      "model": "Ethernet 10G 2P X520 Adapter",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp4s0f0",
-      "network_address": "grisou-44-eth2.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet6/11",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095d, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.73.144",
-      "ip6": "2001:660:4406:500:9:3:0:2c",
-      "kavlan": true,
-      "mac": "a0:36:9f:7e:4e:da",
-      "management": false,
-      "model": "Ethernet 10G 2P X520 Adapter",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp4s0f1",
-      "network_address": "grisou-44-eth3.nancy.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "gw",
-      "switch_port": "Ethernet6/12",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth4",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "1.67, 0x80000fab, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.73.244",
-      "ip6": "2001:660:4406:500:9:4:0:2c",
-      "kavlan": true,
-      "mac": "24:6e:96:03:0c:14",
-      "management": false,
-      "model": "I350 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno3",
-      "network_address": "grisou-44-eth4.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "sriov": false,
-      "sriov_totalvfs": 0,
-      "switch": "sgrisou1",
-      "switch_port": "GigabitEthernet 1/44",
-      "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:0c:15",
-      "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.44",
-      "kavlan": false,
-      "mac": "64:00:6a:c0:dd:ce",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "grisou-44-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": 7,
-      "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": "0x46",
-    "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.2022012700",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5008e51423b",
-      "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-0x5000c5008e51113f",
-      "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-44"
-}
\ 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 f6163d752503f193a197c8025c3905af6e3accfe..e5ec86a10a8cb8dc9075712a1016287b1a54cac1 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw.json
@@ -215,10 +215,6 @@
           "uid": "grisou-43"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet1/30",
-          "uid": "grisou-44"
         },
         {
           "kind": "node",
@@ -504,10 +500,6 @@
           "uid": "grisou-32"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet2/33",
-          "uid": "grisou-33"
         },
         {
           "kind": "node",
@@ -814,10 +806,6 @@
           "uid": "grisou-32"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "Ethernet3/33",
-          "uid": "grisou-33"
         },
         {
           "kind": "node",
@@ -1114,10 +1102,6 @@
           "uid": "grisou-32"
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet4/33",
-          "uid": "grisou-33"
         },
         {
           "kind": "node",
@@ -1414,10 +1398,6 @@
           "uid": "grisou-32"
         },
         {
-          "kind": "node",
-          "port": "eth3",
-          "snmp_name": "Ethernet5/33",
-          "uid": "grisou-33"
         },
         {
           "kind": "node",
@@ -1592,22 +1572,10 @@
           "uid": "grisou-43"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "Ethernet6/10",
-          "uid": "grisou-44"
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet6/11",
-          "uid": "grisou-44"
         },
         {
-          "kind": "node",
-          "port": "eth3",
-          "snmp_name": "Ethernet6/12",
-          "uid": "grisou-44"
         },
         {
           "kind": "node",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrisou1.json b/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
index f4b22f25661d4820028e4c4f54d827a89db5fba0..d1fb7ef98126f35e4d6d338f4647d98ce9d01882 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
@@ -204,10 +204,6 @@
           "uid": "grisou-32"
         },
         {
-          "kind": "node",
-          "port": "eth4",
-          "snmp_name": "GigabitEthernet 1/33",
-          "uid": "grisou-33"
         },
         {
           "kind": "node",
@@ -270,10 +266,6 @@
           "uid": "grisou-43"
         },
         {
-          "kind": "node",
-          "port": "eth4",
-          "snmp_name": "GigabitEthernet 1/44",
-          "uid": "grisou-44"
         },
         {
           "kind": "node",
diff --git a/data/grid5000/sites/nancy/pdus/grimoire-pdu1.json b/data/grid5000/sites/nancy/pdus/grimoire-pdu1.json
index 95566ccd589be431d9fd6e544bf689da1fb94ed4..be24bb4bf937b511755306b90f54c804c7d3f075 100644
--- a/data/grid5000/sites/nancy/pdus/grimoire-pdu1.json
+++ b/data/grid5000/sites/nancy/pdus/grimoire-pdu1.json
@@ -26,7 +26,6 @@
     "4": "grisou-39",
     "5": "grisou-40",
     "6": "grisou-43",
-    "7": "grisou-44",
     "9": "graphique-5"
   },
   "type": "pdu",
diff --git a/data/grid5000/sites/nancy/pdus/grimoire-pdu2.json b/data/grid5000/sites/nancy/pdus/grimoire-pdu2.json
index 1cda0b2fd74fae85bca3ed6a3d6f4ff61061aee8..022d94e626eb98db72f7858c74b0b102e366a2f9 100644
--- a/data/grid5000/sites/nancy/pdus/grimoire-pdu2.json
+++ b/data/grid5000/sites/nancy/pdus/grimoire-pdu2.json
@@ -19,7 +19,6 @@
     "17": "grimoire-1",
     "18": "grimoire-3",
     "19": "grimoire-5",
-    "2": "grisou-33",
     "20": "grimoire-8",
     "21": "grisou-46",
     "22": "grisou-48",
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
index 9faf6c1f60a013caf2310ed84c3ca437f008dc47..637b1eb41e4707902d5ee88315f10dc39bdfd735 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
@@ -8,8 +8,11 @@ boot_type: bios
 queues:
   - admin
   - default
-
 nodes:
+  grisou-33:
+    status: retired
+  grisou-44:
+    status: retired
   # Global node properties
   grisou-[1-51]:
     processor:
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou_pdu.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou_pdu.yaml
index 7da41bb65bd39a4a8e321eeaaf8093bd54ae3598..1c554f4eddb0d9bc9af83d3b639dd68978b8b57b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou_pdu.yaml
@@ -128,10 +128,6 @@ nodes:
     pdu:
       - uid: grimoire-pdu2
         port: 1
-  grisou-33:
-    pdu:
-      - uid: grimoire-pdu2
-        port: 2
   grisou-34:
     pdu:
       - uid: grimoire-pdu2
@@ -172,10 +168,6 @@ nodes:
     pdu:
       - uid: grimoire-pdu1
         port: 6
-  grisou-44:
-    pdu:
-      - uid: grimoire-pdu1
-        port: 7
   grisou-45:
     pdu:
       - uid: grimoire-pdu2
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
deleted file mode 100644
index 0c39661ba0026aa6b9ee45228586436336efb88f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-grisou-33:
-  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: 2RR1J82
-  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.33
-      mac: 64:00:6a:c0:e3:e6
-      management: true
-    eth0:
-      driver: ixgbe
-      firmware_version: 0x8000095c, 19.5.12
-      interface: Ethernet
-      ip: 172.16.72.33
-      mac: 24:6e:96:03:09:b0
-      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:09:b2
-      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:e4
-      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:4c:e6
-      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:09:b4
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno3
-      rate: 1000000000
-      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:09:b5
-      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: '0x46'
-    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-0x5000c5008e4ff507"
-      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-0x5000c5008e513b77"
-      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-44.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
deleted file mode 100644
index f1187f0764b5c38a8cd85001a798f920b2463999..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-grisou-44:
-  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: 2M72J82
-  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.44
-      mac: 64:00:6a:c0:dd:ce
-      management: true
-    eth0:
-      driver: ixgbe
-      firmware_version: 0x8000095c, 19.5.12
-      interface: Ethernet
-      ip: 172.16.72.44
-      mac: 24:6e:96:03:0c:10
-      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:0c:12
-      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:4e:d8
-      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:4e:da
-      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:0c:14
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno3
-      rate: 1000000000
-      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:0c:15
-      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: '0x46'
-    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-0x5000c5008e51423b"
-      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-0x5000c5008e51113f"
-      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 e700362fb668699f074d6bb8cfdbcdc7b3b1ba5d..71f0f79b62ae137faed085b3b746a28e555d7a2e 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -185,8 +185,6 @@ gw:
           uid: grisou-42
         29:
           uid: grisou-43
-        30:
-          uid: grisou-44
         31:
           uid: grisou-45
         32:
@@ -288,8 +286,6 @@ gw:
           uid: grisou-31
         32:
           uid: grisou-32
-        33:
-          uid: grisou-33
         34:
           uid: grisou-34
         35:
@@ -398,8 +394,6 @@ gw:
           uid: grisou-31-eth1
         32:
           uid: grisou-32-eth1
-        33:
-          uid: grisou-33-eth1
         34:
           uid: grisou-34-eth1
         35:
@@ -502,8 +496,6 @@ gw:
           uid: grisou-31-eth2
         32:
           uid: grisou-32-eth2
-        33:
-          uid: grisou-33-eth2
         34:
           uid: grisou-34-eth2
         35:
@@ -606,8 +598,6 @@ gw:
           uid: grisou-31-eth3
         32:
           uid: grisou-32-eth3
-        33:
-          uid: grisou-33-eth3
         34:
           uid: grisou-34-eth3
         35:
@@ -673,12 +663,6 @@ gw:
           uid: grisou-43-eth2
         9:
           uid: grisou-43-eth3
-        10:
-          uid: grisou-44-eth1
-        11:
-          uid: grisou-44-eth2
-        12:
-          uid: grisou-44-eth3
         13:
           uid: grisou-45-eth1
         14:
diff --git a/input/grid5000/sites/nancy/networks/sgrisou1.yaml b/input/grid5000/sites/nancy/networks/sgrisou1.yaml
index fcbf71b70018628352a2d06ceec8297366f749ba..6e2f90e2b556087211921e5c688636a5b4dfe3ea 100644
--- a/input/grid5000/sites/nancy/networks/sgrisou1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrisou1.yaml
@@ -130,8 +130,6 @@ sgrisou1:
           uid: grisou-31-eth4
         32:
           uid: grisou-32-eth4
-        33:
-          uid: grisou-33-eth4
         34:
           uid: grisou-34-eth4
         35:
@@ -152,8 +150,6 @@ sgrisou1:
           uid: grisou-42-eth4
         43:
           uid: grisou-43-eth4
-        44:
-          uid: grisou-44-eth4
         45:
           uid: grisou-45-eth4
         46: