diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
deleted file mode 100644
index c0aab1af17aa9ad933cdfe37c44730c06d021443..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "..CN137409BN01JJ."
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.1",
-      "kavlan-11": "10.7.233.1",
-      "kavlan-12": "10.11.233.1",
-      "kavlan-13": "10.15.233.1",
-      "kavlan-14": "10.19.233.1",
-      "kavlan-16": "10.27.233.1",
-      "kavlan-18": "10.35.233.1",
-      "kavlan-2": "192.168.208.1",
-      "kavlan-20": "10.43.233.1",
-      "kavlan-21": "10.47.233.1",
-      "kavlan-3": "192.168.224.1",
-      "kavlan-4": "10.32.0.1",
-      "kavlan-5": "10.32.64.1",
-      "kavlan-6": "10.32.128.1",
-      "kavlan-7": "10.32.192.1",
-      "kavlan-8": "10.33.0.1",
-      "kavlan-9": "10.33.64.1"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::1",
-      "kavlan-11": "2001:660:4406:88b:3::1",
-      "kavlan-12": "2001:660:4406:88c:3::1",
-      "kavlan-13": "2001:660:4406:88d:3::1",
-      "kavlan-14": "2001:660:4406:88e:3::1",
-      "kavlan-16": "2001:660:4406:890:3::1",
-      "kavlan-18": "2001:660:4406:892:3::1",
-      "kavlan-2": "2001:660:4406:882:3::1",
-      "kavlan-20": "2001:660:4406:894:3::1",
-      "kavlan-21": "2001:660:4406:895:3::1",
-      "kavlan-3": "2001:660:4406:883:3::1",
-      "kavlan-4": "2001:660:4406:884:3::1",
-      "kavlan-5": "2001:660:4406:885:3::1",
-      "kavlan-6": "2001:660:4406:886:3::1",
-      "kavlan-7": "2001:660:4406:887:3::1",
-      "kavlan-8": "2001:660:4406:888:3::1",
-      "kavlan-9": "2001:660:4406:889:3::1"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.12 bc 5.0.11 NCSI 2.0.5",
-      "interface": "Ethernet",
-      "ip": "172.16.130.1",
-      "ip6": "2001:660:4406:800:3::1",
-      "kavlan": true,
-      "mac": "00:26:b9:58:e6:82",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-1.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/10",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.12 bc 5.0.11 NCSI 2.0.5",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:58:e6:83",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.1",
-      "kavlan": false,
-      "mac": "00:26:b9:58:e6:84",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-1-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903752e5001f07d1950b91b9e1",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
deleted file mode 100644
index 8747be9ae9b6f2caf0a5aecdbcaa02664a2bfa88..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "G4JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.10",
-      "kavlan-11": "10.7.233.10",
-      "kavlan-12": "10.11.233.10",
-      "kavlan-13": "10.15.233.10",
-      "kavlan-14": "10.19.233.10",
-      "kavlan-16": "10.27.233.10",
-      "kavlan-18": "10.35.233.10",
-      "kavlan-2": "192.168.208.10",
-      "kavlan-20": "10.43.233.10",
-      "kavlan-21": "10.47.233.10",
-      "kavlan-3": "192.168.224.10",
-      "kavlan-4": "10.32.0.10",
-      "kavlan-5": "10.32.64.10",
-      "kavlan-6": "10.32.128.10",
-      "kavlan-7": "10.32.192.10",
-      "kavlan-8": "10.33.0.10",
-      "kavlan-9": "10.33.64.10"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::a",
-      "kavlan-11": "2001:660:4406:88b:3::a",
-      "kavlan-12": "2001:660:4406:88c:3::a",
-      "kavlan-13": "2001:660:4406:88d:3::a",
-      "kavlan-14": "2001:660:4406:88e:3::a",
-      "kavlan-16": "2001:660:4406:890:3::a",
-      "kavlan-18": "2001:660:4406:892:3::a",
-      "kavlan-2": "2001:660:4406:882:3::a",
-      "kavlan-20": "2001:660:4406:894:3::a",
-      "kavlan-21": "2001:660:4406:895:3::a",
-      "kavlan-3": "2001:660:4406:883:3::a",
-      "kavlan-4": "2001:660:4406:884:3::a",
-      "kavlan-5": "2001:660:4406:885:3::a",
-      "kavlan-6": "2001:660:4406:886:3::a",
-      "kavlan-7": "2001:660:4406:887:3::a",
-      "kavlan-8": "2001:660:4406:888:3::a",
-      "kavlan-9": "2001:660:4406:889:3::a"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.130.10",
-      "ip6": "2001:660:4406:800:3::a",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:49:65",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-10.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/3",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:49:66",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.10",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:49:67",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-10-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "rev": 1.22,
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-10"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
deleted file mode 100644
index 33899bfb90e08613fc9f18dc276bca4072f69425..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.06",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "H3JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.11",
-      "kavlan-11": "10.7.233.11",
-      "kavlan-12": "10.11.233.11",
-      "kavlan-13": "10.15.233.11",
-      "kavlan-14": "10.19.233.11",
-      "kavlan-16": "10.27.233.11",
-      "kavlan-18": "10.35.233.11",
-      "kavlan-2": "192.168.208.11",
-      "kavlan-20": "10.43.233.11",
-      "kavlan-21": "10.47.233.11",
-      "kavlan-3": "192.168.224.11",
-      "kavlan-4": "10.32.0.11",
-      "kavlan-5": "10.32.64.11",
-      "kavlan-6": "10.32.128.11",
-      "kavlan-7": "10.32.192.11",
-      "kavlan-8": "10.33.0.11",
-      "kavlan-9": "10.33.64.11"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::b",
-      "kavlan-11": "2001:660:4406:88b:3::b",
-      "kavlan-12": "2001:660:4406:88c:3::b",
-      "kavlan-13": "2001:660:4406:88d:3::b",
-      "kavlan-14": "2001:660:4406:88e:3::b",
-      "kavlan-16": "2001:660:4406:890:3::b",
-      "kavlan-18": "2001:660:4406:892:3::b",
-      "kavlan-2": "2001:660:4406:882:3::b",
-      "kavlan-20": "2001:660:4406:894:3::b",
-      "kavlan-21": "2001:660:4406:895:3::b",
-      "kavlan-3": "2001:660:4406:883:3::b",
-      "kavlan-4": "2001:660:4406:884:3::b",
-      "kavlan-5": "2001:660:4406:885:3::b",
-      "kavlan-6": "2001:660:4406:886:3::b",
-      "kavlan-7": "2001:660:4406:887:3::b",
-      "kavlan-8": "2001:660:4406:888:3::b",
-      "kavlan-9": "2001:660:4406:889:3::b"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.11",
-      "ip6": "2001:660:4406:800:3::b",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:47:0c",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-11.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/2",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:47:0d",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.11",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:47:0e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-11-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b9037553e001c8b46ff22e4be68",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-11"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
deleted file mode 100644
index 9c57a92e78d00511d42347648e2b4e646cc8493f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "45JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.12",
-      "kavlan-11": "10.7.233.12",
-      "kavlan-12": "10.11.233.12",
-      "kavlan-13": "10.15.233.12",
-      "kavlan-14": "10.19.233.12",
-      "kavlan-16": "10.27.233.12",
-      "kavlan-18": "10.35.233.12",
-      "kavlan-2": "192.168.208.12",
-      "kavlan-20": "10.43.233.12",
-      "kavlan-21": "10.47.233.12",
-      "kavlan-3": "192.168.224.12",
-      "kavlan-4": "10.32.0.12",
-      "kavlan-5": "10.32.64.12",
-      "kavlan-6": "10.32.128.12",
-      "kavlan-7": "10.32.192.12",
-      "kavlan-8": "10.33.0.12",
-      "kavlan-9": "10.33.64.12"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::c",
-      "kavlan-11": "2001:660:4406:88b:3::c",
-      "kavlan-12": "2001:660:4406:88c:3::c",
-      "kavlan-13": "2001:660:4406:88d:3::c",
-      "kavlan-14": "2001:660:4406:88e:3::c",
-      "kavlan-16": "2001:660:4406:890:3::c",
-      "kavlan-18": "2001:660:4406:892:3::c",
-      "kavlan-2": "2001:660:4406:882:3::c",
-      "kavlan-20": "2001:660:4406:894:3::c",
-      "kavlan-21": "2001:660:4406:895:3::c",
-      "kavlan-3": "2001:660:4406:883:3::c",
-      "kavlan-4": "2001:660:4406:884:3::c",
-      "kavlan-5": "2001:660:4406:885:3::c",
-      "kavlan-6": "2001:660:4406:886:3::c",
-      "kavlan-7": "2001:660:4406:887:3::c",
-      "kavlan-8": "2001:660:4406:888:3::c",
-      "kavlan-9": "2001:660:4406:889:3::c"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.12",
-      "ip6": "2001:660:4406:800:3::c",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:49:5c",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-12.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/6",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:49:5d",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.12",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:49:5e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-12-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b90345bff001f07e13f08f10e11",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-12"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
deleted file mode 100644
index fc44de3cd9e95149c766e55c6af2745f2d1a5925..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "15JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.13",
-      "kavlan-11": "10.7.233.13",
-      "kavlan-12": "10.11.233.13",
-      "kavlan-13": "10.15.233.13",
-      "kavlan-14": "10.19.233.13",
-      "kavlan-16": "10.27.233.13",
-      "kavlan-18": "10.35.233.13",
-      "kavlan-2": "192.168.208.13",
-      "kavlan-20": "10.43.233.13",
-      "kavlan-21": "10.47.233.13",
-      "kavlan-3": "192.168.224.13",
-      "kavlan-4": "10.32.0.13",
-      "kavlan-5": "10.32.64.13",
-      "kavlan-6": "10.32.128.13",
-      "kavlan-7": "10.32.192.13",
-      "kavlan-8": "10.33.0.13",
-      "kavlan-9": "10.33.64.13"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::d",
-      "kavlan-11": "2001:660:4406:88b:3::d",
-      "kavlan-12": "2001:660:4406:88c:3::d",
-      "kavlan-13": "2001:660:4406:88d:3::d",
-      "kavlan-14": "2001:660:4406:88e:3::d",
-      "kavlan-16": "2001:660:4406:890:3::d",
-      "kavlan-18": "2001:660:4406:892:3::d",
-      "kavlan-2": "2001:660:4406:882:3::d",
-      "kavlan-20": "2001:660:4406:894:3::d",
-      "kavlan-21": "2001:660:4406:895:3::d",
-      "kavlan-3": "2001:660:4406:883:3::d",
-      "kavlan-4": "2001:660:4406:884:3::d",
-      "kavlan-5": "2001:660:4406:885:3::d",
-      "kavlan-6": "2001:660:4406:886:3::d",
-      "kavlan-7": "2001:660:4406:887:3::d",
-      "kavlan-8": "2001:660:4406:888:3::d",
-      "kavlan-9": "2001:660:4406:889:3::d"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.13",
-      "ip6": "2001:660:4406:800:3::d",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:4c:78",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-13.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/13",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4c:79",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.13",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4c:7a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-13-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903752bb001f07d07a82c2d95c",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-13"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
deleted file mode 100644
index ae60bbfa40cceb5965072d5d3c4e61255221f30c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "95JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.14",
-      "kavlan-11": "10.7.233.14",
-      "kavlan-12": "10.11.233.14",
-      "kavlan-13": "10.15.233.14",
-      "kavlan-14": "10.19.233.14",
-      "kavlan-16": "10.27.233.14",
-      "kavlan-18": "10.35.233.14",
-      "kavlan-2": "192.168.208.14",
-      "kavlan-20": "10.43.233.14",
-      "kavlan-21": "10.47.233.14",
-      "kavlan-3": "192.168.224.14",
-      "kavlan-4": "10.32.0.14",
-      "kavlan-5": "10.32.64.14",
-      "kavlan-6": "10.32.128.14",
-      "kavlan-7": "10.32.192.14",
-      "kavlan-8": "10.33.0.14",
-      "kavlan-9": "10.33.64.14"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::e",
-      "kavlan-11": "2001:660:4406:88b:3::e",
-      "kavlan-12": "2001:660:4406:88c:3::e",
-      "kavlan-13": "2001:660:4406:88d:3::e",
-      "kavlan-14": "2001:660:4406:88e:3::e",
-      "kavlan-16": "2001:660:4406:890:3::e",
-      "kavlan-18": "2001:660:4406:892:3::e",
-      "kavlan-2": "2001:660:4406:882:3::e",
-      "kavlan-20": "2001:660:4406:894:3::e",
-      "kavlan-21": "2001:660:4406:895:3::e",
-      "kavlan-3": "2001:660:4406:883:3::e",
-      "kavlan-4": "2001:660:4406:884:3::e",
-      "kavlan-5": "2001:660:4406:885:3::e",
-      "kavlan-6": "2001:660:4406:886:3::e",
-      "kavlan-7": "2001:660:4406:887:3::e",
-      "kavlan-8": "2001:660:4406:888:3::e",
-      "kavlan-9": "2001:660:4406:889:3::e"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.14",
-      "ip6": "2001:660:4406:800:3::e",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:4a:61",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-14.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/19",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4a:62",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.14",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4a:63",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-14-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b9037505c001d2659c6080c88f0",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-14"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
deleted file mode 100644
index c9efc01653cf2e460697b89baee4080d0cd78438..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "F3JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.15",
-      "kavlan-11": "10.7.233.15",
-      "kavlan-12": "10.11.233.15",
-      "kavlan-13": "10.15.233.15",
-      "kavlan-14": "10.19.233.15",
-      "kavlan-16": "10.27.233.15",
-      "kavlan-18": "10.35.233.15",
-      "kavlan-2": "192.168.208.15",
-      "kavlan-20": "10.43.233.15",
-      "kavlan-21": "10.47.233.15",
-      "kavlan-3": "192.168.224.15",
-      "kavlan-4": "10.32.0.15",
-      "kavlan-5": "10.32.64.15",
-      "kavlan-6": "10.32.128.15",
-      "kavlan-7": "10.32.192.15",
-      "kavlan-8": "10.33.0.15",
-      "kavlan-9": "10.33.64.15"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::f",
-      "kavlan-11": "2001:660:4406:88b:3::f",
-      "kavlan-12": "2001:660:4406:88c:3::f",
-      "kavlan-13": "2001:660:4406:88d:3::f",
-      "kavlan-14": "2001:660:4406:88e:3::f",
-      "kavlan-16": "2001:660:4406:890:3::f",
-      "kavlan-18": "2001:660:4406:892:3::f",
-      "kavlan-2": "2001:660:4406:882:3::f",
-      "kavlan-20": "2001:660:4406:894:3::f",
-      "kavlan-21": "2001:660:4406:895:3::f",
-      "kavlan-3": "2001:660:4406:883:3::f",
-      "kavlan-4": "2001:660:4406:884:3::f",
-      "kavlan-5": "2001:660:4406:885:3::f",
-      "kavlan-6": "2001:660:4406:886:3::f",
-      "kavlan-7": "2001:660:4406:887:3::f",
-      "kavlan-8": "2001:660:4406:888:3::f",
-      "kavlan-9": "2001:660:4406:889:3::f"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.15",
-      "ip6": "2001:660:4406:800:3::f",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:44:89",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-15.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/17",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:44:8a",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.15",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:44:8b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-15-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b9037502e001abeb484fac1b82e",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-15"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
deleted file mode 100644
index 64fdec08966a1a857d063aaa186b76b4a053c216..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "33JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.16",
-      "kavlan-11": "10.7.233.16",
-      "kavlan-12": "10.11.233.16",
-      "kavlan-13": "10.15.233.16",
-      "kavlan-14": "10.19.233.16",
-      "kavlan-16": "10.27.233.16",
-      "kavlan-18": "10.35.233.16",
-      "kavlan-2": "192.168.208.16",
-      "kavlan-20": "10.43.233.16",
-      "kavlan-21": "10.47.233.16",
-      "kavlan-3": "192.168.224.16",
-      "kavlan-4": "10.32.0.16",
-      "kavlan-5": "10.32.64.16",
-      "kavlan-6": "10.32.128.16",
-      "kavlan-7": "10.32.192.16",
-      "kavlan-8": "10.33.0.16",
-      "kavlan-9": "10.33.64.16"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::10",
-      "kavlan-11": "2001:660:4406:88b:3::10",
-      "kavlan-12": "2001:660:4406:88c:3::10",
-      "kavlan-13": "2001:660:4406:88d:3::10",
-      "kavlan-14": "2001:660:4406:88e:3::10",
-      "kavlan-16": "2001:660:4406:890:3::10",
-      "kavlan-18": "2001:660:4406:892:3::10",
-      "kavlan-2": "2001:660:4406:882:3::10",
-      "kavlan-20": "2001:660:4406:894:3::10",
-      "kavlan-21": "2001:660:4406:895:3::10",
-      "kavlan-3": "2001:660:4406:883:3::10",
-      "kavlan-4": "2001:660:4406:884:3::10",
-      "kavlan-5": "2001:660:4406:885:3::10",
-      "kavlan-6": "2001:660:4406:886:3::10",
-      "kavlan-7": "2001:660:4406:887:3::10",
-      "kavlan-8": "2001:660:4406:888:3::10",
-      "kavlan-9": "2001:660:4406:889:3::10"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.130.16",
-      "ip6": "2001:660:4406:800:3::10",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:41:0c",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-16.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/21",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:41:0d",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.16",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:41:0e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-16-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "rev": 1.22,
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-16"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
deleted file mode 100644
index 51cba5ff054e157750f7d72600e2dc9b94623d29..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "54JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.17",
-      "kavlan-11": "10.7.233.17",
-      "kavlan-12": "10.11.233.17",
-      "kavlan-13": "10.15.233.17",
-      "kavlan-14": "10.19.233.17",
-      "kavlan-16": "10.27.233.17",
-      "kavlan-18": "10.35.233.17",
-      "kavlan-2": "192.168.208.17",
-      "kavlan-20": "10.43.233.17",
-      "kavlan-21": "10.47.233.17",
-      "kavlan-3": "192.168.224.17",
-      "kavlan-4": "10.32.0.17",
-      "kavlan-5": "10.32.64.17",
-      "kavlan-6": "10.32.128.17",
-      "kavlan-7": "10.32.192.17",
-      "kavlan-8": "10.33.0.17",
-      "kavlan-9": "10.33.64.17"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::11",
-      "kavlan-11": "2001:660:4406:88b:3::11",
-      "kavlan-12": "2001:660:4406:88c:3::11",
-      "kavlan-13": "2001:660:4406:88d:3::11",
-      "kavlan-14": "2001:660:4406:88e:3::11",
-      "kavlan-16": "2001:660:4406:890:3::11",
-      "kavlan-18": "2001:660:4406:892:3::11",
-      "kavlan-2": "2001:660:4406:882:3::11",
-      "kavlan-20": "2001:660:4406:894:3::11",
-      "kavlan-21": "2001:660:4406:895:3::11",
-      "kavlan-3": "2001:660:4406:883:3::11",
-      "kavlan-4": "2001:660:4406:884:3::11",
-      "kavlan-5": "2001:660:4406:885:3::11",
-      "kavlan-6": "2001:660:4406:886:3::11",
-      "kavlan-7": "2001:660:4406:887:3::11",
-      "kavlan-8": "2001:660:4406:888:3::11",
-      "kavlan-9": "2001:660:4406:889:3::11"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.130.17",
-      "ip6": "2001:660:4406:800:3::11",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:47:db",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-17.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/15",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:47:dc",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.17",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:47:dd",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-17-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "rev": 1.22,
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-17"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
deleted file mode 100644
index fe38cceeb1c2fb59c8a898e365011d23b8759bef..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "13JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.18",
-      "kavlan-11": "10.7.233.18",
-      "kavlan-12": "10.11.233.18",
-      "kavlan-13": "10.15.233.18",
-      "kavlan-14": "10.19.233.18",
-      "kavlan-16": "10.27.233.18",
-      "kavlan-18": "10.35.233.18",
-      "kavlan-2": "192.168.208.18",
-      "kavlan-20": "10.43.233.18",
-      "kavlan-21": "10.47.233.18",
-      "kavlan-3": "192.168.224.18",
-      "kavlan-4": "10.32.0.18",
-      "kavlan-5": "10.32.64.18",
-      "kavlan-6": "10.32.128.18",
-      "kavlan-7": "10.32.192.18",
-      "kavlan-8": "10.33.0.18",
-      "kavlan-9": "10.33.64.18"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::12",
-      "kavlan-11": "2001:660:4406:88b:3::12",
-      "kavlan-12": "2001:660:4406:88c:3::12",
-      "kavlan-13": "2001:660:4406:88d:3::12",
-      "kavlan-14": "2001:660:4406:88e:3::12",
-      "kavlan-16": "2001:660:4406:890:3::12",
-      "kavlan-18": "2001:660:4406:892:3::12",
-      "kavlan-2": "2001:660:4406:882:3::12",
-      "kavlan-20": "2001:660:4406:894:3::12",
-      "kavlan-21": "2001:660:4406:895:3::12",
-      "kavlan-3": "2001:660:4406:883:3::12",
-      "kavlan-4": "2001:660:4406:884:3::12",
-      "kavlan-5": "2001:660:4406:885:3::12",
-      "kavlan-6": "2001:660:4406:886:3::12",
-      "kavlan-7": "2001:660:4406:887:3::12",
-      "kavlan-8": "2001:660:4406:888:3::12",
-      "kavlan-9": "2001:660:4406:889:3::12"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.18",
-      "ip6": "2001:660:4406:800:3::12",
-      "kavlan": true,
-      "mac": "00:26:b9:35:c4:83",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-18.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/1",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:35:c4:84",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.18",
-      "kavlan": false,
-      "mac": "00:26:b9:35:c4:85",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-18-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b90375548002036e77b0b99af8e",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-18"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
deleted file mode 100644
index 06435c05b9d6afd548567e020e33210fb27e5177..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "74JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.19",
-      "kavlan-11": "10.7.233.19",
-      "kavlan-12": "10.11.233.19",
-      "kavlan-13": "10.15.233.19",
-      "kavlan-14": "10.19.233.19",
-      "kavlan-16": "10.27.233.19",
-      "kavlan-18": "10.35.233.19",
-      "kavlan-2": "192.168.208.19",
-      "kavlan-20": "10.43.233.19",
-      "kavlan-21": "10.47.233.19",
-      "kavlan-3": "192.168.224.19",
-      "kavlan-4": "10.32.0.19",
-      "kavlan-5": "10.32.64.19",
-      "kavlan-6": "10.32.128.19",
-      "kavlan-7": "10.32.192.19",
-      "kavlan-8": "10.33.0.19",
-      "kavlan-9": "10.33.64.19"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::13",
-      "kavlan-11": "2001:660:4406:88b:3::13",
-      "kavlan-12": "2001:660:4406:88c:3::13",
-      "kavlan-13": "2001:660:4406:88d:3::13",
-      "kavlan-14": "2001:660:4406:88e:3::13",
-      "kavlan-16": "2001:660:4406:890:3::13",
-      "kavlan-18": "2001:660:4406:892:3::13",
-      "kavlan-2": "2001:660:4406:882:3::13",
-      "kavlan-20": "2001:660:4406:894:3::13",
-      "kavlan-21": "2001:660:4406:895:3::13",
-      "kavlan-3": "2001:660:4406:883:3::13",
-      "kavlan-4": "2001:660:4406:884:3::13",
-      "kavlan-5": "2001:660:4406:885:3::13",
-      "kavlan-6": "2001:660:4406:886:3::13",
-      "kavlan-7": "2001:660:4406:887:3::13",
-      "kavlan-8": "2001:660:4406:888:3::13",
-      "kavlan-9": "2001:660:4406:889:3::13"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.19",
-      "ip6": "2001:660:4406:800:3::13",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:40:67",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-19.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/2",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:40:68",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.19",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:40:69",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-19-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903752b40012c3706c1f9e4287",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-19"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
deleted file mode 100644
index 2280860e46cf8f5218518b77d723f5c6213c4792..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.06",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "B5JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.2",
-      "kavlan-11": "10.7.233.2",
-      "kavlan-12": "10.11.233.2",
-      "kavlan-13": "10.15.233.2",
-      "kavlan-14": "10.19.233.2",
-      "kavlan-16": "10.27.233.2",
-      "kavlan-18": "10.35.233.2",
-      "kavlan-2": "192.168.208.2",
-      "kavlan-20": "10.43.233.2",
-      "kavlan-21": "10.47.233.2",
-      "kavlan-3": "192.168.224.2",
-      "kavlan-4": "10.32.0.2",
-      "kavlan-5": "10.32.64.2",
-      "kavlan-6": "10.32.128.2",
-      "kavlan-7": "10.32.192.2",
-      "kavlan-8": "10.33.0.2",
-      "kavlan-9": "10.33.64.2"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::2",
-      "kavlan-11": "2001:660:4406:88b:3::2",
-      "kavlan-12": "2001:660:4406:88c:3::2",
-      "kavlan-13": "2001:660:4406:88d:3::2",
-      "kavlan-14": "2001:660:4406:88e:3::2",
-      "kavlan-16": "2001:660:4406:890:3::2",
-      "kavlan-18": "2001:660:4406:892:3::2",
-      "kavlan-2": "2001:660:4406:882:3::2",
-      "kavlan-20": "2001:660:4406:894:3::2",
-      "kavlan-21": "2001:660:4406:895:3::2",
-      "kavlan-3": "2001:660:4406:883:3::2",
-      "kavlan-4": "2001:660:4406:884:3::2",
-      "kavlan-5": "2001:660:4406:885:3::2",
-      "kavlan-6": "2001:660:4406:886:3::2",
-      "kavlan-7": "2001:660:4406:887:3::2",
-      "kavlan-8": "2001:660:4406:888:3::2",
-      "kavlan-9": "2001:660:4406:889:3::2"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.2",
-      "ip6": "2001:660:4406:800:3::2",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:49:38",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-2.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/11",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:49:39",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.2",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:49:3a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-2-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903750640012c36dd864a1d4d4",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
deleted file mode 100644
index 1a1a3a4a43d9dc28389df6ebb71fa4bf4afcbf12..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "43JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.20",
-      "kavlan-11": "10.7.233.20",
-      "kavlan-12": "10.11.233.20",
-      "kavlan-13": "10.15.233.20",
-      "kavlan-14": "10.19.233.20",
-      "kavlan-16": "10.27.233.20",
-      "kavlan-18": "10.35.233.20",
-      "kavlan-2": "192.168.208.20",
-      "kavlan-20": "10.43.233.20",
-      "kavlan-21": "10.47.233.20",
-      "kavlan-3": "192.168.224.20",
-      "kavlan-4": "10.32.0.20",
-      "kavlan-5": "10.32.64.20",
-      "kavlan-6": "10.32.128.20",
-      "kavlan-7": "10.32.192.20",
-      "kavlan-8": "10.33.0.20",
-      "kavlan-9": "10.33.64.20"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::14",
-      "kavlan-11": "2001:660:4406:88b:3::14",
-      "kavlan-12": "2001:660:4406:88c:3::14",
-      "kavlan-13": "2001:660:4406:88d:3::14",
-      "kavlan-14": "2001:660:4406:88e:3::14",
-      "kavlan-16": "2001:660:4406:890:3::14",
-      "kavlan-18": "2001:660:4406:892:3::14",
-      "kavlan-2": "2001:660:4406:882:3::14",
-      "kavlan-20": "2001:660:4406:894:3::14",
-      "kavlan-21": "2001:660:4406:895:3::14",
-      "kavlan-3": "2001:660:4406:883:3::14",
-      "kavlan-4": "2001:660:4406:884:3::14",
-      "kavlan-5": "2001:660:4406:885:3::14",
-      "kavlan-6": "2001:660:4406:886:3::14",
-      "kavlan-7": "2001:660:4406:887:3::14",
-      "kavlan-8": "2001:660:4406:888:3::14",
-      "kavlan-9": "2001:660:4406:889:3::14"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.20",
-      "ip6": "2001:660:4406:800:3::14",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:46:12",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-20.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/3",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:46:13",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.20",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:46:14",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-20-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b90375559001cff17810e7bffbf",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-20"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
deleted file mode 100644
index 6693baefeae3fbe3e35af38a00c1ea368715fe66..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "85JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.21",
-      "kavlan-11": "10.7.233.21",
-      "kavlan-12": "10.11.233.21",
-      "kavlan-13": "10.15.233.21",
-      "kavlan-14": "10.19.233.21",
-      "kavlan-16": "10.27.233.21",
-      "kavlan-18": "10.35.233.21",
-      "kavlan-2": "192.168.208.21",
-      "kavlan-20": "10.43.233.21",
-      "kavlan-21": "10.47.233.21",
-      "kavlan-3": "192.168.224.21",
-      "kavlan-4": "10.32.0.21",
-      "kavlan-5": "10.32.64.21",
-      "kavlan-6": "10.32.128.21",
-      "kavlan-7": "10.32.192.21",
-      "kavlan-8": "10.33.0.21",
-      "kavlan-9": "10.33.64.21"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::15",
-      "kavlan-11": "2001:660:4406:88b:3::15",
-      "kavlan-12": "2001:660:4406:88c:3::15",
-      "kavlan-13": "2001:660:4406:88d:3::15",
-      "kavlan-14": "2001:660:4406:88e:3::15",
-      "kavlan-16": "2001:660:4406:890:3::15",
-      "kavlan-18": "2001:660:4406:892:3::15",
-      "kavlan-2": "2001:660:4406:882:3::15",
-      "kavlan-20": "2001:660:4406:894:3::15",
-      "kavlan-21": "2001:660:4406:895:3::15",
-      "kavlan-3": "2001:660:4406:883:3::15",
-      "kavlan-4": "2001:660:4406:884:3::15",
-      "kavlan-5": "2001:660:4406:885:3::15",
-      "kavlan-6": "2001:660:4406:886:3::15",
-      "kavlan-7": "2001:660:4406:887:3::15",
-      "kavlan-8": "2001:660:4406:888:3::15",
-      "kavlan-9": "2001:660:4406:889:3::15"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.130.21",
-      "ip6": "2001:660:4406:800:3::15",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:3f:fb",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-21.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/4",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:3f:fc",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.21",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:3f:fd",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-21-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "rev": 1.22,
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-21"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
deleted file mode 100644
index d1c9028b0bbf7176aa3d32d967ea3c0aaab20e0e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "55JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.22",
-      "kavlan-11": "10.7.233.22",
-      "kavlan-12": "10.11.233.22",
-      "kavlan-13": "10.15.233.22",
-      "kavlan-14": "10.19.233.22",
-      "kavlan-16": "10.27.233.22",
-      "kavlan-18": "10.35.233.22",
-      "kavlan-2": "192.168.208.22",
-      "kavlan-20": "10.43.233.22",
-      "kavlan-21": "10.47.233.22",
-      "kavlan-3": "192.168.224.22",
-      "kavlan-4": "10.32.0.22",
-      "kavlan-5": "10.32.64.22",
-      "kavlan-6": "10.32.128.22",
-      "kavlan-7": "10.32.192.22",
-      "kavlan-8": "10.33.0.22",
-      "kavlan-9": "10.33.64.22"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::16",
-      "kavlan-11": "2001:660:4406:88b:3::16",
-      "kavlan-12": "2001:660:4406:88c:3::16",
-      "kavlan-13": "2001:660:4406:88d:3::16",
-      "kavlan-14": "2001:660:4406:88e:3::16",
-      "kavlan-16": "2001:660:4406:890:3::16",
-      "kavlan-18": "2001:660:4406:892:3::16",
-      "kavlan-2": "2001:660:4406:882:3::16",
-      "kavlan-20": "2001:660:4406:894:3::16",
-      "kavlan-21": "2001:660:4406:895:3::16",
-      "kavlan-3": "2001:660:4406:883:3::16",
-      "kavlan-4": "2001:660:4406:884:3::16",
-      "kavlan-5": "2001:660:4406:885:3::16",
-      "kavlan-6": "2001:660:4406:886:3::16",
-      "kavlan-7": "2001:660:4406:887:3::16",
-      "kavlan-8": "2001:660:4406:888:3::16",
-      "kavlan-9": "2001:660:4406:889:3::16"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.22",
-      "ip6": "2001:660:4406:800:3::16",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:47:66",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-22.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/5",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:47:67",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.22",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:47:68",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-22-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b9034f3ae001abeb7e77adf567a",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-22"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
deleted file mode 100644
index 28905b9be5dd349b4fa97f0b58636b75e96ba96d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "C5JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.23",
-      "kavlan-11": "10.7.233.23",
-      "kavlan-12": "10.11.233.23",
-      "kavlan-13": "10.15.233.23",
-      "kavlan-14": "10.19.233.23",
-      "kavlan-16": "10.27.233.23",
-      "kavlan-18": "10.35.233.23",
-      "kavlan-2": "192.168.208.23",
-      "kavlan-20": "10.43.233.23",
-      "kavlan-21": "10.47.233.23",
-      "kavlan-3": "192.168.224.23",
-      "kavlan-4": "10.32.0.23",
-      "kavlan-5": "10.32.64.23",
-      "kavlan-6": "10.32.128.23",
-      "kavlan-7": "10.32.192.23",
-      "kavlan-8": "10.33.0.23",
-      "kavlan-9": "10.33.64.23"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::17",
-      "kavlan-11": "2001:660:4406:88b:3::17",
-      "kavlan-12": "2001:660:4406:88c:3::17",
-      "kavlan-13": "2001:660:4406:88d:3::17",
-      "kavlan-14": "2001:660:4406:88e:3::17",
-      "kavlan-16": "2001:660:4406:890:3::17",
-      "kavlan-18": "2001:660:4406:892:3::17",
-      "kavlan-2": "2001:660:4406:882:3::17",
-      "kavlan-20": "2001:660:4406:894:3::17",
-      "kavlan-21": "2001:660:4406:895:3::17",
-      "kavlan-3": "2001:660:4406:883:3::17",
-      "kavlan-4": "2001:660:4406:884:3::17",
-      "kavlan-5": "2001:660:4406:885:3::17",
-      "kavlan-6": "2001:660:4406:886:3::17",
-      "kavlan-7": "2001:660:4406:887:3::17",
-      "kavlan-8": "2001:660:4406:888:3::17",
-      "kavlan-9": "2001:660:4406:889:3::17"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.23",
-      "ip6": "2001:660:4406:800:3::17",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:4a:dc",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-23.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/6",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4a:dd",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.23",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4a:de",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-23-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b90375070001d2005e9ae2d7fce",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-23"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
deleted file mode 100644
index de8fa4bbaba835e6740140b914b52d606717afd9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "24JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.24",
-      "kavlan-11": "10.7.233.24",
-      "kavlan-12": "10.11.233.24",
-      "kavlan-13": "10.15.233.24",
-      "kavlan-14": "10.19.233.24",
-      "kavlan-16": "10.27.233.24",
-      "kavlan-18": "10.35.233.24",
-      "kavlan-2": "192.168.208.24",
-      "kavlan-20": "10.43.233.24",
-      "kavlan-21": "10.47.233.24",
-      "kavlan-3": "192.168.224.24",
-      "kavlan-4": "10.32.0.24",
-      "kavlan-5": "10.32.64.24",
-      "kavlan-6": "10.32.128.24",
-      "kavlan-7": "10.32.192.24",
-      "kavlan-8": "10.33.0.24",
-      "kavlan-9": "10.33.64.24"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::18",
-      "kavlan-11": "2001:660:4406:88b:3::18",
-      "kavlan-12": "2001:660:4406:88c:3::18",
-      "kavlan-13": "2001:660:4406:88d:3::18",
-      "kavlan-14": "2001:660:4406:88e:3::18",
-      "kavlan-16": "2001:660:4406:890:3::18",
-      "kavlan-18": "2001:660:4406:892:3::18",
-      "kavlan-2": "2001:660:4406:882:3::18",
-      "kavlan-20": "2001:660:4406:894:3::18",
-      "kavlan-21": "2001:660:4406:895:3::18",
-      "kavlan-3": "2001:660:4406:883:3::18",
-      "kavlan-4": "2001:660:4406:884:3::18",
-      "kavlan-5": "2001:660:4406:885:3::18",
-      "kavlan-6": "2001:660:4406:886:3::18",
-      "kavlan-7": "2001:660:4406:887:3::18",
-      "kavlan-8": "2001:660:4406:888:3::18",
-      "kavlan-9": "2001:660:4406:889:3::18"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.24",
-      "ip6": "2001:660:4406:800:3::18",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:47:b4",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-24.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/7",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:47:b5",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.24",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:47:b6",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-24-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903752c6001cff19b50975e083",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-24"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
deleted file mode 100644
index c1314cc88a8ed032fec5e012e0a134e93bcac0cc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "44JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.25",
-      "kavlan-11": "10.7.233.25",
-      "kavlan-12": "10.11.233.25",
-      "kavlan-13": "10.15.233.25",
-      "kavlan-14": "10.19.233.25",
-      "kavlan-16": "10.27.233.25",
-      "kavlan-18": "10.35.233.25",
-      "kavlan-2": "192.168.208.25",
-      "kavlan-20": "10.43.233.25",
-      "kavlan-21": "10.47.233.25",
-      "kavlan-3": "192.168.224.25",
-      "kavlan-4": "10.32.0.25",
-      "kavlan-5": "10.32.64.25",
-      "kavlan-6": "10.32.128.25",
-      "kavlan-7": "10.32.192.25",
-      "kavlan-8": "10.33.0.25",
-      "kavlan-9": "10.33.64.25"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::19",
-      "kavlan-11": "2001:660:4406:88b:3::19",
-      "kavlan-12": "2001:660:4406:88c:3::19",
-      "kavlan-13": "2001:660:4406:88d:3::19",
-      "kavlan-14": "2001:660:4406:88e:3::19",
-      "kavlan-16": "2001:660:4406:890:3::19",
-      "kavlan-18": "2001:660:4406:892:3::19",
-      "kavlan-2": "2001:660:4406:882:3::19",
-      "kavlan-20": "2001:660:4406:894:3::19",
-      "kavlan-21": "2001:660:4406:895:3::19",
-      "kavlan-3": "2001:660:4406:883:3::19",
-      "kavlan-4": "2001:660:4406:884:3::19",
-      "kavlan-5": "2001:660:4406:885:3::19",
-      "kavlan-6": "2001:660:4406:886:3::19",
-      "kavlan-7": "2001:660:4406:887:3::19",
-      "kavlan-8": "2001:660:4406:888:3::19",
-      "kavlan-9": "2001:660:4406:889:3::19"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.25",
-      "ip6": "2001:660:4406:800:3::19",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:47:a2",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-25.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/8",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:47:a3",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.25",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:47:a4",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-25-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903752c9001d20088209806520",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-25"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
deleted file mode 100644
index d632cf5fdd44557b367ab2b853fab615fab0d6d7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "75JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.26",
-      "kavlan-11": "10.7.233.26",
-      "kavlan-12": "10.11.233.26",
-      "kavlan-13": "10.15.233.26",
-      "kavlan-14": "10.19.233.26",
-      "kavlan-16": "10.27.233.26",
-      "kavlan-18": "10.35.233.26",
-      "kavlan-2": "192.168.208.26",
-      "kavlan-20": "10.43.233.26",
-      "kavlan-21": "10.47.233.26",
-      "kavlan-3": "192.168.224.26",
-      "kavlan-4": "10.32.0.26",
-      "kavlan-5": "10.32.64.26",
-      "kavlan-6": "10.32.128.26",
-      "kavlan-7": "10.32.192.26",
-      "kavlan-8": "10.33.0.26",
-      "kavlan-9": "10.33.64.26"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::1a",
-      "kavlan-11": "2001:660:4406:88b:3::1a",
-      "kavlan-12": "2001:660:4406:88c:3::1a",
-      "kavlan-13": "2001:660:4406:88d:3::1a",
-      "kavlan-14": "2001:660:4406:88e:3::1a",
-      "kavlan-16": "2001:660:4406:890:3::1a",
-      "kavlan-18": "2001:660:4406:892:3::1a",
-      "kavlan-2": "2001:660:4406:882:3::1a",
-      "kavlan-20": "2001:660:4406:894:3::1a",
-      "kavlan-21": "2001:660:4406:895:3::1a",
-      "kavlan-3": "2001:660:4406:883:3::1a",
-      "kavlan-4": "2001:660:4406:884:3::1a",
-      "kavlan-5": "2001:660:4406:885:3::1a",
-      "kavlan-6": "2001:660:4406:886:3::1a",
-      "kavlan-7": "2001:660:4406:887:3::1a",
-      "kavlan-8": "2001:660:4406:888:3::1a",
-      "kavlan-9": "2001:660:4406:889:3::1a"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.26",
-      "ip6": "2001:660:4406:800:3::1a",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:4b:4d",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-26.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/9",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4b:4e",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.26",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4b:4f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-26-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903750430012c370d725fb5385",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-26"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
deleted file mode 100644
index 2eb7b884ee41eb6c8615612ecbf27c17a7d47f7b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "35JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.27",
-      "kavlan-11": "10.7.233.27",
-      "kavlan-12": "10.11.233.27",
-      "kavlan-13": "10.15.233.27",
-      "kavlan-14": "10.19.233.27",
-      "kavlan-16": "10.27.233.27",
-      "kavlan-18": "10.35.233.27",
-      "kavlan-2": "192.168.208.27",
-      "kavlan-20": "10.43.233.27",
-      "kavlan-21": "10.47.233.27",
-      "kavlan-3": "192.168.224.27",
-      "kavlan-4": "10.32.0.27",
-      "kavlan-5": "10.32.64.27",
-      "kavlan-6": "10.32.128.27",
-      "kavlan-7": "10.32.192.27",
-      "kavlan-8": "10.33.0.27",
-      "kavlan-9": "10.33.64.27"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::1b",
-      "kavlan-11": "2001:660:4406:88b:3::1b",
-      "kavlan-12": "2001:660:4406:88c:3::1b",
-      "kavlan-13": "2001:660:4406:88d:3::1b",
-      "kavlan-14": "2001:660:4406:88e:3::1b",
-      "kavlan-16": "2001:660:4406:890:3::1b",
-      "kavlan-18": "2001:660:4406:892:3::1b",
-      "kavlan-2": "2001:660:4406:882:3::1b",
-      "kavlan-20": "2001:660:4406:894:3::1b",
-      "kavlan-21": "2001:660:4406:895:3::1b",
-      "kavlan-3": "2001:660:4406:883:3::1b",
-      "kavlan-4": "2001:660:4406:884:3::1b",
-      "kavlan-5": "2001:660:4406:885:3::1b",
-      "kavlan-6": "2001:660:4406:886:3::1b",
-      "kavlan-7": "2001:660:4406:887:3::1b",
-      "kavlan-8": "2001:660:4406:888:3::1b",
-      "kavlan-9": "2001:660:4406:889:3::1b"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.27",
-      "ip6": "2001:660:4406:800:3::1b",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:4b:62",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-27.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/10",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4b:63",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.27",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4b:64",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-27-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903752ac001f07d212a17021f6",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-27"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
deleted file mode 100644
index 12521d0b7a3d938114bde70bc26fc782fc9331b3..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "F4JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.28",
-      "kavlan-11": "10.7.233.28",
-      "kavlan-12": "10.11.233.28",
-      "kavlan-13": "10.15.233.28",
-      "kavlan-14": "10.19.233.28",
-      "kavlan-16": "10.27.233.28",
-      "kavlan-18": "10.35.233.28",
-      "kavlan-2": "192.168.208.28",
-      "kavlan-20": "10.43.233.28",
-      "kavlan-21": "10.47.233.28",
-      "kavlan-3": "192.168.224.28",
-      "kavlan-4": "10.32.0.28",
-      "kavlan-5": "10.32.64.28",
-      "kavlan-6": "10.32.128.28",
-      "kavlan-7": "10.32.192.28",
-      "kavlan-8": "10.33.0.28",
-      "kavlan-9": "10.33.64.28"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::1c",
-      "kavlan-11": "2001:660:4406:88b:3::1c",
-      "kavlan-12": "2001:660:4406:88c:3::1c",
-      "kavlan-13": "2001:660:4406:88d:3::1c",
-      "kavlan-14": "2001:660:4406:88e:3::1c",
-      "kavlan-16": "2001:660:4406:890:3::1c",
-      "kavlan-18": "2001:660:4406:892:3::1c",
-      "kavlan-2": "2001:660:4406:882:3::1c",
-      "kavlan-20": "2001:660:4406:894:3::1c",
-      "kavlan-21": "2001:660:4406:895:3::1c",
-      "kavlan-3": "2001:660:4406:883:3::1c",
-      "kavlan-4": "2001:660:4406:884:3::1c",
-      "kavlan-5": "2001:660:4406:885:3::1c",
-      "kavlan-6": "2001:660:4406:886:3::1c",
-      "kavlan-7": "2001:660:4406:887:3::1c",
-      "kavlan-8": "2001:660:4406:888:3::1c",
-      "kavlan-9": "2001:660:4406:889:3::1c"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.28",
-      "ip6": "2001:660:4406:800:3::1c",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:49:56",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-28.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/11",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:49:57",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.28",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:49:58",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-28-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903752b70022be8dd307926bd4",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-28"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
deleted file mode 100644
index baad6ccd71398bc758b1d134362d183c76432bd5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "D3JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.29",
-      "kavlan-11": "10.7.233.29",
-      "kavlan-12": "10.11.233.29",
-      "kavlan-13": "10.15.233.29",
-      "kavlan-14": "10.19.233.29",
-      "kavlan-16": "10.27.233.29",
-      "kavlan-18": "10.35.233.29",
-      "kavlan-2": "192.168.208.29",
-      "kavlan-20": "10.43.233.29",
-      "kavlan-21": "10.47.233.29",
-      "kavlan-3": "192.168.224.29",
-      "kavlan-4": "10.32.0.29",
-      "kavlan-5": "10.32.64.29",
-      "kavlan-6": "10.32.128.29",
-      "kavlan-7": "10.32.192.29",
-      "kavlan-8": "10.33.0.29",
-      "kavlan-9": "10.33.64.29"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::1d",
-      "kavlan-11": "2001:660:4406:88b:3::1d",
-      "kavlan-12": "2001:660:4406:88c:3::1d",
-      "kavlan-13": "2001:660:4406:88d:3::1d",
-      "kavlan-14": "2001:660:4406:88e:3::1d",
-      "kavlan-16": "2001:660:4406:890:3::1d",
-      "kavlan-18": "2001:660:4406:892:3::1d",
-      "kavlan-2": "2001:660:4406:882:3::1d",
-      "kavlan-20": "2001:660:4406:894:3::1d",
-      "kavlan-21": "2001:660:4406:895:3::1d",
-      "kavlan-3": "2001:660:4406:883:3::1d",
-      "kavlan-4": "2001:660:4406:884:3::1d",
-      "kavlan-5": "2001:660:4406:885:3::1d",
-      "kavlan-6": "2001:660:4406:886:3::1d",
-      "kavlan-7": "2001:660:4406:887:3::1d",
-      "kavlan-8": "2001:660:4406:888:3::1d",
-      "kavlan-9": "2001:660:4406:889:3::1d"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.29",
-      "ip6": "2001:660:4406:800:3::1d",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:47:ba",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-29.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/12",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:47:bb",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.29",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:47:bc",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-29-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903755440012c3703e1ce84dfb",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-29"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
deleted file mode 100644
index 765de34d8d927a63e312cce89b08ebce7f372df5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "14JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.3",
-      "kavlan-11": "10.7.233.3",
-      "kavlan-12": "10.11.233.3",
-      "kavlan-13": "10.15.233.3",
-      "kavlan-14": "10.19.233.3",
-      "kavlan-16": "10.27.233.3",
-      "kavlan-18": "10.35.233.3",
-      "kavlan-2": "192.168.208.3",
-      "kavlan-20": "10.43.233.3",
-      "kavlan-21": "10.47.233.3",
-      "kavlan-3": "192.168.224.3",
-      "kavlan-4": "10.32.0.3",
-      "kavlan-5": "10.32.64.3",
-      "kavlan-6": "10.32.128.3",
-      "kavlan-7": "10.32.192.3",
-      "kavlan-8": "10.33.0.3",
-      "kavlan-9": "10.33.64.3"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::3",
-      "kavlan-11": "2001:660:4406:88b:3::3",
-      "kavlan-12": "2001:660:4406:88c:3::3",
-      "kavlan-13": "2001:660:4406:88d:3::3",
-      "kavlan-14": "2001:660:4406:88e:3::3",
-      "kavlan-16": "2001:660:4406:890:3::3",
-      "kavlan-18": "2001:660:4406:892:3::3",
-      "kavlan-2": "2001:660:4406:882:3::3",
-      "kavlan-20": "2001:660:4406:894:3::3",
-      "kavlan-21": "2001:660:4406:895:3::3",
-      "kavlan-3": "2001:660:4406:883:3::3",
-      "kavlan-4": "2001:660:4406:884:3::3",
-      "kavlan-5": "2001:660:4406:885:3::3",
-      "kavlan-6": "2001:660:4406:886:3::3",
-      "kavlan-7": "2001:660:4406:887:3::3",
-      "kavlan-8": "2001:660:4406:888:3::3",
-      "kavlan-9": "2001:660:4406:889:3::3"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.130.3",
-      "ip6": "2001:660:4406:800:3::3",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:4a:5e",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-3.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/1",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4a:5f",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.3",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4a:60",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-3-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "rev": 1.22,
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-3"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
deleted file mode 100644
index 7299cbdf922ae73cf8a1f6e336b512a98e8dcce2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "63JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.30",
-      "kavlan-11": "10.7.233.30",
-      "kavlan-12": "10.11.233.30",
-      "kavlan-13": "10.15.233.30",
-      "kavlan-14": "10.19.233.30",
-      "kavlan-16": "10.27.233.30",
-      "kavlan-18": "10.35.233.30",
-      "kavlan-2": "192.168.208.30",
-      "kavlan-20": "10.43.233.30",
-      "kavlan-21": "10.47.233.30",
-      "kavlan-3": "192.168.224.30",
-      "kavlan-4": "10.32.0.30",
-      "kavlan-5": "10.32.64.30",
-      "kavlan-6": "10.32.128.30",
-      "kavlan-7": "10.32.192.30",
-      "kavlan-8": "10.33.0.30",
-      "kavlan-9": "10.33.64.30"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::1e",
-      "kavlan-11": "2001:660:4406:88b:3::1e",
-      "kavlan-12": "2001:660:4406:88c:3::1e",
-      "kavlan-13": "2001:660:4406:88d:3::1e",
-      "kavlan-14": "2001:660:4406:88e:3::1e",
-      "kavlan-16": "2001:660:4406:890:3::1e",
-      "kavlan-18": "2001:660:4406:892:3::1e",
-      "kavlan-2": "2001:660:4406:882:3::1e",
-      "kavlan-20": "2001:660:4406:894:3::1e",
-      "kavlan-21": "2001:660:4406:895:3::1e",
-      "kavlan-3": "2001:660:4406:883:3::1e",
-      "kavlan-4": "2001:660:4406:884:3::1e",
-      "kavlan-5": "2001:660:4406:885:3::1e",
-      "kavlan-6": "2001:660:4406:886:3::1e",
-      "kavlan-7": "2001:660:4406:887:3::1e",
-      "kavlan-8": "2001:660:4406:888:3::1e",
-      "kavlan-9": "2001:660:4406:889:3::1e"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.30",
-      "ip6": "2001:660:4406:800:3::1e",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:41:30",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-30.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/13",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:41:31",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.30",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:41:32",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-30-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b90375551001abeb87191b2bd58",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-30"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
deleted file mode 100644
index 617c78f1759b59ea61831f8e1906ae47b042524f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "C4JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.31",
-      "kavlan-11": "10.7.233.31",
-      "kavlan-12": "10.11.233.31",
-      "kavlan-13": "10.15.233.31",
-      "kavlan-14": "10.19.233.31",
-      "kavlan-16": "10.27.233.31",
-      "kavlan-18": "10.35.233.31",
-      "kavlan-2": "192.168.208.31",
-      "kavlan-20": "10.43.233.31",
-      "kavlan-21": "10.47.233.31",
-      "kavlan-3": "192.168.224.31",
-      "kavlan-4": "10.32.0.31",
-      "kavlan-5": "10.32.64.31",
-      "kavlan-6": "10.32.128.31",
-      "kavlan-7": "10.32.192.31",
-      "kavlan-8": "10.33.0.31",
-      "kavlan-9": "10.33.64.31"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::1f",
-      "kavlan-11": "2001:660:4406:88b:3::1f",
-      "kavlan-12": "2001:660:4406:88c:3::1f",
-      "kavlan-13": "2001:660:4406:88d:3::1f",
-      "kavlan-14": "2001:660:4406:88e:3::1f",
-      "kavlan-16": "2001:660:4406:890:3::1f",
-      "kavlan-18": "2001:660:4406:892:3::1f",
-      "kavlan-2": "2001:660:4406:882:3::1f",
-      "kavlan-20": "2001:660:4406:894:3::1f",
-      "kavlan-21": "2001:660:4406:895:3::1f",
-      "kavlan-3": "2001:660:4406:883:3::1f",
-      "kavlan-4": "2001:660:4406:884:3::1f",
-      "kavlan-5": "2001:660:4406:885:3::1f",
-      "kavlan-6": "2001:660:4406:886:3::1f",
-      "kavlan-7": "2001:660:4406:887:3::1f",
-      "kavlan-8": "2001:660:4406:888:3::1f",
-      "kavlan-9": "2001:660:4406:889:3::1f"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.31",
-      "ip6": "2001:660:4406:800:3::1f",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:4b:56",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-31.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/14",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4b:57",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.31",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4b:58",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-31-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903752c10012c371242a8acfe9",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-31"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
deleted file mode 100644
index 373991863c51d72d1c82e89df9c0b9e485dbc1bf..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "F5JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.32",
-      "kavlan-11": "10.7.233.32",
-      "kavlan-12": "10.11.233.32",
-      "kavlan-13": "10.15.233.32",
-      "kavlan-14": "10.19.233.32",
-      "kavlan-16": "10.27.233.32",
-      "kavlan-18": "10.35.233.32",
-      "kavlan-2": "192.168.208.32",
-      "kavlan-20": "10.43.233.32",
-      "kavlan-21": "10.47.233.32",
-      "kavlan-3": "192.168.224.32",
-      "kavlan-4": "10.32.0.32",
-      "kavlan-5": "10.32.64.32",
-      "kavlan-6": "10.32.128.32",
-      "kavlan-7": "10.32.192.32",
-      "kavlan-8": "10.33.0.32",
-      "kavlan-9": "10.33.64.32"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::20",
-      "kavlan-11": "2001:660:4406:88b:3::20",
-      "kavlan-12": "2001:660:4406:88c:3::20",
-      "kavlan-13": "2001:660:4406:88d:3::20",
-      "kavlan-14": "2001:660:4406:88e:3::20",
-      "kavlan-16": "2001:660:4406:890:3::20",
-      "kavlan-18": "2001:660:4406:892:3::20",
-      "kavlan-2": "2001:660:4406:882:3::20",
-      "kavlan-20": "2001:660:4406:894:3::20",
-      "kavlan-21": "2001:660:4406:895:3::20",
-      "kavlan-3": "2001:660:4406:883:3::20",
-      "kavlan-4": "2001:660:4406:884:3::20",
-      "kavlan-5": "2001:660:4406:885:3::20",
-      "kavlan-6": "2001:660:4406:886:3::20",
-      "kavlan-7": "2001:660:4406:887:3::20",
-      "kavlan-8": "2001:660:4406:888:3::20",
-      "kavlan-9": "2001:660:4406:889:3::20"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.32",
-      "ip6": "2001:660:4406:800:3::20",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:44:68",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-32.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/15",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:44:69",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.32",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:44:6a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-32-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b90375073001ab1b68e04dc42da",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-32"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
deleted file mode 100644
index 32125289b0a5133c712117d8685bb331ab2efb88..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.06",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "84JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.33",
-      "kavlan-11": "10.7.233.33",
-      "kavlan-12": "10.11.233.33",
-      "kavlan-13": "10.15.233.33",
-      "kavlan-14": "10.19.233.33",
-      "kavlan-16": "10.27.233.33",
-      "kavlan-18": "10.35.233.33",
-      "kavlan-2": "192.168.208.33",
-      "kavlan-20": "10.43.233.33",
-      "kavlan-21": "10.47.233.33",
-      "kavlan-3": "192.168.224.33",
-      "kavlan-4": "10.32.0.33",
-      "kavlan-5": "10.32.64.33",
-      "kavlan-6": "10.32.128.33",
-      "kavlan-7": "10.32.192.33",
-      "kavlan-8": "10.33.0.33",
-      "kavlan-9": "10.33.64.33"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::21",
-      "kavlan-11": "2001:660:4406:88b:3::21",
-      "kavlan-12": "2001:660:4406:88c:3::21",
-      "kavlan-13": "2001:660:4406:88d:3::21",
-      "kavlan-14": "2001:660:4406:88e:3::21",
-      "kavlan-16": "2001:660:4406:890:3::21",
-      "kavlan-18": "2001:660:4406:892:3::21",
-      "kavlan-2": "2001:660:4406:882:3::21",
-      "kavlan-20": "2001:660:4406:894:3::21",
-      "kavlan-21": "2001:660:4406:895:3::21",
-      "kavlan-3": "2001:660:4406:883:3::21",
-      "kavlan-4": "2001:660:4406:884:3::21",
-      "kavlan-5": "2001:660:4406:885:3::21",
-      "kavlan-6": "2001:660:4406:886:3::21",
-      "kavlan-7": "2001:660:4406:887:3::21",
-      "kavlan-8": "2001:660:4406:888:3::21",
-      "kavlan-9": "2001:660:4406:889:3::21"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.33",
-      "ip6": "2001:660:4406:800:3::21",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:3f:67",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-33.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/16",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:3f:68",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.33",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:3f:69",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-33-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903752be001abeb9ec04a967d6",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-33"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
deleted file mode 100644
index 235d047abac77c03696187133c4829e3ded8a293..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.06",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "53JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.34",
-      "kavlan-11": "10.7.233.34",
-      "kavlan-12": "10.11.233.34",
-      "kavlan-13": "10.15.233.34",
-      "kavlan-14": "10.19.233.34",
-      "kavlan-16": "10.27.233.34",
-      "kavlan-18": "10.35.233.34",
-      "kavlan-2": "192.168.208.34",
-      "kavlan-20": "10.43.233.34",
-      "kavlan-21": "10.47.233.34",
-      "kavlan-3": "192.168.224.34",
-      "kavlan-4": "10.32.0.34",
-      "kavlan-5": "10.32.64.34",
-      "kavlan-6": "10.32.128.34",
-      "kavlan-7": "10.32.192.34",
-      "kavlan-8": "10.33.0.34",
-      "kavlan-9": "10.33.64.34"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::22",
-      "kavlan-11": "2001:660:4406:88b:3::22",
-      "kavlan-12": "2001:660:4406:88c:3::22",
-      "kavlan-13": "2001:660:4406:88d:3::22",
-      "kavlan-14": "2001:660:4406:88e:3::22",
-      "kavlan-16": "2001:660:4406:890:3::22",
-      "kavlan-18": "2001:660:4406:892:3::22",
-      "kavlan-2": "2001:660:4406:882:3::22",
-      "kavlan-20": "2001:660:4406:894:3::22",
-      "kavlan-21": "2001:660:4406:895:3::22",
-      "kavlan-3": "2001:660:4406:883:3::22",
-      "kavlan-4": "2001:660:4406:884:3::22",
-      "kavlan-5": "2001:660:4406:885:3::22",
-      "kavlan-6": "2001:660:4406:886:3::22",
-      "kavlan-7": "2001:660:4406:887:3::22",
-      "kavlan-8": "2001:660:4406:888:3::22",
-      "kavlan-9": "2001:660:4406:889:3::22"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.34",
-      "ip6": "2001:660:4406:800:3::22",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:49:5f",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-34.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/17",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:49:60",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.34",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:49:61",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-34-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b9037554200193b6e6c04f7c43d",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-34"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
deleted file mode 100644
index bd2c09f1aa8a228d404a58e0cfa2a16d25da7301..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "B4JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.35",
-      "kavlan-11": "10.7.233.35",
-      "kavlan-12": "10.11.233.35",
-      "kavlan-13": "10.15.233.35",
-      "kavlan-14": "10.19.233.35",
-      "kavlan-16": "10.27.233.35",
-      "kavlan-18": "10.35.233.35",
-      "kavlan-2": "192.168.208.35",
-      "kavlan-20": "10.43.233.35",
-      "kavlan-21": "10.47.233.35",
-      "kavlan-3": "192.168.224.35",
-      "kavlan-4": "10.32.0.35",
-      "kavlan-5": "10.32.64.35",
-      "kavlan-6": "10.32.128.35",
-      "kavlan-7": "10.32.192.35",
-      "kavlan-8": "10.33.0.35",
-      "kavlan-9": "10.33.64.35"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::23",
-      "kavlan-11": "2001:660:4406:88b:3::23",
-      "kavlan-12": "2001:660:4406:88c:3::23",
-      "kavlan-13": "2001:660:4406:88d:3::23",
-      "kavlan-14": "2001:660:4406:88e:3::23",
-      "kavlan-16": "2001:660:4406:890:3::23",
-      "kavlan-18": "2001:660:4406:892:3::23",
-      "kavlan-2": "2001:660:4406:882:3::23",
-      "kavlan-20": "2001:660:4406:894:3::23",
-      "kavlan-21": "2001:660:4406:895:3::23",
-      "kavlan-3": "2001:660:4406:883:3::23",
-      "kavlan-4": "2001:660:4406:884:3::23",
-      "kavlan-5": "2001:660:4406:885:3::23",
-      "kavlan-6": "2001:660:4406:886:3::23",
-      "kavlan-7": "2001:660:4406:887:3::23",
-      "kavlan-8": "2001:660:4406:888:3::23",
-      "kavlan-9": "2001:660:4406:889:3::23"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.35",
-      "ip6": "2001:660:4406:800:3::23",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:3f:1c",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-35.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet6/18",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:3f:1d",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.35",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:3f:1e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-35-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903752c300218f34310af7656c",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-35"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
deleted file mode 100644
index d5f218951c4c485d77bf00697cc561ff53c9485b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "94JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.36",
-      "kavlan-11": "10.7.233.36",
-      "kavlan-12": "10.11.233.36",
-      "kavlan-13": "10.15.233.36",
-      "kavlan-14": "10.19.233.36",
-      "kavlan-16": "10.27.233.36",
-      "kavlan-18": "10.35.233.36",
-      "kavlan-2": "192.168.208.36",
-      "kavlan-20": "10.43.233.36",
-      "kavlan-21": "10.47.233.36",
-      "kavlan-3": "192.168.224.36",
-      "kavlan-4": "10.32.0.36",
-      "kavlan-5": "10.32.64.36",
-      "kavlan-6": "10.32.128.36",
-      "kavlan-7": "10.32.192.36",
-      "kavlan-8": "10.33.0.36",
-      "kavlan-9": "10.33.64.36"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::24",
-      "kavlan-11": "2001:660:4406:88b:3::24",
-      "kavlan-12": "2001:660:4406:88c:3::24",
-      "kavlan-13": "2001:660:4406:88d:3::24",
-      "kavlan-14": "2001:660:4406:88e:3::24",
-      "kavlan-16": "2001:660:4406:890:3::24",
-      "kavlan-18": "2001:660:4406:892:3::24",
-      "kavlan-2": "2001:660:4406:882:3::24",
-      "kavlan-20": "2001:660:4406:894:3::24",
-      "kavlan-21": "2001:660:4406:895:3::24",
-      "kavlan-3": "2001:660:4406:883:3::24",
-      "kavlan-4": "2001:660:4406:884:3::24",
-      "kavlan-5": "2001:660:4406:885:3::24",
-      "kavlan-6": "2001:660:4406:886:3::24",
-      "kavlan-7": "2001:660:4406:887:3::24",
-      "kavlan-8": "2001:660:4406:888:3::24",
-      "kavlan-9": "2001:660:4406:889:3::24"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.36",
-      "ip6": "2001:660:4406:800:3::24",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:4a:94",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-36.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet7/1",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4a:95",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.36",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4a:96",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-36-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903752b8001ab1cc6c054cea3f",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-36"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
deleted file mode 100644
index 0ee806887e316504275092413ef2de08ca8d1315..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "H4JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.37",
-      "kavlan-11": "10.7.233.37",
-      "kavlan-12": "10.11.233.37",
-      "kavlan-13": "10.15.233.37",
-      "kavlan-14": "10.19.233.37",
-      "kavlan-16": "10.27.233.37",
-      "kavlan-18": "10.35.233.37",
-      "kavlan-2": "192.168.208.37",
-      "kavlan-20": "10.43.233.37",
-      "kavlan-21": "10.47.233.37",
-      "kavlan-3": "192.168.224.37",
-      "kavlan-4": "10.32.0.37",
-      "kavlan-5": "10.32.64.37",
-      "kavlan-6": "10.32.128.37",
-      "kavlan-7": "10.32.192.37",
-      "kavlan-8": "10.33.0.37",
-      "kavlan-9": "10.33.64.37"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::25",
-      "kavlan-11": "2001:660:4406:88b:3::25",
-      "kavlan-12": "2001:660:4406:88c:3::25",
-      "kavlan-13": "2001:660:4406:88d:3::25",
-      "kavlan-14": "2001:660:4406:88e:3::25",
-      "kavlan-16": "2001:660:4406:890:3::25",
-      "kavlan-18": "2001:660:4406:892:3::25",
-      "kavlan-2": "2001:660:4406:882:3::25",
-      "kavlan-20": "2001:660:4406:894:3::25",
-      "kavlan-21": "2001:660:4406:895:3::25",
-      "kavlan-3": "2001:660:4406:883:3::25",
-      "kavlan-4": "2001:660:4406:884:3::25",
-      "kavlan-5": "2001:660:4406:885:3::25",
-      "kavlan-6": "2001:660:4406:886:3::25",
-      "kavlan-7": "2001:660:4406:887:3::25",
-      "kavlan-8": "2001:660:4406:888:3::25",
-      "kavlan-9": "2001:660:4406:889:3::25"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.37",
-      "ip6": "2001:660:4406:800:3::25",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:4b:2c",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-37.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet7/2",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4b:2d",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.37",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4b:2e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-37-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903752b50012c37180301342d2",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-37"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
deleted file mode 100644
index 3083daffaf5f37172d140781eba72cda71fb8142..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "34JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.38",
-      "kavlan-11": "10.7.233.38",
-      "kavlan-12": "10.11.233.38",
-      "kavlan-13": "10.15.233.38",
-      "kavlan-14": "10.19.233.38",
-      "kavlan-16": "10.27.233.38",
-      "kavlan-18": "10.35.233.38",
-      "kavlan-2": "192.168.208.38",
-      "kavlan-20": "10.43.233.38",
-      "kavlan-21": "10.47.233.38",
-      "kavlan-3": "192.168.224.38",
-      "kavlan-4": "10.32.0.38",
-      "kavlan-5": "10.32.64.38",
-      "kavlan-6": "10.32.128.38",
-      "kavlan-7": "10.32.192.38",
-      "kavlan-8": "10.33.0.38",
-      "kavlan-9": "10.33.64.38"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::26",
-      "kavlan-11": "2001:660:4406:88b:3::26",
-      "kavlan-12": "2001:660:4406:88c:3::26",
-      "kavlan-13": "2001:660:4406:88d:3::26",
-      "kavlan-14": "2001:660:4406:88e:3::26",
-      "kavlan-16": "2001:660:4406:890:3::26",
-      "kavlan-18": "2001:660:4406:892:3::26",
-      "kavlan-2": "2001:660:4406:882:3::26",
-      "kavlan-20": "2001:660:4406:894:3::26",
-      "kavlan-21": "2001:660:4406:895:3::26",
-      "kavlan-3": "2001:660:4406:883:3::26",
-      "kavlan-4": "2001:660:4406:884:3::26",
-      "kavlan-5": "2001:660:4406:885:3::26",
-      "kavlan-6": "2001:660:4406:886:3::26",
-      "kavlan-7": "2001:660:4406:887:3::26",
-      "kavlan-8": "2001:660:4406:888:3::26",
-      "kavlan-9": "2001:660:4406:889:3::26"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.130.38",
-      "ip6": "2001:660:4406:800:3::26",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:44:b3",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-38.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet7/3",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:44:b4",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.38",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:44:b5",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-38-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903751180012c3718f30ecde74",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "rev": 1.22,
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-38"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
deleted file mode 100644
index 0715f047383ded099e7c88439856fa6c9385f170..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "J4JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.39",
-      "kavlan-11": "10.7.233.39",
-      "kavlan-12": "10.11.233.39",
-      "kavlan-13": "10.15.233.39",
-      "kavlan-14": "10.19.233.39",
-      "kavlan-16": "10.27.233.39",
-      "kavlan-18": "10.35.233.39",
-      "kavlan-2": "192.168.208.39",
-      "kavlan-20": "10.43.233.39",
-      "kavlan-21": "10.47.233.39",
-      "kavlan-3": "192.168.224.39",
-      "kavlan-4": "10.32.0.39",
-      "kavlan-5": "10.32.64.39",
-      "kavlan-6": "10.32.128.39",
-      "kavlan-7": "10.32.192.39",
-      "kavlan-8": "10.33.0.39",
-      "kavlan-9": "10.33.64.39"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::27",
-      "kavlan-11": "2001:660:4406:88b:3::27",
-      "kavlan-12": "2001:660:4406:88c:3::27",
-      "kavlan-13": "2001:660:4406:88d:3::27",
-      "kavlan-14": "2001:660:4406:88e:3::27",
-      "kavlan-16": "2001:660:4406:890:3::27",
-      "kavlan-18": "2001:660:4406:892:3::27",
-      "kavlan-2": "2001:660:4406:882:3::27",
-      "kavlan-20": "2001:660:4406:894:3::27",
-      "kavlan-21": "2001:660:4406:895:3::27",
-      "kavlan-3": "2001:660:4406:883:3::27",
-      "kavlan-4": "2001:660:4406:884:3::27",
-      "kavlan-5": "2001:660:4406:885:3::27",
-      "kavlan-6": "2001:660:4406:886:3::27",
-      "kavlan-7": "2001:660:4406:887:3::27",
-      "kavlan-8": "2001:660:4406:888:3::27",
-      "kavlan-9": "2001:660:4406:889:3::27"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.130.39",
-      "ip6": "2001:660:4406:800:3::27",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:4b:2f",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-39.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet7/4",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4b:30",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.39",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4b:31",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-39-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "rev": 1.22,
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-39"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
deleted file mode 100644
index a661cb8aacbb1542dfe8a10133d1e104420eafe7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "D5JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.4",
-      "kavlan-11": "10.7.233.4",
-      "kavlan-12": "10.11.233.4",
-      "kavlan-13": "10.15.233.4",
-      "kavlan-14": "10.19.233.4",
-      "kavlan-16": "10.27.233.4",
-      "kavlan-18": "10.35.233.4",
-      "kavlan-2": "192.168.208.4",
-      "kavlan-20": "10.43.233.4",
-      "kavlan-21": "10.47.233.4",
-      "kavlan-3": "192.168.224.4",
-      "kavlan-4": "10.32.0.4",
-      "kavlan-5": "10.32.64.4",
-      "kavlan-6": "10.32.128.4",
-      "kavlan-7": "10.32.192.4",
-      "kavlan-8": "10.33.0.4",
-      "kavlan-9": "10.33.64.4"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::4",
-      "kavlan-11": "2001:660:4406:88b:3::4",
-      "kavlan-12": "2001:660:4406:88c:3::4",
-      "kavlan-13": "2001:660:4406:88d:3::4",
-      "kavlan-14": "2001:660:4406:88e:3::4",
-      "kavlan-16": "2001:660:4406:890:3::4",
-      "kavlan-18": "2001:660:4406:892:3::4",
-      "kavlan-2": "2001:660:4406:882:3::4",
-      "kavlan-20": "2001:660:4406:894:3::4",
-      "kavlan-21": "2001:660:4406:895:3::4",
-      "kavlan-3": "2001:660:4406:883:3::4",
-      "kavlan-4": "2001:660:4406:884:3::4",
-      "kavlan-5": "2001:660:4406:885:3::4",
-      "kavlan-6": "2001:660:4406:886:3::4",
-      "kavlan-7": "2001:660:4406:887:3::4",
-      "kavlan-8": "2001:660:4406:888:3::4",
-      "kavlan-9": "2001:660:4406:889:3::4"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.4",
-      "ip6": "2001:660:4406:800:3::4",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:4a:6d",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-4.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/5",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4a:6e",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.4",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4a:6f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-4-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903750980012c36f8611dd5f41",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
deleted file mode 100644
index 12a780cdb1f711de9abec4450f826624eeb2891b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "65JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.40",
-      "kavlan-11": "10.7.233.40",
-      "kavlan-12": "10.11.233.40",
-      "kavlan-13": "10.15.233.40",
-      "kavlan-14": "10.19.233.40",
-      "kavlan-16": "10.27.233.40",
-      "kavlan-18": "10.35.233.40",
-      "kavlan-2": "192.168.208.40",
-      "kavlan-20": "10.43.233.40",
-      "kavlan-21": "10.47.233.40",
-      "kavlan-3": "192.168.224.40",
-      "kavlan-4": "10.32.0.40",
-      "kavlan-5": "10.32.64.40",
-      "kavlan-6": "10.32.128.40",
-      "kavlan-7": "10.32.192.40",
-      "kavlan-8": "10.33.0.40",
-      "kavlan-9": "10.33.64.40"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::28",
-      "kavlan-11": "2001:660:4406:88b:3::28",
-      "kavlan-12": "2001:660:4406:88c:3::28",
-      "kavlan-13": "2001:660:4406:88d:3::28",
-      "kavlan-14": "2001:660:4406:88e:3::28",
-      "kavlan-16": "2001:660:4406:890:3::28",
-      "kavlan-18": "2001:660:4406:892:3::28",
-      "kavlan-2": "2001:660:4406:882:3::28",
-      "kavlan-20": "2001:660:4406:894:3::28",
-      "kavlan-21": "2001:660:4406:895:3::28",
-      "kavlan-3": "2001:660:4406:883:3::28",
-      "kavlan-4": "2001:660:4406:884:3::28",
-      "kavlan-5": "2001:660:4406:885:3::28",
-      "kavlan-6": "2001:660:4406:886:3::28",
-      "kavlan-7": "2001:660:4406:887:3::28",
-      "kavlan-8": "2001:660:4406:888:3::28",
-      "kavlan-9": "2001:660:4406:889:3::28"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.130.40",
-      "ip6": "2001:660:4406:800:3::28",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:49:44",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-40.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet7/5",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:49:45",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.40",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:49:46",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-40-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903750610012c371ae32c6754d",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "rev": 1.22,
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-40"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
deleted file mode 100644
index 40e7815330120569444b12bcd3334c3593650e3b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "J3JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.41",
-      "kavlan-11": "10.7.233.41",
-      "kavlan-12": "10.11.233.41",
-      "kavlan-13": "10.15.233.41",
-      "kavlan-14": "10.19.233.41",
-      "kavlan-16": "10.27.233.41",
-      "kavlan-18": "10.35.233.41",
-      "kavlan-2": "192.168.208.41",
-      "kavlan-20": "10.43.233.41",
-      "kavlan-21": "10.47.233.41",
-      "kavlan-3": "192.168.224.41",
-      "kavlan-4": "10.32.0.41",
-      "kavlan-5": "10.32.64.41",
-      "kavlan-6": "10.32.128.41",
-      "kavlan-7": "10.32.192.41",
-      "kavlan-8": "10.33.0.41",
-      "kavlan-9": "10.33.64.41"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::29",
-      "kavlan-11": "2001:660:4406:88b:3::29",
-      "kavlan-12": "2001:660:4406:88c:3::29",
-      "kavlan-13": "2001:660:4406:88d:3::29",
-      "kavlan-14": "2001:660:4406:88e:3::29",
-      "kavlan-16": "2001:660:4406:890:3::29",
-      "kavlan-18": "2001:660:4406:892:3::29",
-      "kavlan-2": "2001:660:4406:882:3::29",
-      "kavlan-20": "2001:660:4406:894:3::29",
-      "kavlan-21": "2001:660:4406:895:3::29",
-      "kavlan-3": "2001:660:4406:883:3::29",
-      "kavlan-4": "2001:660:4406:884:3::29",
-      "kavlan-5": "2001:660:4406:885:3::29",
-      "kavlan-6": "2001:660:4406:886:3::29",
-      "kavlan-7": "2001:660:4406:887:3::29",
-      "kavlan-8": "2001:660:4406:888:3::29",
-      "kavlan-9": "2001:660:4406:889:3::29"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.130.41",
-      "ip6": "2001:660:4406:800:3::29",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:45:3a",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-41.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet7/6",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:45:3b",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.41",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:45:3c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-41-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b90374f250012c371bd33c3fc6d",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "rev": 1.22,
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-41"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
deleted file mode 100644
index 516b403a7764f6be00c027419c572fb562093492..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "93JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.42",
-      "kavlan-11": "10.7.233.42",
-      "kavlan-12": "10.11.233.42",
-      "kavlan-13": "10.15.233.42",
-      "kavlan-14": "10.19.233.42",
-      "kavlan-16": "10.27.233.42",
-      "kavlan-18": "10.35.233.42",
-      "kavlan-2": "192.168.208.42",
-      "kavlan-20": "10.43.233.42",
-      "kavlan-21": "10.47.233.42",
-      "kavlan-3": "192.168.224.42",
-      "kavlan-4": "10.32.0.42",
-      "kavlan-5": "10.32.64.42",
-      "kavlan-6": "10.32.128.42",
-      "kavlan-7": "10.32.192.42",
-      "kavlan-8": "10.33.0.42",
-      "kavlan-9": "10.33.64.42"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::2a",
-      "kavlan-11": "2001:660:4406:88b:3::2a",
-      "kavlan-12": "2001:660:4406:88c:3::2a",
-      "kavlan-13": "2001:660:4406:88d:3::2a",
-      "kavlan-14": "2001:660:4406:88e:3::2a",
-      "kavlan-16": "2001:660:4406:890:3::2a",
-      "kavlan-18": "2001:660:4406:892:3::2a",
-      "kavlan-2": "2001:660:4406:882:3::2a",
-      "kavlan-20": "2001:660:4406:894:3::2a",
-      "kavlan-21": "2001:660:4406:895:3::2a",
-      "kavlan-3": "2001:660:4406:883:3::2a",
-      "kavlan-4": "2001:660:4406:884:3::2a",
-      "kavlan-5": "2001:660:4406:885:3::2a",
-      "kavlan-6": "2001:660:4406:886:3::2a",
-      "kavlan-7": "2001:660:4406:887:3::2a",
-      "kavlan-8": "2001:660:4406:888:3::2a",
-      "kavlan-9": "2001:660:4406:889:3::2a"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.42",
-      "ip6": "2001:660:4406:800:3::2a",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:41:21",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-42.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet7/7",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:41:22",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.42",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:41:23",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-42-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903750230012c371cc349b16ce",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-42"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
deleted file mode 100644
index b125b118225ce45f3b1fcbe6fc30d53bf66c7a59..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "23JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.43",
-      "kavlan-11": "10.7.233.43",
-      "kavlan-12": "10.11.233.43",
-      "kavlan-13": "10.15.233.43",
-      "kavlan-14": "10.19.233.43",
-      "kavlan-16": "10.27.233.43",
-      "kavlan-18": "10.35.233.43",
-      "kavlan-2": "192.168.208.43",
-      "kavlan-20": "10.43.233.43",
-      "kavlan-21": "10.47.233.43",
-      "kavlan-3": "192.168.224.43",
-      "kavlan-4": "10.32.0.43",
-      "kavlan-5": "10.32.64.43",
-      "kavlan-6": "10.32.128.43",
-      "kavlan-7": "10.32.192.43",
-      "kavlan-8": "10.33.0.43",
-      "kavlan-9": "10.33.64.43"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::2b",
-      "kavlan-11": "2001:660:4406:88b:3::2b",
-      "kavlan-12": "2001:660:4406:88c:3::2b",
-      "kavlan-13": "2001:660:4406:88d:3::2b",
-      "kavlan-14": "2001:660:4406:88e:3::2b",
-      "kavlan-16": "2001:660:4406:890:3::2b",
-      "kavlan-18": "2001:660:4406:892:3::2b",
-      "kavlan-2": "2001:660:4406:882:3::2b",
-      "kavlan-20": "2001:660:4406:894:3::2b",
-      "kavlan-21": "2001:660:4406:895:3::2b",
-      "kavlan-3": "2001:660:4406:883:3::2b",
-      "kavlan-4": "2001:660:4406:884:3::2b",
-      "kavlan-5": "2001:660:4406:885:3::2b",
-      "kavlan-6": "2001:660:4406:886:3::2b",
-      "kavlan-7": "2001:660:4406:887:3::2b",
-      "kavlan-8": "2001:660:4406:888:3::2b",
-      "kavlan-9": "2001:660:4406:889:3::2b"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.43",
-      "ip6": "2001:660:4406:800:3::2b",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:3e:95",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-43.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet7/8",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:3e:96",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.43",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:3e:97",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-43-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b9037553d001abeb94f2fdc575d",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-43"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
deleted file mode 100644
index 70e6ccedfb9a495cb306c0bf7f1ce27d4db2a1cc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "B3JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.44",
-      "kavlan-11": "10.7.233.44",
-      "kavlan-12": "10.11.233.44",
-      "kavlan-13": "10.15.233.44",
-      "kavlan-14": "10.19.233.44",
-      "kavlan-16": "10.27.233.44",
-      "kavlan-18": "10.35.233.44",
-      "kavlan-2": "192.168.208.44",
-      "kavlan-20": "10.43.233.44",
-      "kavlan-21": "10.47.233.44",
-      "kavlan-3": "192.168.224.44",
-      "kavlan-4": "10.32.0.44",
-      "kavlan-5": "10.32.64.44",
-      "kavlan-6": "10.32.128.44",
-      "kavlan-7": "10.32.192.44",
-      "kavlan-8": "10.33.0.44",
-      "kavlan-9": "10.33.64.44"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::2c",
-      "kavlan-11": "2001:660:4406:88b:3::2c",
-      "kavlan-12": "2001:660:4406:88c:3::2c",
-      "kavlan-13": "2001:660:4406:88d:3::2c",
-      "kavlan-14": "2001:660:4406:88e:3::2c",
-      "kavlan-16": "2001:660:4406:890:3::2c",
-      "kavlan-18": "2001:660:4406:892:3::2c",
-      "kavlan-2": "2001:660:4406:882:3::2c",
-      "kavlan-20": "2001:660:4406:894:3::2c",
-      "kavlan-21": "2001:660:4406:895:3::2c",
-      "kavlan-3": "2001:660:4406:883:3::2c",
-      "kavlan-4": "2001:660:4406:884:3::2c",
-      "kavlan-5": "2001:660:4406:885:3::2c",
-      "kavlan-6": "2001:660:4406:886:3::2c",
-      "kavlan-7": "2001:660:4406:887:3::2c",
-      "kavlan-8": "2001:660:4406:888:3::2c",
-      "kavlan-9": "2001:660:4406:889:3::2c"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.44",
-      "ip6": "2001:660:4406:800:3::2c",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:45:2e",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-44.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet7/9",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:45:2f",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.44",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:45:30",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-44-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b9037555a001f07f143053bf158",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-44"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
deleted file mode 100644
index 06a65aa371082754540a2a1eb75b1fe6c5bdb9c9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "25JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.45",
-      "kavlan-11": "10.7.233.45",
-      "kavlan-12": "10.11.233.45",
-      "kavlan-13": "10.15.233.45",
-      "kavlan-14": "10.19.233.45",
-      "kavlan-16": "10.27.233.45",
-      "kavlan-18": "10.35.233.45",
-      "kavlan-2": "192.168.208.45",
-      "kavlan-20": "10.43.233.45",
-      "kavlan-21": "10.47.233.45",
-      "kavlan-3": "192.168.224.45",
-      "kavlan-4": "10.32.0.45",
-      "kavlan-5": "10.32.64.45",
-      "kavlan-6": "10.32.128.45",
-      "kavlan-7": "10.32.192.45",
-      "kavlan-8": "10.33.0.45",
-      "kavlan-9": "10.33.64.45"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::2d",
-      "kavlan-11": "2001:660:4406:88b:3::2d",
-      "kavlan-12": "2001:660:4406:88c:3::2d",
-      "kavlan-13": "2001:660:4406:88d:3::2d",
-      "kavlan-14": "2001:660:4406:88e:3::2d",
-      "kavlan-16": "2001:660:4406:890:3::2d",
-      "kavlan-18": "2001:660:4406:892:3::2d",
-      "kavlan-2": "2001:660:4406:882:3::2d",
-      "kavlan-20": "2001:660:4406:894:3::2d",
-      "kavlan-21": "2001:660:4406:895:3::2d",
-      "kavlan-3": "2001:660:4406:883:3::2d",
-      "kavlan-4": "2001:660:4406:884:3::2d",
-      "kavlan-5": "2001:660:4406:885:3::2d",
-      "kavlan-6": "2001:660:4406:886:3::2d",
-      "kavlan-7": "2001:660:4406:887:3::2d",
-      "kavlan-8": "2001:660:4406:888:3::2d",
-      "kavlan-9": "2001:660:4406:889:3::2d"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.130.45",
-      "ip6": "2001:660:4406:800:3::2d",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:47:7b",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-45.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet7/10",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:47:7c",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.45",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:47:7d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-45-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "rev": 1.22,
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-45"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
deleted file mode 100644
index ec27906928b9a5efdc99cabd071f87e33acd76aa..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "73JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.5",
-      "kavlan-11": "10.7.233.5",
-      "kavlan-12": "10.11.233.5",
-      "kavlan-13": "10.15.233.5",
-      "kavlan-14": "10.19.233.5",
-      "kavlan-16": "10.27.233.5",
-      "kavlan-18": "10.35.233.5",
-      "kavlan-2": "192.168.208.5",
-      "kavlan-20": "10.43.233.5",
-      "kavlan-21": "10.47.233.5",
-      "kavlan-3": "192.168.224.5",
-      "kavlan-4": "10.32.0.5",
-      "kavlan-5": "10.32.64.5",
-      "kavlan-6": "10.32.128.5",
-      "kavlan-7": "10.32.192.5",
-      "kavlan-8": "10.33.0.5",
-      "kavlan-9": "10.33.64.5"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::5",
-      "kavlan-11": "2001:660:4406:88b:3::5",
-      "kavlan-12": "2001:660:4406:88c:3::5",
-      "kavlan-13": "2001:660:4406:88d:3::5",
-      "kavlan-14": "2001:660:4406:88e:3::5",
-      "kavlan-16": "2001:660:4406:890:3::5",
-      "kavlan-18": "2001:660:4406:892:3::5",
-      "kavlan-2": "2001:660:4406:882:3::5",
-      "kavlan-20": "2001:660:4406:894:3::5",
-      "kavlan-21": "2001:660:4406:895:3::5",
-      "kavlan-3": "2001:660:4406:883:3::5",
-      "kavlan-4": "2001:660:4406:884:3::5",
-      "kavlan-5": "2001:660:4406:885:3::5",
-      "kavlan-6": "2001:660:4406:886:3::5",
-      "kavlan-7": "2001:660:4406:887:3::5",
-      "kavlan-8": "2001:660:4406:888:3::5",
-      "kavlan-9": "2001:660:4406:889:3::5"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.130.5",
-      "ip6": "2001:660:4406:800:3::5",
-      "kavlan": true,
-      "mac": "00:26:b9:3e:e8:58",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-5.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/4",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3e:e8:59",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.5",
-      "kavlan": false,
-      "mac": "00:26:b9:3e:e8:5a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-5-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "rev": 1.22,
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-5"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
deleted file mode 100644
index 5433e5b39a98e44ed232cf6da07e28af6ab2b068..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "G3JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.6",
-      "kavlan-11": "10.7.233.6",
-      "kavlan-12": "10.11.233.6",
-      "kavlan-13": "10.15.233.6",
-      "kavlan-14": "10.19.233.6",
-      "kavlan-16": "10.27.233.6",
-      "kavlan-18": "10.35.233.6",
-      "kavlan-2": "192.168.208.6",
-      "kavlan-20": "10.43.233.6",
-      "kavlan-21": "10.47.233.6",
-      "kavlan-3": "192.168.224.6",
-      "kavlan-4": "10.32.0.6",
-      "kavlan-5": "10.32.64.6",
-      "kavlan-6": "10.32.128.6",
-      "kavlan-7": "10.32.192.6",
-      "kavlan-8": "10.33.0.6",
-      "kavlan-9": "10.33.64.6"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::6",
-      "kavlan-11": "2001:660:4406:88b:3::6",
-      "kavlan-12": "2001:660:4406:88c:3::6",
-      "kavlan-13": "2001:660:4406:88d:3::6",
-      "kavlan-14": "2001:660:4406:88e:3::6",
-      "kavlan-16": "2001:660:4406:890:3::6",
-      "kavlan-18": "2001:660:4406:892:3::6",
-      "kavlan-2": "2001:660:4406:882:3::6",
-      "kavlan-20": "2001:660:4406:894:3::6",
-      "kavlan-21": "2001:660:4406:895:3::6",
-      "kavlan-3": "2001:660:4406:883:3::6",
-      "kavlan-4": "2001:660:4406:884:3::6",
-      "kavlan-5": "2001:660:4406:885:3::6",
-      "kavlan-6": "2001:660:4406:886:3::6",
-      "kavlan-7": "2001:660:4406:887:3::6",
-      "kavlan-8": "2001:660:4406:888:3::6",
-      "kavlan-9": "2001:660:4406:889:3::6"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.130.6",
-      "ip6": "2001:660:4406:800:3::6",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:40:af",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-6.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/7",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:40:b0",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.6",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:40:b1",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-6-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "rev": 1.22,
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-6"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
deleted file mode 100644
index 3254a28f878dc4a349ab23ede5b4cbb5ac092e6d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "64JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.7",
-      "kavlan-11": "10.7.233.7",
-      "kavlan-12": "10.11.233.7",
-      "kavlan-13": "10.15.233.7",
-      "kavlan-14": "10.19.233.7",
-      "kavlan-16": "10.27.233.7",
-      "kavlan-18": "10.35.233.7",
-      "kavlan-2": "192.168.208.7",
-      "kavlan-20": "10.43.233.7",
-      "kavlan-21": "10.47.233.7",
-      "kavlan-3": "192.168.224.7",
-      "kavlan-4": "10.32.0.7",
-      "kavlan-5": "10.32.64.7",
-      "kavlan-6": "10.32.128.7",
-      "kavlan-7": "10.32.192.7",
-      "kavlan-8": "10.33.0.7",
-      "kavlan-9": "10.33.64.7"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::7",
-      "kavlan-11": "2001:660:4406:88b:3::7",
-      "kavlan-12": "2001:660:4406:88c:3::7",
-      "kavlan-13": "2001:660:4406:88d:3::7",
-      "kavlan-14": "2001:660:4406:88e:3::7",
-      "kavlan-16": "2001:660:4406:890:3::7",
-      "kavlan-18": "2001:660:4406:892:3::7",
-      "kavlan-2": "2001:660:4406:882:3::7",
-      "kavlan-20": "2001:660:4406:894:3::7",
-      "kavlan-21": "2001:660:4406:895:3::7",
-      "kavlan-3": "2001:660:4406:883:3::7",
-      "kavlan-4": "2001:660:4406:884:3::7",
-      "kavlan-5": "2001:660:4406:885:3::7",
-      "kavlan-6": "2001:660:4406:886:3::7",
-      "kavlan-7": "2001:660:4406:887:3::7",
-      "kavlan-8": "2001:660:4406:888:3::7",
-      "kavlan-9": "2001:660:4406:889:3::7"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.7",
-      "ip6": "2001:660:4406:800:3::7",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:43:a1",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-7.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/8",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:43:a2",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.7",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:43:a3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-7-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b903752c40012c36fb414ae8263",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-7"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
deleted file mode 100644
index d1c877f3c1428696b16b02418a26bfe1ff90873d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "C3JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.8",
-      "kavlan-11": "10.7.233.8",
-      "kavlan-12": "10.11.233.8",
-      "kavlan-13": "10.15.233.8",
-      "kavlan-14": "10.19.233.8",
-      "kavlan-16": "10.27.233.8",
-      "kavlan-18": "10.35.233.8",
-      "kavlan-2": "192.168.208.8",
-      "kavlan-20": "10.43.233.8",
-      "kavlan-21": "10.47.233.8",
-      "kavlan-3": "192.168.224.8",
-      "kavlan-4": "10.32.0.8",
-      "kavlan-5": "10.32.64.8",
-      "kavlan-6": "10.32.128.8",
-      "kavlan-7": "10.32.192.8",
-      "kavlan-8": "10.33.0.8",
-      "kavlan-9": "10.33.64.8"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::8",
-      "kavlan-11": "2001:660:4406:88b:3::8",
-      "kavlan-12": "2001:660:4406:88c:3::8",
-      "kavlan-13": "2001:660:4406:88d:3::8",
-      "kavlan-14": "2001:660:4406:88e:3::8",
-      "kavlan-16": "2001:660:4406:890:3::8",
-      "kavlan-18": "2001:660:4406:892:3::8",
-      "kavlan-2": "2001:660:4406:882:3::8",
-      "kavlan-20": "2001:660:4406:894:3::8",
-      "kavlan-21": "2001:660:4406:895:3::8",
-      "kavlan-3": "2001:660:4406:883:3::8",
-      "kavlan-4": "2001:660:4406:884:3::8",
-      "kavlan-5": "2001:660:4406:885:3::8",
-      "kavlan-6": "2001:660:4406:886:3::8",
-      "kavlan-7": "2001:660:4406:887:3::8",
-      "kavlan-8": "2001:660:4406:888:3::8",
-      "kavlan-9": "2001:660:4406:889:3::8"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.8",
-      "ip6": "2001:660:4406:800:3::8",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:4a:3d",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-8.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/12",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4a:3e",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.8",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:4a:3f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-8-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b9037556b001da7a21d04c951a9",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-8"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
deleted file mode 100644
index 487ec04028f7c17cf0ab86f0dc92f7d1b43488d1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "07/29/2009",
-    "vendor": "Dell Inc.",
-    "version": "1.1.5"
-  },
-  "bmc_version": "1.21",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R410",
-    "serial": "83JPH4J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.9",
-      "kavlan-11": "10.7.233.9",
-      "kavlan-12": "10.11.233.9",
-      "kavlan-13": "10.15.233.9",
-      "kavlan-14": "10.19.233.9",
-      "kavlan-16": "10.27.233.9",
-      "kavlan-18": "10.35.233.9",
-      "kavlan-2": "192.168.208.9",
-      "kavlan-20": "10.43.233.9",
-      "kavlan-21": "10.47.233.9",
-      "kavlan-3": "192.168.224.9",
-      "kavlan-4": "10.32.0.9",
-      "kavlan-5": "10.32.64.9",
-      "kavlan-6": "10.32.128.9",
-      "kavlan-7": "10.32.192.9",
-      "kavlan-8": "10.33.0.9",
-      "kavlan-9": "10.33.64.9"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:881:3::9",
-      "kavlan-11": "2001:660:4406:88b:3::9",
-      "kavlan-12": "2001:660:4406:88c:3::9",
-      "kavlan-13": "2001:660:4406:88d:3::9",
-      "kavlan-14": "2001:660:4406:88e:3::9",
-      "kavlan-16": "2001:660:4406:890:3::9",
-      "kavlan-18": "2001:660:4406:892:3::9",
-      "kavlan-2": "2001:660:4406:882:3::9",
-      "kavlan-20": "2001:660:4406:894:3::9",
-      "kavlan-21": "2001:660:4406:895:3::9",
-      "kavlan-3": "2001:660:4406:883:3::9",
-      "kavlan-4": "2001:660:4406:884:3::9",
-      "kavlan-5": "2001:660:4406:885:3::9",
-      "kavlan-6": "2001:660:4406:886:3::9",
-      "kavlan-7": "2001:660:4406:887:3::9",
-      "kavlan-8": "2001:660:4406:888:3::9",
-      "kavlan-9": "2001:660:4406:889:3::9"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "ip": "172.16.130.9",
-      "ip6": "2001:660:4406:800:3::9",
-      "kavlan": true,
-      "mac": "00:26:b9:3f:41:27",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "suno-9.sophia.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet5/9",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": false,
-      "firmware_version": "5.0.9 bc 5.0.6 NCSI 2.0.3",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:41:28",
-      "management": false,
-      "model": "NetXtreme II BCM5716 Gigabit Ethernet",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "vendor": "Broadcom"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.130.9",
-      "kavlan": false,
-      "mac": "00:26:b9:3f:41:29",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "suno-9-bmc.sophia.grid5000.fr",
-      "rate": 100000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 9000000000,
-    "node_flops": 72000000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2250000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "microcode": "0x1d",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x60026b90374f1e001f07ebefbd64ae7e",
-      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
-      "device": "sda",
-      "firmware_version": 1.22,
-      "interface": "SAS",
-      "model": "PERC 6/i Adapter",
-      "raid": "0",
-      "size": 598879502336,
-      "storage": "HDD",
-      "vendor": "Dell (Raid)"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "suno-9"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/suno.json b/data/grid5000/sites/sophia/clusters/suno/suno.json
deleted file mode 100644
index 2af75c502cf302ab9483d708d747dd3c1046e392..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/clusters/suno/suno.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{
-  "created_at": "Wed, 27 Jan 2010 00:00:00 GMT",
-  "exotic": false,
-  "kavlan": true,
-  "metrics": [
-    {
-      "description": "Front node ambiant temperature reported by BMC, in celsius",
-      "name": "bmc_temp_ambiant_celsius",
-      "period": 5000,
-      "source": {
-        "id": 10,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 1A reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod1a"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 33,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 1B reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod1b"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 34,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 2A reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod2a"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 35,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 2B reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod2b"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 36,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 3A reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod3a"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 37,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 3B reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod3b"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 38,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 4A reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod4a"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 39,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 4B reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod4b"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 40,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Input byte counter for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    }
-  ],
-  "model": "Dell PowerEdge R410",
-  "queues": [
-    "default",
-    "admin"
-  ],
-  "type": "cluster",
-  "uid": "suno"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index 9b348dff4d31dd86804ad075dde30a0564f4c075..9b3e0478428233e921eda05ae1ac981c39b3ce87 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -36,126 +36,6 @@
     {
     },
     {
-      "backplane_bps": 24000000000,
-      "kavlan_pattern": "%LINECARD%/%PORT%",
-      "kind": "node",
-      "port": "eth0",
-      "ports": [
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/1",
-          "uid": "suno-3"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/2",
-          "uid": "suno-11"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/3",
-          "uid": "suno-10"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/4",
-          "uid": "suno-5"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/5",
-          "uid": "suno-4"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/6",
-          "uid": "suno-12"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/7",
-          "uid": "suno-6"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/8",
-          "uid": "suno-7"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/9",
-          "uid": "suno-9"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/10",
-          "uid": "suno-1"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/11",
-          "uid": "suno-2"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/12",
-          "uid": "suno-8"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/13",
-          "uid": "suno-13"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/15",
-          "uid": "suno-17"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/17",
-          "uid": "suno-15"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/19",
-          "uid": "suno-14"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet5/21",
-          "uid": "suno-16"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
     },
     {
       "backplane_bps": 24000000000,
@@ -166,112 +46,40 @@
         {
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/1",
-          "uid": "suno-18"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/2",
-          "uid": "suno-19"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/3",
-          "uid": "suno-20"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/4",
-          "uid": "suno-21"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/5",
-          "uid": "suno-22"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/6",
-          "uid": "suno-23"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/7",
-          "uid": "suno-24"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/8",
-          "uid": "suno-25"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/9",
-          "uid": "suno-26"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/10",
-          "uid": "suno-27"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/11",
-          "uid": "suno-28"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/12",
-          "uid": "suno-29"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/13",
-          "uid": "suno-30"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/14",
-          "uid": "suno-31"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/15",
-          "uid": "suno-32"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/16",
-          "uid": "suno-33"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/17",
-          "uid": "suno-34"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet6/18",
-          "uid": "suno-35"
         },
         {
           "kind": "server",
@@ -321,64 +129,24 @@
         {
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet7/1",
-          "uid": "suno-36"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet7/2",
-          "uid": "suno-37"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet7/3",
-          "uid": "suno-38"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet7/4",
-          "uid": "suno-39"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet7/5",
-          "uid": "suno-40"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet7/6",
-          "uid": "suno-41"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet7/7",
-          "uid": "suno-42"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet7/8",
-          "uid": "suno-43"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet7/9",
-          "uid": "suno-44"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet7/10",
-          "uid": "suno-45"
         },
         {
         },
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index b6071908cb09d185d02f31e89de44e4848d970cc..b854c8aacd1d1a6b4c5c9a6ce24802409fc57cc0 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -64,5 +64,4 @@ ipv4:
       rennes paravance eth1 0 0 0 100
       rennes parasilo eth0 0 0 1 0
       rennes parasilo eth1 0 0 1 100
-      sophia suno eth0 0 0 2 0
       sophia uvb eth0 0 0 4 0
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
deleted file mode 100644
index d3db296645ed73de6c85e91852b09bbd3836ebc4..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-1:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: "..CN137409BN01JJ."
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.1
-      mac: 00:26:b9:58:e6:84
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.12 bc 5.0.11 NCSI 2.0.5
-      interface: Ethernet
-      ip: 172.16.130.1
-      mac: 00:26:b9:58:e6:82
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.12 bc 5.0.11 NCSI 2.0.5
-      interface: Ethernet
-      mac: 00:26:b9:58:e6:83
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903752e5001f07d1950b91b9e1"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
deleted file mode 100644
index 0cb058e0ad37d068e1b50e378743ff4dc23f4879..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-10:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: G4JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.10
-      mac: 00:26:b9:3f:49:67
-      management: true
-    eth0:
-      driver: bnx2
-      interface: Ethernet
-      ip: 172.16.130.10
-      mac: 00:26:b9:3f:49:65
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      interface: Ethernet
-      mac: 00:26:b9:3f:49:66
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      rev: 1.22
-      size: 598879502336
-      by_id: node-was-not-available-to-retrieve-this-value
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
deleted file mode 100644
index 88a3eb4608996b3f9d1fa25b67230f0d9bea686b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-11:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.06'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: H3JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.11
-      mac: 00:26:b9:3f:47:0e
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.11
-      mac: 00:26:b9:3f:47:0c
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:47:0d
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b9037553e001c8b46ff22e4be68"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
deleted file mode 100644
index 4c7c0c0fbb36afb32b9b34fa73c8d8754e5e0ce0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-12:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 45JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.12
-      mac: 00:26:b9:3f:49:5e
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.12
-      mac: 00:26:b9:3f:49:5c
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:49:5d
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b90345bff001f07e13f08f10e11"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
deleted file mode 100644
index 945ef6974aece0a6e245167ad69846dbd804f643..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-13:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 15JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.13
-      mac: 00:26:b9:3f:4c:7a
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.13
-      mac: 00:26:b9:3f:4c:78
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:4c:79
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903752bb001f07d07a82c2d95c"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
deleted file mode 100644
index 16dbe54f4d8d4e2a91e7ac978850f18f04136576..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-14:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 95JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.14
-      mac: 00:26:b9:3f:4a:63
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.14
-      mac: 00:26:b9:3f:4a:61
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:4a:62
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b9037505c001d2659c6080c88f0"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
deleted file mode 100644
index 15c54a74d17c5845538a59d7fc9901c72ed6cdaf..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-15:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: F3JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.15
-      mac: 00:26:b9:3f:44:8b
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.15
-      mac: 00:26:b9:3f:44:89
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:44:8a
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b9037502e001abeb484fac1b82e"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
deleted file mode 100644
index e1fe1d80647bc12a13cf40dceee7c19a0385ea92..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-16:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 33JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.16
-      mac: 00:26:b9:3f:41:0e
-      management: true
-    eth0:
-      driver: bnx2
-      interface: Ethernet
-      ip: 172.16.130.16
-      mac: 00:26:b9:3f:41:0c
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:41:0d
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      rev: 1.22
-      size: 598879502336
-      by_id: node-was-not-available-to-retrieve-this-value
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
deleted file mode 100644
index e7c3e18f8d95b94c33dd83f32c6d530a0e06bd4e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-17:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 54JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.17
-      mac: 00:26:b9:3f:47:dd
-      management: true
-    eth0:
-      driver: bnx2
-      interface: Ethernet
-      ip: 172.16.130.17
-      mac: 00:26:b9:3f:47:db
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      interface: Ethernet
-      mac: 00:26:b9:3f:47:dc
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      rev: 1.22
-      size: 598879502336
-      by_id: node-was-not-available-to-retrieve-this-value
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
deleted file mode 100644
index 0b428f4bf1a63ee5fd9a486e36ab637856eea38e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-18:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 13JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.18
-      mac: 00:26:b9:35:c4:85
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.18
-      mac: 00:26:b9:35:c4:83
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:35:c4:84
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b90375548002036e77b0b99af8e"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
deleted file mode 100644
index ec72ea940e186b3628d9f421da9926b3722caa59..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-19:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 74JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.19
-      mac: 00:26:b9:3f:40:69
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.19
-      mac: 00:26:b9:3f:40:67
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:40:68
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903752b40012c3706c1f9e4287"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
deleted file mode 100644
index 5dd5002e479fd064df7a87240747c19e8f091841..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-2:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.06'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: B5JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.2
-      mac: 00:26:b9:3f:49:3a
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.2
-      mac: 00:26:b9:3f:49:38
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:49:39
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903750640012c36dd864a1d4d4"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
deleted file mode 100644
index 3558e8b1faed7026c0bb76dc5456e26e49aaa645..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-20:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 43JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.20
-      mac: 00:26:b9:3f:46:14
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.20
-      mac: 00:26:b9:3f:46:12
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:46:13
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b90375559001cff17810e7bffbf"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
deleted file mode 100644
index 155578cf62d0bfa73007566da6ff8477da23306a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-21:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 85JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.21
-      mac: 00:26:b9:3f:3f:fd
-      management: true
-    eth0:
-      driver: bnx2
-      interface: Ethernet
-      ip: 172.16.130.21
-      mac: 00:26:b9:3f:3f:fb
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      interface: Ethernet
-      mac: 00:26:b9:3f:3f:fc
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      rev: 1.22
-      size: 598879502336
-      by_id: node-was-not-available-to-retrieve-this-value
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
deleted file mode 100644
index d2a85811b7c13acef30b69870b25b2f31cd27617..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-22:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 55JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.22
-      mac: 00:26:b9:3f:47:68
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.22
-      mac: 00:26:b9:3f:47:66
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:47:67
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b9034f3ae001abeb7e77adf567a"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
deleted file mode 100644
index bdeca486ad81a247d06b8640b8e25fa326b1939a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-23:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: C5JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.23
-      mac: 00:26:b9:3f:4a:de
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.23
-      mac: 00:26:b9:3f:4a:dc
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:4a:dd
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b90375070001d2005e9ae2d7fce"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
deleted file mode 100644
index 4e7734414ae3bc4741c7015d0f4e2769d30e7b0d..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-24:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 24JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.24
-      mac: 00:26:b9:3f:47:b6
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.24
-      mac: 00:26:b9:3f:47:b4
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:47:b5
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903752c6001cff19b50975e083"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
deleted file mode 100644
index c7825a08cd48d828240835f4c784a64c7d67347a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-25:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 44JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.25
-      mac: 00:26:b9:3f:47:a4
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.25
-      mac: 00:26:b9:3f:47:a2
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:47:a3
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903752c9001d20088209806520"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
deleted file mode 100644
index 3605d1877c2329226ed949726e1eccff873aa133..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-26:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 75JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.26
-      mac: 00:26:b9:3f:4b:4f
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.26
-      mac: 00:26:b9:3f:4b:4d
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:4b:4e
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903750430012c370d725fb5385"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
deleted file mode 100644
index b14049c4e5f9d1e8254ee6378add61e9ed991db5..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-27:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 35JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.27
-      mac: 00:26:b9:3f:4b:64
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.27
-      mac: 00:26:b9:3f:4b:62
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:4b:63
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903752ac001f07d212a17021f6"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
deleted file mode 100644
index 9d4e11c5e0ebed17743fbc427ced306d86070b73..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-28:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: F4JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.28
-      mac: 00:26:b9:3f:49:58
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.28
-      mac: 00:26:b9:3f:49:56
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:49:57
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903752b70022be8dd307926bd4"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
deleted file mode 100644
index 3e3649c5a111f682af4dfed3445563e4895221c8..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-29:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: D3JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.29
-      mac: 00:26:b9:3f:47:bc
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.29
-      mac: 00:26:b9:3f:47:ba
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:47:bb
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903755440012c3703e1ce84dfb"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
deleted file mode 100644
index fc517e427c9f388ce78deec2e362f061feccff5a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-3:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 14JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.3
-      mac: 00:26:b9:3f:4a:60
-      management: true
-    eth0:
-      driver: bnx2
-      interface: Ethernet
-      ip: 172.16.130.3
-      mac: 00:26:b9:3f:4a:5e
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      interface: Ethernet
-      mac: 00:26:b9:3f:4a:5f
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      rev: 1.22
-      size: 598879502336
-      by_id: node-was-not-available-to-retrieve-this-value
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
deleted file mode 100644
index 7b8cf1ac1c1225b173a74296c6c9d906bdf5d1fe..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-30:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 63JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.30
-      mac: 00:26:b9:3f:41:32
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.30
-      mac: 00:26:b9:3f:41:30
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:41:31
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b90375551001abeb87191b2bd58"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
deleted file mode 100644
index 11106f08e46517de77947625853dd7d68cbec8dc..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-31:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: C4JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.31
-      mac: 00:26:b9:3f:4b:58
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.31
-      mac: 00:26:b9:3f:4b:56
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:4b:57
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903752c10012c371242a8acfe9"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
deleted file mode 100644
index 71e30cf1e901e8f2757856f36c69ee4be7bd3142..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-32:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: F5JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.32
-      mac: 00:26:b9:3f:44:6a
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.32
-      mac: 00:26:b9:3f:44:68
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:44:69
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b90375073001ab1b68e04dc42da"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
deleted file mode 100644
index 06c2e38d89b87b5ce9d7e68579d96b71f005c55b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-33:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.06'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 84JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.33
-      mac: 00:26:b9:3f:3f:69
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.33
-      mac: 00:26:b9:3f:3f:67
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:3f:68
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903752be001abeb9ec04a967d6"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
deleted file mode 100644
index 182a2b611e5ebd734408ee0555d23d62db06f4de..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-34:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.06'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 53JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.34
-      mac: 00:26:b9:3f:49:61
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.34
-      mac: 00:26:b9:3f:49:5f
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:49:60
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b9037554200193b6e6c04f7c43d"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
deleted file mode 100644
index d44e66190acbcc0daa3108e851a8aa6f35887de2..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-35:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: B4JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.35
-      mac: 00:26:b9:3f:3f:1e
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.35
-      mac: 00:26:b9:3f:3f:1c
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:3f:1d
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903752c300218f34310af7656c"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
deleted file mode 100644
index 95bd8caa5364586fa913c000e8e13c430571e0e8..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-36:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 94JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.36
-      mac: 00:26:b9:3f:4a:96
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.36
-      mac: 00:26:b9:3f:4a:94
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:4a:95
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903752b8001ab1cc6c054cea3f"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
deleted file mode 100644
index 8aed41b8e958bf5b47fef6b9d7428373b493daaf..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-37:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: H4JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.37
-      mac: 00:26:b9:3f:4b:2e
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.37
-      mac: 00:26:b9:3f:4b:2c
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:4b:2d
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903752b50012c37180301342d2"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
deleted file mode 100644
index 6ccc04a13e6009f3c60c7521d7fe43428e695cf4..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-38:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 34JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.38
-      mac: 00:26:b9:3f:44:b5
-      management: true
-    eth0:
-      driver: bnx2
-      interface: Ethernet
-      ip: 172.16.130.38
-      mac: 00:26:b9:3f:44:b3
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      interface: Ethernet
-      mac: 00:26:b9:3f:44:b4
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903751180012c3718f30ecde74"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      model: PERC 6/i Adapter
-      rev: 1.22
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
deleted file mode 100644
index 78c0a5b742fe8d394fd28dd90515293ed1da8a35..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-39:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: J4JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.39
-      mac: 00:26:b9:3f:4b:31
-      management: true
-    eth0:
-      driver: bnx2
-      interface: Ethernet
-      ip: 172.16.130.39
-      mac: 00:26:b9:3f:4b:2f
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      interface: Ethernet
-      mac: 00:26:b9:3f:4b:30
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      rev: 1.22
-      size: 598879502336
-      by_id: node-was-not-available-to-retrieve-this-value
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
deleted file mode 100644
index ec933a0e6260c10dab15e7b9e3313db8ab220241..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-4:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: D5JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.4
-      mac: 00:26:b9:3f:4a:6f
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.4
-      mac: 00:26:b9:3f:4a:6d
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:4a:6e
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903750980012c36f8611dd5f41"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
deleted file mode 100644
index 35edcc69f7f1f9aae48ead845df025e01f47c31b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-40:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 65JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.40
-      mac: 00:26:b9:3f:49:46
-      management: true
-    eth0:
-      driver: bnx2
-      interface: Ethernet
-      ip: 172.16.130.40
-      mac: 00:26:b9:3f:49:44
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      interface: Ethernet
-      mac: 00:26:b9:3f:49:45
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903750610012c371ae32c6754d"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      model: PERC 6/i Adapter
-      rev: 1.22
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
deleted file mode 100644
index c3410f393151a524c34378947daf42812681fa0c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-41:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: J3JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.41
-      mac: 00:26:b9:3f:45:3c
-      management: true
-    eth0:
-      driver: bnx2
-      interface: Ethernet
-      ip: 172.16.130.41
-      mac: 00:26:b9:3f:45:3a
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      interface: Ethernet
-      mac: 00:26:b9:3f:45:3b
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b90374f250012c371bd33c3fc6d"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      model: PERC 6/i Adapter
-      rev: 1.22
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
deleted file mode 100644
index 63bcd8faea4826df7ce4debe356485e1d067f239..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-42:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 93JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.42
-      mac: 00:26:b9:3f:41:23
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.42
-      mac: 00:26:b9:3f:41:21
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:41:22
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903750230012c371cc349b16ce"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
deleted file mode 100644
index 4623f2400632854988e0401ce4d25bf923957e62..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-43:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 23JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.43
-      mac: 00:26:b9:3f:3e:97
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.43
-      mac: 00:26:b9:3f:3e:95
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:3e:96
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b9037553d001abeb94f2fdc575d"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
deleted file mode 100644
index 4f94403a2fb5c11c88abf855563f1e3a37e8e61a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-44:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: B3JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.44
-      mac: 00:26:b9:3f:45:30
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.44
-      mac: 00:26:b9:3f:45:2e
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:45:2f
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b9037555a001f07f143053bf158"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
deleted file mode 100644
index 739ea868bdf05293b8a81e4ff51ee7c560dddf37..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-45:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 25JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.45
-      mac: 00:26:b9:3f:47:7d
-      management: true
-    eth0:
-      driver: bnx2
-      interface: Ethernet
-      ip: 172.16.130.45
-      mac: 00:26:b9:3f:47:7b
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      interface: Ethernet
-      mac: 00:26:b9:3f:47:7c
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      rev: 1.22
-      size: 598879502336
-      by_id: node-was-not-available-to-retrieve-this-value
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
deleted file mode 100644
index 2e3ec31610a1f8460c1c1cfe8fe05dda88ff5e4d..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-5:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 73JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.5
-      mac: 00:26:b9:3e:e8:5a
-      management: true
-    eth0:
-      driver: bnx2
-      interface: Ethernet
-      ip: 172.16.130.5
-      mac: 00:26:b9:3e:e8:58
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      interface: Ethernet
-      mac: 00:26:b9:3e:e8:59
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      rev: 1.22
-      size: 598879502336
-      by_id: node-was-not-available-to-retrieve-this-value
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
deleted file mode 100644
index d2e6841894aed7026f7189a825aeff71985a3026..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-6:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: G3JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.6
-      mac: 00:26:b9:3f:40:b1
-      management: true
-    eth0:
-      driver: bnx2
-      interface: Ethernet
-      ip: 172.16.130.6
-      mac: 00:26:b9:3f:40:af
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      interface: Ethernet
-      mac: 00:26:b9:3f:40:b0
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      rev: 1.22
-      size: 598879502336
-      by_id: node-was-not-available-to-retrieve-this-value
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
deleted file mode 100644
index c9a2f28b376a1d727605fa74745baf67276d894b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-7:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 64JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.7
-      mac: 00:26:b9:3f:43:a3
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.7
-      mac: 00:26:b9:3f:43:a1
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:43:a2
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b903752c40012c36fb414ae8263"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
deleted file mode 100644
index cd20a39b1f4b430fe4a5aaae54ca8eba092266f6..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-8:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: C3JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.8
-      mac: 00:26:b9:3f:4a:3f
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.8
-      mac: 00:26:b9:3f:4a:3d
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:4a:3e
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b9037556b001da7a21d04c951a9"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
deleted file mode 100644
index ad3c610c8260c7d97e2c661a3b7ce25c6276a235..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-suno-9:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-    version: 1.1.5
-  bmc_version: '1.21'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-    serial: 83JPH4J
-  main_memory:
-    ram_size: 34359738368
-  network_adapters:
-    bmc:
-      ip: 172.17.130.9
-      mac: 00:26:b9:3f:41:29
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      ip: 172.16.130.9
-      mac: 00:26:b9:3f:41:27
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 5.0.9 bc 5.0.6 NCSI 2.0.3
-      interface: Ethernet
-      mac: 00:26:b9:3f:41:28
-      management: false
-      model: NetXtreme II BCM5716 Gigabit Ethernet
-      name: eno2
-      vendor: Broadcom
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  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           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x60026b90374f1e001f07ebefbd64ae7e"
-      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
-      firmware_version: 1.22
-      model: PERC 6/i Adapter
-      size: 598879502336
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/suno.yaml b/input/grid5000/sites/sophia/clusters/suno/suno.yaml
deleted file mode 100644
index 0c92976ba60af95e793c9347bbc55bd79d23df15..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/suno.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-model: Dell PowerEdge R410
-created_at: 2010-01-27
-kavlan: true
-queues:
-  - default
-  - admin
-
-nodes:
-  suno-[1-45]:
-    processor:
-      microarchitecture: Nehalem
-      clock_speed: 2250000000
-    software:
-      standard-environment: debian10-x64-std
-    performance:
-      core_flops: 7140000000
-      node_flops: 55460000000
-    supported_job_types:
-      deploy: true
-      besteffort: true
-      max_walltime: 0
-    storage_devices:
-      sda:
-        interface: SAS
-        raid: '0'
-        storage: HDD
-    network_adapters:
-      eth0:
-        enabled: true
-        mountable: true
-        mounted: true
-        bridged: true
-      eth1:
-        enabled: false
-        mountable: false
-        mounted: false
-        bridged: false
-      bmc:
-        interface: Ethernet
-        rate: 100.0e+6
-        enabled: true
-        mountable: false
-        mounted: false
-    monitoring:
-      wattmeter: false
diff --git a/input/grid5000/sites/sophia/clusters/suno/suno_metrics.yaml b/input/grid5000/sites/sophia/clusters/suno/suno_metrics.yaml
deleted file mode 100644
index c5a8f913f0622a1246faae0d380b1317111e0c1e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/suno/suno_metrics.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-metrics:
-
-  - name: network_ifacein_bytes_total
-    description: >-
-      Input byte counter for the network device port connected to the node
-    period: 1000
-    source:
-      protocol: network_equipment
-
-  - name: network_ifaceout_bytes_total
-    description: >-
-      Output byte counter for the network device port connected to the node
-    period: 1000
-    source:
-      protocol: network_equipment
-
-  - name: bmc_temp_ambiant_celsius
-    description: Front node ambiant temperature reported by BMC, in celsius
-    period: 5000
-    source:
-      protocol: ipmisensor
-      id: 10  # Inlet Temp
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod1a"}
-    description: Speed of FAN MOD 1A reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 33  # FAN MOD 1A RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod1b"}
-    description: Speed of FAN MOD 1B reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 34  # FAN MOD 1B RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod2a"}
-    description: Speed of FAN MOD 2A reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 35  # FAN MOD 2A RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod2b"}
-    description: Speed of FAN MOD 2B reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 36  # FAN MOD 2B RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod3a"}
-    description: Speed of FAN MOD 3A reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 37  # FAN MOD 3A RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod3b"}
-    description: Speed of FAN MOD 3B reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 38  # FAN MOD 3B RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod4a"}
-    description: Speed of FAN MOD 4A reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 39  # FAN MOD 4A RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod4b"}
-    description: Speed of FAN MOD 4B reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 40  # FAN MOD 4B RPM
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index e22fa41f105ccbd83b5c823fd1ce1b4c6b446683..8d3295c46f6b661df6ed76f18e7a68a1903a63de 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -110,16 +110,6 @@ gw:
       backplane_bps: 24000000000
       rate: 1000000000
       ports:
-        1: suno-36
-        2: suno-37
-        3: suno-38
-        4: suno-39
-        5: suno-40
-        6: suno-41
-        7: suno-42
-        8: suno-43
-        9: suno-44
-        10: suno-45
         23:
           uid: srv
           kind: server
@@ -142,31 +132,6 @@ gw:
         12:
           uid: stock-eth1
           kind: server
-    5:
-      snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kavlan_pattern: "%LINECARD%/%PORT%"
-      kind: node
-      port: eth0
-      backplane_bps: 24000000000
-      rate: 1000000000
-      ports:
-        10: suno-1
-        11: suno-2
-        1: suno-3
-        5: suno-4
-        4: suno-5
-        7: suno-6
-        8: suno-7
-        12: suno-8
-        9: suno-9
-        3: suno-10
-        2: suno-11
-        6: suno-12
-        13: suno-13
-        19: suno-14
-        17: suno-15
-        21: suno-16
-        15: suno-17
     6:
       snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
       kavlan_pattern: "%LINECARD%/%PORT%"
@@ -175,24 +140,6 @@ gw:
       backplane_bps: 24000000000
       rate: 1000000000
       ports:
-        1: suno-18
-        2: suno-19
-        3: suno-20
-        4: suno-21
-        5: suno-22
-        6: suno-23
-        7: suno-24
-        8: suno-25
-        9: suno-26
-        10: suno-27
-        11: suno-28
-        12: suno-29
-        13: suno-30
-        14: suno-31
-        15: suno-32
-        16: suno-33
-        17: suno-34
-        18: suno-35
         19:
           uid: srv-stock-eth2
           kind: server
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index c07786d957711006fa34b6eb9ceb030ed14b58f9..8931fee4eaab92e05621cae575a4526e60b8f6ac 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -114,7 +114,6 @@ vlans:
       local rennes paravance eth1 0 0 6 0
       local rennes parasilo eth0 0 0 7 0
       local rennes parasilo eth1 0 0 8 0
-      local sophia suno eth0 0 0 0 0
       local sophia uvb eth0 0 0 1 0
       global grenoble yeti eth0 0 0 0 0
       global grenoble dahu eth0 0 0 1 0
@@ -165,7 +164,6 @@ vlans:
       global rennes parapide eth0 0 0 35 0
       global rennes parapluie eth1 0 0 36 0
       global sophia uvb eth0 0 0 40 0
-      global sophia suno eth0 0 0 41 0
       global luxembourg petitprince eth0 0 0 46 0
       global luxembourg petitprince eth1 0 0 46 100
       global nantes econome eth0 0 0 48 0
@@ -219,7 +217,6 @@ vlans:
       routed rennes paravance eth1 0 24 6 0
       routed rennes parasilo eth0 0 24 7 0
       routed rennes parasilo eth1 0 24 8 0
-      routed sophia suno eth0 0 32 0 0
       routed sophia uvb eth0 0 32 1 0
       routed luxembourg petitprince eth0 0 40 2 0
       routed luxembourg petitprince eth1 0 40 3 0
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 39e096e3557a39899e0e1144220045e3e3995c66..995e504b8bd2f37694b93a2543bd3c879e01753a 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -159,9 +159,6 @@ pyxis:
 sagittaire:
   enp2s2f0: eth0
   enp2s2f1: eth1
-suno:
-  eno1: eth0
-  eno2: eth1
 taurus:
   eno1: eth2
   eno2: eth3
@@ -182,16 +179,6 @@ yeti:
   eno4: eth3
 
 # Manual entries for nodes which mapping is different from cluster default
-granduc-12:
-  eno1: eth0
-  eno2: eth1
-  enp13s0f0: eth3
-  enp13s0f1: eth2
-granduc-16:
-  eno1: eth0
-  eno2: eth1
-  enp13s0f0: eth3
-  enp13s0f1: eth2
 grisou-50:
   eno1: eth0
   eno2: eth1
diff --git a/lib/refrepo/valid/data/homogeneity.yaml.erb b/lib/refrepo/valid/data/homogeneity.yaml.erb
index e7f8ad5f18e79c0719bbb26ee53561f30fec9056..4cc7ebc7045c03a9be648944adb9cebe7a35fca2 100644
--- a/lib/refrepo/valid/data/homogeneity.yaml.erb
+++ b/lib/refrepo/valid/data/homogeneity.yaml.erb
@@ -130,12 +130,6 @@ rennes:
     - +monitoring
     - +pdu
 sophia:
-  suno-[1-45]:
-    - ~bmc_version
-  suno-2:
-    - ~network_adapters.eth0.firmware_version
-    - ~network_adapters.eth1.firmware_version
-    - +chassis.serial
   uvb-[1-44]:
     - ~network_adapters.ib0.8100.mac
   uvb-3: