diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
deleted file mode 100644
index f1fd825f196aa750ee471b82c1f233214c4d0ff2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
+++ /dev/null
@@ -1,248 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "08/04/2009",
-    "vendor": "American Megatrends Inc.",
-    "version": 1.14
-  },
-  "bmc_version": "3.00",
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "SUN FIRE X2270",
-    "serial": "0935XEF055"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.11",
-      "kavlan-11": "10.7.227.11",
-      "kavlan-12": "10.11.227.11",
-      "kavlan-13": "10.15.227.11",
-      "kavlan-14": "10.19.227.11",
-      "kavlan-16": "10.27.227.11",
-      "kavlan-18": "10.35.227.11",
-      "kavlan-2": "192.168.208.11",
-      "kavlan-20": "10.43.227.11",
-      "kavlan-21": "10.47.227.11",
-      "kavlan-3": "192.168.224.11",
-      "kavlan-4": "10.24.0.11",
-      "kavlan-5": "10.24.64.11",
-      "kavlan-6": "10.24.128.11",
-      "kavlan-7": "10.24.192.11",
-      "kavlan-8": "10.25.0.11",
-      "kavlan-9": "10.25.64.11"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:781:3::b",
-      "kavlan-11": "2001:660:4406:78b:3::b",
-      "kavlan-12": "2001:660:4406:78c:3::b",
-      "kavlan-13": "2001:660:4406:78d:3::b",
-      "kavlan-14": "2001:660:4406:78e:3::b",
-      "kavlan-16": "2001:660:4406:790:3::b",
-      "kavlan-18": "2001:660:4406:792:3::b",
-      "kavlan-2": "2001:660:4406:782:3::b",
-      "kavlan-20": "2001:660:4406:794:3::b",
-      "kavlan-21": "2001:660:4406:795:3::b",
-      "kavlan-3": "2001:660:4406:783:3::b",
-      "kavlan-4": "2001:660:4406:784:3::b",
-      "kavlan-5": "2001:660:4406:785:3::b",
-      "kavlan-6": "2001:660:4406:786:3::b",
-      "kavlan-7": "2001:660:4406:787:3::b",
-      "kavlan-8": "2001:660:4406:788:3::b",
-      "kavlan-9": "2001:660:4406:789:3::b"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.1.5",
-      "interface": "Ethernet",
-      "ip": "172.16.98.11",
-      "ip6": "2001:660:4406:700:3::b",
-      "kavlan": true,
-      "mac": "00:14:4f:ca:9a:e0",
-      "management": false,
-      "model": "82575EB Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp4s0f0",
-      "network_address": "parapide-11.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "GigabitEthernet3/11",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.1.5",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:14:4f:ca:9a:e1",
-      "management": false,
-      "model": "82575EB Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.6.0",
-      "guid": "0x0003ba0001009475",
-      "interface": "InfiniBand",
-      "ip": "172.18.98.11",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:75",
-      "management": false,
-      "model": "MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.240.0",
-      "network_address": "parapide-11-ib0.rennes.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.6.0",
-      "guid": "0x0003ba0001009476",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:76",
-      "management": false,
-      "model": "MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.98.11",
-      "kavlan": false,
-      "mac": "00:14:4f:ca:9a:e2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "parapide-11-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 11800000000,
-    "node_flops": 94400000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2950000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz",
-    "vendor": "Intel",
-    "version": "X5570"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "per_outlets": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 1,
-            "uid": "parapluie-pdu-3"
-          }
-        ]
-      }
-    },
-    "temperature": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "ambient_temp"
-        },
-        "ipmi": {
-          "sensors": {
-            "ambient": "/MB/T_AMB"
-          }
-        }
-      }
-    }
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2020090200",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca214cbef5c",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "firmware_version": "GK6OAC5A",
-      "interface": "SATA",
-      "model": "HITACHI HUA7250S",
-      "size": 500107862016,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "parapide-11"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
deleted file mode 100644
index ea8bdabf0b6b7330d82737f906a168d6f97892a0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
+++ /dev/null
@@ -1,248 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "08/04/2009",
-    "vendor": "American Megatrends Inc.",
-    "version": 1.14
-  },
-  "bmc_version": "3.00",
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "SUN FIRE X2270",
-    "serial": "0935XEF053"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.20",
-      "kavlan-11": "10.7.227.20",
-      "kavlan-12": "10.11.227.20",
-      "kavlan-13": "10.15.227.20",
-      "kavlan-14": "10.19.227.20",
-      "kavlan-16": "10.27.227.20",
-      "kavlan-18": "10.35.227.20",
-      "kavlan-2": "192.168.208.20",
-      "kavlan-20": "10.43.227.20",
-      "kavlan-21": "10.47.227.20",
-      "kavlan-3": "192.168.224.20",
-      "kavlan-4": "10.24.0.20",
-      "kavlan-5": "10.24.64.20",
-      "kavlan-6": "10.24.128.20",
-      "kavlan-7": "10.24.192.20",
-      "kavlan-8": "10.25.0.20",
-      "kavlan-9": "10.25.64.20"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:781:3::14",
-      "kavlan-11": "2001:660:4406:78b:3::14",
-      "kavlan-12": "2001:660:4406:78c:3::14",
-      "kavlan-13": "2001:660:4406:78d:3::14",
-      "kavlan-14": "2001:660:4406:78e:3::14",
-      "kavlan-16": "2001:660:4406:790:3::14",
-      "kavlan-18": "2001:660:4406:792:3::14",
-      "kavlan-2": "2001:660:4406:782:3::14",
-      "kavlan-20": "2001:660:4406:794:3::14",
-      "kavlan-21": "2001:660:4406:795:3::14",
-      "kavlan-3": "2001:660:4406:783:3::14",
-      "kavlan-4": "2001:660:4406:784:3::14",
-      "kavlan-5": "2001:660:4406:785:3::14",
-      "kavlan-6": "2001:660:4406:786:3::14",
-      "kavlan-7": "2001:660:4406:787:3::14",
-      "kavlan-8": "2001:660:4406:788:3::14",
-      "kavlan-9": "2001:660:4406:789:3::14"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.1.5",
-      "interface": "Ethernet",
-      "ip": "172.16.98.20",
-      "ip6": "2001:660:4406:700:3::14",
-      "kavlan": true,
-      "mac": "00:14:4f:ca:92:2c",
-      "management": false,
-      "model": "82575EB Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp4s0f0",
-      "network_address": "parapide-20.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "GigabitEthernet3/18",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.1.5",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:14:4f:ca:92:2d",
-      "management": false,
-      "model": "82575EB Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.6.0",
-      "guid": "0x0003ba0001009fe5",
-      "interface": "InfiniBand",
-      "ip": "172.18.98.20",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e5",
-      "management": false,
-      "model": "MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.240.0",
-      "network_address": "parapide-20-ib0.rennes.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.6.0",
-      "guid": "0x0003ba0001009fe6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e6",
-      "management": false,
-      "model": "MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.98.20",
-      "kavlan": false,
-      "mac": "00:14:4f:ca:92:2e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "parapide-20-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 11800000000,
-    "node_flops": 94400000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2950000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz",
-    "vendor": "Intel",
-    "version": "X5570"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "per_outlets": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 5,
-            "uid": "parapluie-pdu-4"
-          }
-        ]
-      }
-    },
-    "temperature": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "ambient_temp"
-        },
-        "ipmi": {
-          "sensors": {
-            "ambient": "/MB/T_AMB"
-          }
-        }
-      }
-    }
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2020090200",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca214c8a4ac",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "firmware_version": "GK6OAC4A",
-      "interface": "SATA",
-      "model": "HITACHI HUA7250S",
-      "size": 500107862016,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "parapide-20"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
deleted file mode 100644
index 19eec5296f5552663c5125b7da842544c8cf98b2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
+++ /dev/null
@@ -1,248 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "08/04/2009",
-    "vendor": "American Megatrends Inc.",
-    "version": 1.14
-  },
-  "bmc_version": "3.00",
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "SUN FIRE X2270",
-    "serial": "0935XEF047"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.4",
-      "kavlan-11": "10.7.227.4",
-      "kavlan-12": "10.11.227.4",
-      "kavlan-13": "10.15.227.4",
-      "kavlan-14": "10.19.227.4",
-      "kavlan-16": "10.27.227.4",
-      "kavlan-18": "10.35.227.4",
-      "kavlan-2": "192.168.208.4",
-      "kavlan-20": "10.43.227.4",
-      "kavlan-21": "10.47.227.4",
-      "kavlan-3": "192.168.224.4",
-      "kavlan-4": "10.24.0.4",
-      "kavlan-5": "10.24.64.4",
-      "kavlan-6": "10.24.128.4",
-      "kavlan-7": "10.24.192.4",
-      "kavlan-8": "10.25.0.4",
-      "kavlan-9": "10.25.64.4"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:781:3::4",
-      "kavlan-11": "2001:660:4406:78b:3::4",
-      "kavlan-12": "2001:660:4406:78c:3::4",
-      "kavlan-13": "2001:660:4406:78d:3::4",
-      "kavlan-14": "2001:660:4406:78e:3::4",
-      "kavlan-16": "2001:660:4406:790:3::4",
-      "kavlan-18": "2001:660:4406:792:3::4",
-      "kavlan-2": "2001:660:4406:782:3::4",
-      "kavlan-20": "2001:660:4406:794:3::4",
-      "kavlan-21": "2001:660:4406:795:3::4",
-      "kavlan-3": "2001:660:4406:783:3::4",
-      "kavlan-4": "2001:660:4406:784:3::4",
-      "kavlan-5": "2001:660:4406:785:3::4",
-      "kavlan-6": "2001:660:4406:786:3::4",
-      "kavlan-7": "2001:660:4406:787:3::4",
-      "kavlan-8": "2001:660:4406:788:3::4",
-      "kavlan-9": "2001:660:4406:789:3::4"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.1.5",
-      "interface": "Ethernet",
-      "ip": "172.16.98.4",
-      "ip6": "2001:660:4406:700:3::4",
-      "kavlan": true,
-      "mac": "00:14:4f:ca:97:78",
-      "management": false,
-      "model": "82575EB Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp4s0f0",
-      "network_address": "parapide-4.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "GigabitEthernet3/4",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.1.5",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:14:4f:ca:97:79",
-      "management": false,
-      "model": "82575EB Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.6.0",
-      "guid": "0x0003ba00010069b5",
-      "interface": "InfiniBand",
-      "ip": "172.18.98.4",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:03:ba:00:01:00:69:b5",
-      "management": false,
-      "model": "MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.240.0",
-      "network_address": "parapide-4-ib0.rennes.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.6.0",
-      "guid": "0x0003ba00010069b6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:03:ba:00:01:00:69:b6",
-      "management": false,
-      "model": "MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.98.4",
-      "kavlan": false,
-      "mac": "00:14:4f:ca:97:7a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "parapide-4-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 11800000000,
-    "node_flops": 94400000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2950000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz",
-    "vendor": "Intel",
-    "version": "X5570"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "per_outlets": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 23,
-            "uid": "parapluie-pdu-3"
-          }
-        ]
-      }
-    },
-    "temperature": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "ambient_temp"
-        },
-        "ipmi": {
-          "sensors": {
-            "ambient": "/MB/T_AMB"
-          }
-        }
-      }
-    }
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2020090200",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca214cb6ad4",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "firmware_version": "GK6OAC5A",
-      "interface": "SATA",
-      "model": "HITACHI HUA7250S",
-      "size": 500107862016,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "parapide-4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
deleted file mode 100644
index 5c3407fc2ed59839c870e6ecb847ed8a5c8f4bda..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
+++ /dev/null
@@ -1,281 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
-    "nb_cores": 24,
-    "nb_procs": 2,
-    "nb_threads": 24,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "bmc_version": "4.21",
-  "chassis": {
-    "manufacturer": "HP",
-    "name": "ProLiant DL165 G7",
-    "serial": "GB803651MP"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.193.13",
-      "kavlan-11": "10.7.228.13",
-      "kavlan-12": "10.11.228.13",
-      "kavlan-13": "10.15.228.13",
-      "kavlan-14": "10.19.228.13",
-      "kavlan-16": "10.27.228.13",
-      "kavlan-18": "10.35.228.13",
-      "kavlan-2": "192.168.209.13",
-      "kavlan-20": "10.43.228.13",
-      "kavlan-21": "10.47.228.13",
-      "kavlan-3": "192.168.225.13",
-      "kavlan-4": "10.24.1.13",
-      "kavlan-5": "10.24.65.13",
-      "kavlan-6": "10.24.129.13",
-      "kavlan-7": "10.24.193.13",
-      "kavlan-8": "10.25.1.13",
-      "kavlan-9": "10.25.65.13"
-    }
-  },
-  "kavlan6": {
-    "eth1": {
-      "kavlan-1": "2001:660:4406:781:4::d",
-      "kavlan-11": "2001:660:4406:78b:4::d",
-      "kavlan-12": "2001:660:4406:78c:4::d",
-      "kavlan-13": "2001:660:4406:78d:4::d",
-      "kavlan-14": "2001:660:4406:78e:4::d",
-      "kavlan-16": "2001:660:4406:790:4::d",
-      "kavlan-18": "2001:660:4406:792:4::d",
-      "kavlan-2": "2001:660:4406:782:4::d",
-      "kavlan-20": "2001:660:4406:794:4::d",
-      "kavlan-21": "2001:660:4406:795:4::d",
-      "kavlan-3": "2001:660:4406:783:4::d",
-      "kavlan-4": "2001:660:4406:784:4::d",
-      "kavlan-5": "2001:660:4406:785:4::d",
-      "kavlan-6": "2001:660:4406:786:4::d",
-      "kavlan-7": "2001:660:4406:787:4::d",
-      "kavlan-8": "2001:660:4406:788:4::d",
-      "kavlan-9": "2001:660:4406:789:4::d"
-    }
-  },
-  "main_memory": {
-    "ram_size": 51539607552
-  },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.8.2",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "78:e7:d1:f9:7e:f0",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0f0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "1.8.2",
-      "interface": "Ethernet",
-      "ip": "172.16.99.13",
-      "ip6": "2001:660:4406:700:4::d",
-      "kavlan": true,
-      "mac": "78:e7:d1:f9:7e:f1",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp4s0f1",
-      "network_address": "parapluie-13.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "GigabitEthernet4/7",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.8.2",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "78:e7:d1:f9:7e:f4",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp3s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.8.2",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "78:e7:d1:f9:7e:f5",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp3s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.6.0",
-      "guid": "0x00237dffff94f269",
-      "interface": "InfiniBand",
-      "ip": "172.18.99.13",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:69",
-      "management": false,
-      "model": "MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.240.0",
-      "network_address": "parapluie-13-ib0.rennes.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.6.0",
-      "guid": "0x00237dffff94f26a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:6a",
-      "management": false,
-      "model": "MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.99.13",
-      "kavlan": false,
-      "mac": "78:e7:d1:65:b9:a1",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "parapluie-13-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 6800000000,
-    "node_flops": 163200000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 524288,
-    "cache_l3": 5240832,
-    "clock_speed": 1700000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "K10",
-    "microcode": "0x10000d9",
-    "model": "AMD Opteron",
-    "other_description": "AMD Opteron(tm) Processor 6164 HE",
-    "vendor": "AMD",
-    "version": "6164 HE"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "per_outlets": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 4,
-            "uid": "parapluie-pdu-1"
-          }
-        ]
-      }
-    },
-    "temperature": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "ambient_temp"
-        },
-        "ipmi": {
-          "sensors": {
-            "ambient": "Inlet Ambient"
-          }
-        }
-      }
-    }
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2020090200",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c50026724b25",
-      "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
-      "device": "sda",
-      "firmware_version": "HPG0",
-      "interface": "SATA",
-      "model": "VB0250EAVER",
-      "size": 250059350016,
-      "storage": "HDD",
-      "vendor": "HP"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "parapluie-13"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
deleted file mode 100644
index 30d8f1ff2915f2af9e9c2495b2d5b4380dabdc3d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
+++ /dev/null
@@ -1,281 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "contiguous-including-threads",
-    "nb_cores": 24,
-    "nb_procs": 2,
-    "nb_threads": 24,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "09/06/2010",
-    "vendor": "HP",
-    "version": "O37"
-  },
-  "bmc_version": "4.21",
-  "chassis": {
-    "manufacturer": "HP",
-    "name": "ProLiant DL165 G7",
-    "serial": "GB803651MH"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.193.8",
-      "kavlan-11": "10.7.228.8",
-      "kavlan-12": "10.11.228.8",
-      "kavlan-13": "10.15.228.8",
-      "kavlan-14": "10.19.228.8",
-      "kavlan-16": "10.27.228.8",
-      "kavlan-18": "10.35.228.8",
-      "kavlan-2": "192.168.209.8",
-      "kavlan-20": "10.43.228.8",
-      "kavlan-21": "10.47.228.8",
-      "kavlan-3": "192.168.225.8",
-      "kavlan-4": "10.24.1.8",
-      "kavlan-5": "10.24.65.8",
-      "kavlan-6": "10.24.129.8",
-      "kavlan-7": "10.24.193.8",
-      "kavlan-8": "10.25.1.8",
-      "kavlan-9": "10.25.65.8"
-    }
-  },
-  "kavlan6": {
-    "eth1": {
-      "kavlan-1": "2001:660:4406:781:4::8",
-      "kavlan-11": "2001:660:4406:78b:4::8",
-      "kavlan-12": "2001:660:4406:78c:4::8",
-      "kavlan-13": "2001:660:4406:78d:4::8",
-      "kavlan-14": "2001:660:4406:78e:4::8",
-      "kavlan-16": "2001:660:4406:790:4::8",
-      "kavlan-18": "2001:660:4406:792:4::8",
-      "kavlan-2": "2001:660:4406:782:4::8",
-      "kavlan-20": "2001:660:4406:794:4::8",
-      "kavlan-21": "2001:660:4406:795:4::8",
-      "kavlan-3": "2001:660:4406:783:4::8",
-      "kavlan-4": "2001:660:4406:784:4::8",
-      "kavlan-5": "2001:660:4406:785:4::8",
-      "kavlan-6": "2001:660:4406:786:4::8",
-      "kavlan-7": "2001:660:4406:787:4::8",
-      "kavlan-8": "2001:660:4406:788:4::8",
-      "kavlan-9": "2001:660:4406:789:4::8"
-    }
-  },
-  "main_memory": {
-    "ram_size": 51539607552
-  },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.8.2",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "78:e7:d1:f9:4e:d6",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0f0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "1.8.2",
-      "interface": "Ethernet",
-      "ip": "172.16.99.8",
-      "ip6": "2001:660:4406:700:4::8",
-      "kavlan": true,
-      "mac": "78:e7:d1:f9:4e:d7",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp4s0f1",
-      "network_address": "parapluie-8.rennes.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "c6509",
-      "switch_port": "GigabitEthernet4/3",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.8.2",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "78:e7:d1:f9:4e:fa",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp3s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.8.2",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "78:e7:d1:f9:4e:fb",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp3s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.6.0",
-      "guid": "0x00237dffff94b24d",
-      "interface": "InfiniBand",
-      "ip": "172.18.99.8",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4d",
-      "management": false,
-      "model": "MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.240.0",
-      "network_address": "parapluie-8-ib0.rennes.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.6.0",
-      "guid": "0x00237dffff94b24e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4e",
-      "management": false,
-      "model": "MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.99.8",
-      "kavlan": false,
-      "mac": "78:e7:d1:65:c9:56",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "parapluie-8-bmc.rennes.grid5000.fr",
-      "rate": 1000000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 6800000000,
-    "node_flops": 163200000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 524288,
-    "cache_l3": 5240832,
-    "clock_speed": 1700000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "K10",
-    "microcode": "0x10000d9",
-    "model": "AMD Opteron",
-    "other_description": "AMD Opteron(tm) Processor 6164 HE",
-    "vendor": "AMD",
-    "version": "6164 HE"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "per_outlets": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 22,
-            "uid": "parapluie-pdu-1"
-          }
-        ]
-      }
-    },
-    "temperature": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "ambient_temp"
-        },
-        "ipmi": {
-          "sensors": {
-            "ambient": "Inlet Ambient"
-          }
-        }
-      }
-    }
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2020090200",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5002673a237",
-      "by_path": "/dev/disk/by-path/pci-0000:00:11.0-ata-1",
-      "device": "sda",
-      "firmware_version": "HPG0",
-      "interface": "SATA",
-      "model": "VB0250EAVER",
-      "size": 250059350016,
-      "storage": "HDD",
-      "vendor": "HP"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "parapluie-8"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/pdus/parapluie-pdu-1.json b/data/grid5000/sites/rennes/pdus/parapluie-pdu-1.json
index fa510bb8980e1cf351d0d19e040bb3d08e48eb38..4bee182a9ff416a9576fd28b6594ac266bf6c30c 100644
--- a/data/grid5000/sites/rennes/pdus/parapluie-pdu-1.json
+++ b/data/grid5000/sites/rennes/pdus/parapluie-pdu-1.json
@@ -6,11 +6,9 @@
     "2": "parapluie-19",
     "20": "parapluie-11",
     "21": "parapluie-9",
-    "22": "parapluie-8",
     "23": "parapluie-2",
     "24": "parapluie-1",
     "3": "parapluie-15",
-    "4": "parapluie-13",
     "5": "parapluie-12"
   },
   "sensors": [
diff --git a/data/grid5000/sites/rennes/pdus/parapluie-pdu-3.json b/data/grid5000/sites/rennes/pdus/parapluie-pdu-3.json
index f24c4aad53da1fd4671f33a5c3b30a31af2f027e..157eae89e1d8a6a45cb35bb247f48c49251bd050 100644
--- a/data/grid5000/sites/rennes/pdus/parapluie-pdu-3.json
+++ b/data/grid5000/sites/rennes/pdus/parapluie-pdu-3.json
@@ -2,12 +2,10 @@
   "ip": "172.17.99.203",
   "model": "",
   "ports": {
-    "1": "parapide-11",
     "2": "parapide-7",
     "20": "parapide-6",
     "21": "parapide-5",
     "22": "parapide-2",
-    "23": "parapide-4",
     "24": "parapide-3",
     "3": "parapide-8",
     "4": "parapide-9",
diff --git a/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json b/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json
index 8f8f857bcf373df74677a22967e8b85839247f26..6b3774dd5f7f3907bd7dc558c5d2b991e3327159 100644
--- a/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json
+++ b/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json
@@ -10,8 +10,7 @@
     "23": "parapide-15",
     "24": "parapide-12",
     "3": "parapide-19",
-    "4": "parapide-25",
-    "5": "parapide-20"
+    "4": "parapide-25"
   },
   "sensors": [
     {
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
deleted file mode 100644
index c11d73b190a2a1cfdd736cdffcf74742e7a7a1a2..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-parapide-11:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: '08/04/2009'
-    vendor: American Megatrends Inc.
-    version: 1.14
-  bmc_version: '3.00'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-    serial: '0935XEF055'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.98.11
-      mac: 00:14:4f:ca:9a:e2
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.1.5
-      interface: Ethernet
-      ip: 172.16.98.11
-      mac: 00:14:4f:ca:9a:e0
-      management: false
-      model: 82575EB Gigabit Network Connection
-      name: enp4s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.1.5
-      interface: Ethernet
-      mac: 00:14:4f:ca:9a:e1
-      management: false
-      model: 82575EB Gigabit Network Connection
-      name: enp4s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.6.0
-      guid: '0x0003ba0001009475'
-      interface: InfiniBand
-      ip: 172.18.98.11
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:75
-      management: false
-      model: MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.6.0
-      guid: '0x0003ba0001009476'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:76
-      management: false
-      model: MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0x1d'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    vendor: Intel
-    version: X5570
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca214cbef5c"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: GK6OAC5A
-      model: HITACHI HUA7250S
-      size: 500107862016
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
deleted file mode 100644
index 1803d03420aa45d185a0e9a8810498c37404d995..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-parapide-20:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: '08/04/2009'
-    vendor: American Megatrends Inc.
-    version: 1.14
-  bmc_version: '3.00'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-    serial: '0935XEF053'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.98.20
-      mac: 00:14:4f:ca:92:2e
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.1.5
-      interface: Ethernet
-      ip: 172.16.98.20
-      mac: 00:14:4f:ca:92:2c
-      management: false
-      model: 82575EB Gigabit Network Connection
-      name: enp4s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.1.5
-      interface: Ethernet
-      mac: 00:14:4f:ca:92:2d
-      management: false
-      model: 82575EB Gigabit Network Connection
-      name: enp4s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.6.0
-      guid: '0x0003ba0001009fe5'
-      interface: InfiniBand
-      ip: 172.18.98.20
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e5
-      management: false
-      model: MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.6.0
-      guid: '0x0003ba0001009fe6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e6
-      management: false
-      model: MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0x1d'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    vendor: Intel
-    version: X5570
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca214c8a4ac"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: GK6OAC4A
-      model: HITACHI HUA7250S
-      size: 500107862016
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
deleted file mode 100644
index 34cf790066ca0d1db0ee4be00a4322bb6b6f3902..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-parapide-4:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: '08/04/2009'
-    vendor: American Megatrends Inc.
-    version: 1.14
-  bmc_version: '3.00'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-    serial: '0935XEF047'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.98.4
-      mac: 00:14:4f:ca:97:7a
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.1.5
-      interface: Ethernet
-      ip: 172.16.98.4
-      mac: 00:14:4f:ca:97:78
-      management: false
-      model: 82575EB Gigabit Network Connection
-      name: enp4s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.1.5
-      interface: Ethernet
-      mac: 00:14:4f:ca:97:79
-      management: false
-      model: 82575EB Gigabit Network Connection
-      name: enp4s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.6.0
-      guid: '0x0003ba00010069b5'
-      interface: InfiniBand
-      ip: 172.18.98.4
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:03:ba:00:01:00:69:b5
-      management: false
-      model: MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.6.0
-      guid: '0x0003ba00010069b6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:03:ba:00:01:00:69:b6
-      management: false
-      model: MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0x1d'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    vendor: Intel
-    version: X5570
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca214cb6ad4"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: GK6OAC5A
-      model: HITACHI HUA7250S
-      size: 500107862016
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
index eba2e8af7ce85a2489d980e3ac4a2dc19084d93e..5cb0000b6dcfb14b40f7e1935d3abb30611233e3 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
@@ -67,12 +67,18 @@ nodes:
         mounted: false
         mountable: false
 
+  parapide-4:
+    status: retired
+  parapide-11:
+    status: retired
   parapide-14:
     status: retired
   parapide-15:
     status: retired
   parapide-17:
     status: retired
+  parapide-20:
+    status: retired
   parapide-22:
     status: retired
   parapide-23:
diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide_extra.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide_extra.yaml
index b27846caaac0dd1482c1fc4f31275cfa95bc5bb4..61b5885b7be7b03cc3fb570f6cfe543883b1b24f 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/parapide_extra.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/parapide_extra.yaml
@@ -24,14 +24,6 @@ nodes:
     pdu:
       - uid: parapluie-pdu-3
         port: 24
-  parapide-4:
-    network_adapters:
-      eth0:
-        switch: c6509
-        switch_port: Gi3/4
-    pdu:
-      - uid: parapluie-pdu-3
-        port: 23
   parapide-5:
     network_adapters:
       eth0:
@@ -80,14 +72,6 @@ nodes:
     pdu:
       - uid: parapluie-pdu-3
         port: 5
-  parapide-11:
-    network_adapters:
-      eth0:
-        switch: c6509
-        switch_port: Gi3/11
-    pdu:
-      - uid: parapluie-pdu-3
-        port: 1
   parapide-12:
     network_adapters:
       eth0:
@@ -136,14 +120,6 @@ nodes:
     pdu:
       - uid: parapluie-pdu-4
         port: 3
-  parapide-20:
-    network_adapters:
-      eth0:
-        switch: c6509
-        switch_port: Gi3/18
-    pdu:
-      - uid: parapluie-pdu-4
-        port: 5
   parapide-21:
     network_adapters:
       eth0:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
deleted file mode 100644
index fe2ebc9cbfc30faa770eebd4fa9cb8e52992ccad..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-parapluie-13:
-  architecture:
-    cpu_core_numbering: contiguous-including-threads
-    nb_cores: 24
-    nb_procs: 2
-    nb_threads: 24
-    platform_type: x86_64
-  bios:
-    release_date: '09/06/2010'
-    vendor: HP
-    version: O37
-  bmc_version: '4.21'
-  chassis:
-    manufacturer: HP
-    name: ProLiant DL165 G7
-    serial: GB803651MP
-  main_memory:
-    ram_size: 51539607552
-  network_adapters:
-    bmc:
-      ip: 172.17.99.13
-      mac: 78:e7:d1:65:b9:a1
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 1.8.2
-      interface: Ethernet
-      mac: 78:e7:d1:f9:7e:f0
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp4s0f0
-      rate: 100000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 1.8.2
-      interface: Ethernet
-      ip: 172.16.99.13
-      mac: 78:e7:d1:f9:7e:f1
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp4s0f1
-      rate: 1000000000
-      vendor: Intel
-    eth2:
-      driver: igb
-      firmware_version: 1.8.2
-      interface: Ethernet
-      mac: 78:e7:d1:f9:7e:f4
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp3s0f0
-      vendor: Intel
-    eth3:
-      driver: igb
-      firmware_version: 1.8.2
-      interface: Ethernet
-      mac: 78:e7:d1:f9:7e:f5
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp3s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.6.0
-      guid: '0x00237dffff94f269'
-      interface: InfiniBand
-      ip: 172.18.99.13
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:69
-      management: false
-      model: MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.6.0
-      guid: '0x00237dffff94f26a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:6a
-      management: false
-      model: MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 65536
-    cache_l1i: 65536
-    cache_l2: 524288
-    cache_l3: 5240832
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0x10000d9'
-    model: AMD Opteron
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    vendor: AMD
-    version: 6164 HE
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c50026724b25"
-      by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
-      firmware_version: HPG0
-      model: VB0250EAVER
-      size: 250059350016
-  supported_job_types:
-    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
deleted file mode 100644
index 8ccd99cf0885793fd91b414c6e357c23fd469086..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-parapluie-8:
-  architecture:
-    cpu_core_numbering: contiguous-including-threads
-    nb_cores: 24
-    nb_procs: 2
-    nb_threads: 24
-    platform_type: x86_64
-  bios:
-    release_date: '09/06/2010'
-    vendor: HP
-    version: O37
-  bmc_version: '4.21'
-  chassis:
-    manufacturer: HP
-    name: ProLiant DL165 G7
-    serial: GB803651MH
-  main_memory:
-    ram_size: 51539607552
-  network_adapters:
-    bmc:
-      ip: 172.17.99.8
-      mac: 78:e7:d1:65:c9:56
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 1.8.2
-      interface: Ethernet
-      mac: 78:e7:d1:f9:4e:d6
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp4s0f0
-      rate: 100000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 1.8.2
-      interface: Ethernet
-      ip: 172.16.99.8
-      mac: 78:e7:d1:f9:4e:d7
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp4s0f1
-      rate: 1000000000
-      vendor: Intel
-    eth2:
-      driver: igb
-      firmware_version: 1.8.2
-      interface: Ethernet
-      mac: 78:e7:d1:f9:4e:fa
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp3s0f0
-      vendor: Intel
-    eth3:
-      driver: igb
-      firmware_version: 1.8.2
-      interface: Ethernet
-      mac: 78:e7:d1:f9:4e:fb
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp3s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.6.0
-      guid: '0x00237dffff94b24d'
-      interface: InfiniBand
-      ip: 172.18.99.8
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4d
-      management: false
-      model: MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.6.0
-      guid: '0x00237dffff94b24e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4e
-      management: false
-      model: MT25418 [ConnectX VPI PCIe 2.0 2.5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 65536
-    cache_l1i: 65536
-    cache_l2: 524288
-    cache_l3: 5240832
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0x10000d9'
-    model: AMD Opteron
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    vendor: AMD
-    version: 6164 HE
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5002673a237"
-      by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
-      firmware_version: HPG0
-      model: VB0250EAVER
-      size: 250059350016
-  supported_job_types:
-    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
index f686549905ae814ba69aac67d6051b4961554750..f692a90510b22c7430f8dd45804d5a5645c023b9 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
@@ -79,8 +79,12 @@ nodes:
             sensors:
               ambient: Inlet Ambient
 
+  parapluie-8:
+    status: retired
   parapluie-10:
     status: retired
+  parapluie-13:
+    status: retired
   parapluie-14:
     status: retired
   parapluie-16:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/parapluie_extra.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie_extra.yaml
index e6f14cc143fb0616591561cd34748256ab1ae951..23dd02a83a83db9ef2e34e335abf1d2e14c7d317 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie_extra.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie_extra.yaml
@@ -16,14 +16,6 @@ nodes:
     pdu:
       - uid: parapluie-pdu-1
         port: 23
-  parapluie-8:
-    network_adapters:
-      eth1:
-        switch: c6509
-        switch_port: Gi4/3
-    pdu:
-      - uid: parapluie-pdu-1
-        port: 22
   parapluie-9:
     network_adapters:
       eth1:
@@ -48,14 +40,6 @@ nodes:
     pdu:
       - uid: parapluie-pdu-1
         port: 5
-  parapluie-13:
-    network_adapters:
-      eth1:
-        switch: c6509
-        switch_port: Gi4/7
-    pdu:
-      - uid: parapluie-pdu-1
-        port: 4
   parapluie-15:
     network_adapters:
       eth1: