diff --git a/data/grid5000/sites/grenoble/clusters/edel/edel.json b/data/grid5000/sites/grenoble/clusters/edel/edel.json
deleted file mode 100644
index 985ba85c09ee20814f475f5647355151c36bb99b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/edel.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "created_at": "Thu, 02 Oct 2008 22:00:00 GMT",
-  "kavlan": true,
-  "model": "Bull bullx B500 compute blades",
-  "queues": [
-    "default",
-    "admin"
-  ],
-  "type": "cluster",
-  "uid": "edel"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
deleted file mode 100644
index 4177d39b0826c63d5ded238a2e3ca541be370eae..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.1",
-      "kavlan-11": "10.7.194.35",
-      "kavlan-12": "10.11.194.35",
-      "kavlan-13": "10.15.194.35",
-      "kavlan-14": "10.19.194.35",
-      "kavlan-16": "10.27.194.35",
-      "kavlan-18": "10.35.194.35",
-      "kavlan-2": "192.168.210.1",
-      "kavlan-20": "10.43.194.35",
-      "kavlan-21": "10.47.194.35",
-      "kavlan-3": "192.168.226.1",
-      "kavlan-4": "10.4.2.1",
-      "kavlan-5": "10.4.66.1",
-      "kavlan-6": "10.4.130.1",
-      "kavlan-7": "10.4.193.1",
-      "kavlan-8": "10.5.2.1",
-      "kavlan-9": "10.5.66.1"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.1",
-      "kavlan": true,
-      "mac": "08:00:38:36:f3:be",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-1.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 5 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:36:f3:bf",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x0800380001375f9e",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.1",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:5f:9e",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-1-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "enabled": false,
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.1",
-      "kavlan": false,
-      "mac": "08:00:38:36:af:df",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-1-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367beb0",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
deleted file mode 100644
index 8f1872867ac47d493b86e9a05795270d174321c1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.10",
-      "kavlan-11": "10.7.194.44",
-      "kavlan-12": "10.11.194.44",
-      "kavlan-13": "10.15.194.44",
-      "kavlan-14": "10.19.194.44",
-      "kavlan-16": "10.27.194.44",
-      "kavlan-18": "10.35.194.44",
-      "kavlan-2": "192.168.210.10",
-      "kavlan-20": "10.43.194.44",
-      "kavlan-21": "10.47.194.44",
-      "kavlan-3": "192.168.226.10",
-      "kavlan-4": "10.4.2.10",
-      "kavlan-5": "10.4.66.10",
-      "kavlan-6": "10.4.130.10",
-      "kavlan-7": "10.4.193.10",
-      "kavlan-8": "10.5.2.10",
-      "kavlan-9": "10.5.66.10"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.10",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:94",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-10.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 14 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:95",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c95f",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.10",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:5f",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-10-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.10",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:ca",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-10-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751032ecb19",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-10"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
deleted file mode 100644
index 78c10e5fb8065ddd8a0fc2ba0f5e4042722679d5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.11",
-      "kavlan-11": "10.7.194.45",
-      "kavlan-12": "10.11.194.45",
-      "kavlan-13": "10.15.194.45",
-      "kavlan-14": "10.19.194.45",
-      "kavlan-16": "10.27.194.45",
-      "kavlan-18": "10.35.194.45",
-      "kavlan-2": "192.168.210.11",
-      "kavlan-20": "10.43.194.45",
-      "kavlan-21": "10.47.194.45",
-      "kavlan-3": "192.168.226.11",
-      "kavlan-4": "10.4.2.11",
-      "kavlan-5": "10.4.66.11",
-      "kavlan-6": "10.4.130.11",
-      "kavlan-7": "10.4.193.11",
-      "kavlan-8": "10.5.2.11",
-      "kavlan-9": "10.5.66.11"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.11",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:90",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-11.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 15 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:91",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c959",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.11",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:59",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-11-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.11",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:c8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-11-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751031ea9df",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-11"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
deleted file mode 100644
index ffde3d46c2e6fc27a2042a3dbfe8a8257479a04a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.12",
-      "kavlan-11": "10.7.194.46",
-      "kavlan-12": "10.11.194.46",
-      "kavlan-13": "10.15.194.46",
-      "kavlan-14": "10.19.194.46",
-      "kavlan-16": "10.27.194.46",
-      "kavlan-18": "10.35.194.46",
-      "kavlan-2": "192.168.210.12",
-      "kavlan-20": "10.43.194.46",
-      "kavlan-21": "10.47.194.46",
-      "kavlan-3": "192.168.226.12",
-      "kavlan-4": "10.4.2.12",
-      "kavlan-5": "10.4.66.12",
-      "kavlan-6": "10.4.130.12",
-      "kavlan-7": "10.4.193.12",
-      "kavlan-8": "10.5.2.12",
-      "kavlan-9": "10.5.66.12"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.12",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:3c",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-12.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 16 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:3d",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca5b",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.12",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:5b",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-12-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.12",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:1e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-12-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf06",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-12"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
deleted file mode 100644
index 80e0ab82f17c6a771573c90c35103fb232659556..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.13",
-      "kavlan-11": "10.7.194.47",
-      "kavlan-12": "10.11.194.47",
-      "kavlan-13": "10.15.194.47",
-      "kavlan-14": "10.19.194.47",
-      "kavlan-16": "10.27.194.47",
-      "kavlan-18": "10.35.194.47",
-      "kavlan-2": "192.168.210.13",
-      "kavlan-20": "10.43.194.47",
-      "kavlan-21": "10.47.194.47",
-      "kavlan-3": "192.168.226.13",
-      "kavlan-4": "10.4.2.13",
-      "kavlan-5": "10.4.66.13",
-      "kavlan-6": "10.4.130.13",
-      "kavlan-7": "10.4.193.13",
-      "kavlan-8": "10.5.2.13",
-      "kavlan-9": "10.5.66.13"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.13",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:dc",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-13.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 17 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:dd",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c9cb",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.13",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:cb",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-13-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.13",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:ee",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-13-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751032f1152",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-13"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
deleted file mode 100644
index 9c5163aa2ec62fadf404ebea8e034883f1df8544..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.14",
-      "kavlan-11": "10.7.194.48",
-      "kavlan-12": "10.11.194.48",
-      "kavlan-13": "10.15.194.48",
-      "kavlan-14": "10.19.194.48",
-      "kavlan-16": "10.27.194.48",
-      "kavlan-18": "10.35.194.48",
-      "kavlan-2": "192.168.210.14",
-      "kavlan-20": "10.43.194.48",
-      "kavlan-21": "10.47.194.48",
-      "kavlan-3": "192.168.226.14",
-      "kavlan-4": "10.4.2.14",
-      "kavlan-5": "10.4.66.14",
-      "kavlan-6": "10.4.130.14",
-      "kavlan-7": "10.4.193.14",
-      "kavlan-8": "10.5.2.14",
-      "kavlan-9": "10.5.66.14"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.14",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:ac",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-14.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 18 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:ad",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c983",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.14",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:83",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-14-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.14",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:d6",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-14-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751032eca74",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-14"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
deleted file mode 100644
index 7d0ca29523775c0759db8d8499556a47873f6838..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.15",
-      "kavlan-11": "10.7.194.49",
-      "kavlan-12": "10.11.194.49",
-      "kavlan-13": "10.15.194.49",
-      "kavlan-14": "10.19.194.49",
-      "kavlan-16": "10.27.194.49",
-      "kavlan-18": "10.35.194.49",
-      "kavlan-2": "192.168.210.15",
-      "kavlan-20": "10.43.194.49",
-      "kavlan-21": "10.47.194.49",
-      "kavlan-3": "192.168.226.15",
-      "kavlan-4": "10.4.2.15",
-      "kavlan-5": "10.4.66.15",
-      "kavlan-6": "10.4.130.15",
-      "kavlan-7": "10.4.193.15",
-      "kavlan-8": "10.5.2.15",
-      "kavlan-9": "10.5.66.15"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.15",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:fc",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-15.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:fd",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c9fb",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.15",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:fb",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-15-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.15",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:fe",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-15-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367be94",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-15"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
deleted file mode 100644
index a32ca7bbf9875226678d916c824b9a636917fbad..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.16",
-      "kavlan-11": "10.7.194.50",
-      "kavlan-12": "10.11.194.50",
-      "kavlan-13": "10.15.194.50",
-      "kavlan-14": "10.19.194.50",
-      "kavlan-16": "10.27.194.50",
-      "kavlan-18": "10.35.194.50",
-      "kavlan-2": "192.168.210.16",
-      "kavlan-20": "10.43.194.50",
-      "kavlan-21": "10.47.194.50",
-      "kavlan-3": "192.168.226.16",
-      "kavlan-4": "10.4.2.16",
-      "kavlan-5": "10.4.66.16",
-      "kavlan-6": "10.4.130.16",
-      "kavlan-7": "10.4.193.16",
-      "kavlan-8": "10.5.2.16",
-      "kavlan-9": "10.5.66.16"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.16",
-      "kavlan": true,
-      "mac": "08:00:38:36:f3:2c",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-16.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:36:f3:2d",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x0800380001375ec3",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.16",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:c3",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-16-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "enabled": false,
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.16",
-      "kavlan": false,
-      "mac": "08:00:38:36:af:96",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-16-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bea9",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-16"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
deleted file mode 100644
index 9cfa75195900cd0e276d4f115bb063acd1c71725..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.17",
-      "kavlan-11": "10.7.194.51",
-      "kavlan-12": "10.11.194.51",
-      "kavlan-13": "10.15.194.51",
-      "kavlan-14": "10.19.194.51",
-      "kavlan-16": "10.27.194.51",
-      "kavlan-18": "10.35.194.51",
-      "kavlan-2": "192.168.210.17",
-      "kavlan-20": "10.43.194.51",
-      "kavlan-21": "10.47.194.51",
-      "kavlan-3": "192.168.226.17",
-      "kavlan-4": "10.4.2.17",
-      "kavlan-5": "10.4.66.17",
-      "kavlan-6": "10.4.130.17",
-      "kavlan-7": "10.4.193.17",
-      "kavlan-8": "10.5.2.17",
-      "kavlan-9": "10.5.66.17"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.17",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:9e",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-17.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:9f",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c96e",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.17",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:6e",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-17-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.17",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:cf",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-17-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510302023f",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": 7,
-      "interface": "SATA",
-      "model": "C300-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-17"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
deleted file mode 100644
index 78933ea15da37e5e727abc25cf87dfe60f7d2d3a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": "123456789"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.18",
-      "kavlan-11": "10.7.194.52",
-      "kavlan-12": "10.11.194.52",
-      "kavlan-13": "10.15.194.52",
-      "kavlan-14": "10.19.194.52",
-      "kavlan-16": "10.27.194.52",
-      "kavlan-18": "10.35.194.52",
-      "kavlan-2": "192.168.210.18",
-      "kavlan-20": "10.43.194.52",
-      "kavlan-21": "10.47.194.52",
-      "kavlan-3": "192.168.226.18",
-      "kavlan-4": "10.4.2.18",
-      "kavlan-5": "10.4.66.18",
-      "kavlan-6": "10.4.130.18",
-      "kavlan-7": "10.4.193.18",
-      "kavlan-8": "10.5.2.18",
-      "kavlan-9": "10.5.66.18"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.17.18",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:82",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-18.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:83",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "rate": 1000000000,
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c944",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.18",
-      "ip6": "fe80::a00:3800:135:c944",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:44",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-18-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.18",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:c1",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-18-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "rev": 40.0,
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-18"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
deleted file mode 100644
index 2952e2cdea096c6fe9ca2e8e0871cb14d1df5814..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.19",
-      "kavlan-11": "10.7.194.53",
-      "kavlan-12": "10.11.194.53",
-      "kavlan-13": "10.15.194.53",
-      "kavlan-14": "10.19.194.53",
-      "kavlan-16": "10.27.194.53",
-      "kavlan-18": "10.35.194.53",
-      "kavlan-2": "192.168.210.19",
-      "kavlan-20": "10.43.194.53",
-      "kavlan-21": "10.47.194.53",
-      "kavlan-3": "192.168.226.19",
-      "kavlan-4": "10.4.2.19",
-      "kavlan-5": "10.4.66.19",
-      "kavlan-6": "10.4.130.19",
-      "kavlan-7": "10.4.193.19",
-      "kavlan-8": "10.5.2.19",
-      "kavlan-9": "10.5.66.19"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.19",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:d0",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-19.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 5 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:d1",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c9b9",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.19",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:b9",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-19-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.19",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:e8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-19-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367befb",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-19"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
deleted file mode 100644
index 73e0c40c78bae47baa1564403bbff29051ecd1f3..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.2",
-      "kavlan-11": "10.7.194.36",
-      "kavlan-12": "10.11.194.36",
-      "kavlan-13": "10.15.194.36",
-      "kavlan-14": "10.19.194.36",
-      "kavlan-16": "10.27.194.36",
-      "kavlan-18": "10.35.194.36",
-      "kavlan-2": "192.168.210.2",
-      "kavlan-20": "10.43.194.36",
-      "kavlan-21": "10.47.194.36",
-      "kavlan-3": "192.168.226.2",
-      "kavlan-4": "10.4.2.2",
-      "kavlan-5": "10.4.66.2",
-      "kavlan-6": "10.4.130.2",
-      "kavlan-7": "10.4.193.2",
-      "kavlan-8": "10.5.2.2",
-      "kavlan-9": "10.5.66.2"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.2",
-      "kavlan": true,
-      "mac": "08:00:38:36:f5:a8",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-2.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 6 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:36:f5:a9",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000137627d",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.2",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:62:7d",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-2-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "enabled": false,
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.2",
-      "kavlan": false,
-      "mac": "08:00:38:36:b0:d4",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-2-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510202c03c",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
deleted file mode 100644
index bc487d4a74a8aabe10bff11c642846646f1b10d8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.20",
-      "kavlan-11": "10.7.194.54",
-      "kavlan-12": "10.11.194.54",
-      "kavlan-13": "10.15.194.54",
-      "kavlan-14": "10.19.194.54",
-      "kavlan-16": "10.27.194.54",
-      "kavlan-18": "10.35.194.54",
-      "kavlan-2": "192.168.210.20",
-      "kavlan-20": "10.43.194.54",
-      "kavlan-21": "10.47.194.54",
-      "kavlan-3": "192.168.226.20",
-      "kavlan-4": "10.4.2.20",
-      "kavlan-5": "10.4.66.20",
-      "kavlan-6": "10.4.130.20",
-      "kavlan-7": "10.4.193.20",
-      "kavlan-8": "10.5.2.20",
-      "kavlan-9": "10.5.66.20"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.20",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:78",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-20.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 6 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:79",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c935",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.20",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:35",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-20-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.20",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:bc",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-20-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510202c04b",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-20"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
deleted file mode 100644
index 1cf7b19cf43f3fb30f3f8b869314a5701e2fcf95..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.21",
-      "kavlan-11": "10.7.194.55",
-      "kavlan-12": "10.11.194.55",
-      "kavlan-13": "10.15.194.55",
-      "kavlan-14": "10.19.194.55",
-      "kavlan-16": "10.27.194.55",
-      "kavlan-18": "10.35.194.55",
-      "kavlan-2": "192.168.210.21",
-      "kavlan-20": "10.43.194.55",
-      "kavlan-21": "10.47.194.55",
-      "kavlan-3": "192.168.226.21",
-      "kavlan-4": "10.4.2.21",
-      "kavlan-5": "10.4.66.21",
-      "kavlan-6": "10.4.130.21",
-      "kavlan-7": "10.4.193.21",
-      "kavlan-8": "10.5.2.21",
-      "kavlan-9": "10.5.66.21"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.21",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:4a",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-21.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 7 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:4b",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca70",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.21",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:70",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-21-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.21",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:25",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-21-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367befc",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-21"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
deleted file mode 100644
index 8f39b8c7c7a4754fbaddcc69f5a6b60b10bff660..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.22",
-      "kavlan-11": "10.7.194.56",
-      "kavlan-12": "10.11.194.56",
-      "kavlan-13": "10.15.194.56",
-      "kavlan-14": "10.19.194.56",
-      "kavlan-16": "10.27.194.56",
-      "kavlan-18": "10.35.194.56",
-      "kavlan-2": "192.168.210.22",
-      "kavlan-20": "10.43.194.56",
-      "kavlan-21": "10.47.194.56",
-      "kavlan-3": "192.168.226.22",
-      "kavlan-4": "10.4.2.22",
-      "kavlan-5": "10.4.66.22",
-      "kavlan-6": "10.4.130.22",
-      "kavlan-7": "10.4.193.22",
-      "kavlan-8": "10.5.2.22",
-      "kavlan-9": "10.5.66.22"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.22",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:9c",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-22.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:9d",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c96b",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.22",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:6b",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-22-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.22",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:ce",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-22-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751031eaa40",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-22"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
deleted file mode 100644
index beda095c697f077ef3c15c5f8ce5a1827421cc81..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.23",
-      "kavlan-11": "10.7.194.57",
-      "kavlan-12": "10.11.194.57",
-      "kavlan-13": "10.15.194.57",
-      "kavlan-14": "10.19.194.57",
-      "kavlan-16": "10.27.194.57",
-      "kavlan-18": "10.35.194.57",
-      "kavlan-2": "192.168.210.23",
-      "kavlan-20": "10.43.194.57",
-      "kavlan-21": "10.47.194.57",
-      "kavlan-3": "192.168.226.23",
-      "kavlan-4": "10.4.2.23",
-      "kavlan-5": "10.4.66.23",
-      "kavlan-6": "10.4.130.23",
-      "kavlan-7": "10.4.193.23",
-      "kavlan-8": "10.5.2.23",
-      "kavlan-9": "10.5.66.23"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.23",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:d6",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-23.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 9 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:d7",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c9c2",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.23",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c2",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-23-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.23",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:eb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-23-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf03",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-23"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
deleted file mode 100644
index 2bb40c69f23c816abf6a53a33c06fbeaed79d03d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.24",
-      "kavlan-11": "10.7.194.58",
-      "kavlan-12": "10.11.194.58",
-      "kavlan-13": "10.15.194.58",
-      "kavlan-14": "10.19.194.58",
-      "kavlan-16": "10.27.194.58",
-      "kavlan-18": "10.35.194.58",
-      "kavlan-2": "192.168.210.24",
-      "kavlan-20": "10.43.194.58",
-      "kavlan-21": "10.47.194.58",
-      "kavlan-3": "192.168.226.24",
-      "kavlan-4": "10.4.2.24",
-      "kavlan-5": "10.4.66.24",
-      "kavlan-6": "10.4.130.24",
-      "kavlan-7": "10.4.193.24",
-      "kavlan-8": "10.5.2.24",
-      "kavlan-9": "10.5.66.24"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.17.24",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:26",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-24.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 10 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:27",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca3a",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.24",
-      "ip6": "fe80::a00:3800:135:ca3a",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:3a",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-24-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.24",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:13",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-24-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bef6",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "rev": "040H",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-24"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
deleted file mode 100644
index 1b93305a214d5539c74167f368923171284f0233..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": "123456789"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.25",
-      "kavlan-11": "10.7.194.59",
-      "kavlan-12": "10.11.194.59",
-      "kavlan-13": "10.15.194.59",
-      "kavlan-14": "10.19.194.59",
-      "kavlan-16": "10.27.194.59",
-      "kavlan-18": "10.35.194.59",
-      "kavlan-2": "192.168.210.25",
-      "kavlan-20": "10.43.194.59",
-      "kavlan-21": "10.47.194.59",
-      "kavlan-3": "192.168.226.25",
-      "kavlan-4": "10.4.2.25",
-      "kavlan-5": "10.4.66.25",
-      "kavlan-6": "10.4.130.25",
-      "kavlan-7": "10.4.193.25",
-      "kavlan-8": "10.5.2.25",
-      "kavlan-9": "10.5.66.25"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.17.25",
-      "kavlan": true,
-      "mac": "08:00:38:35:aa:b8",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-25.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 11 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:aa:b9",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "rate": 1000000000,
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c815",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.25",
-      "ip6": "fe80::a00:3800:135:c815",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:15",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-25-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.25",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:5c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-25-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "rev": 40.0,
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-25"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
deleted file mode 100644
index ec53dd764b6892db4a736aff5ce6da50876f8946..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.26",
-      "kavlan-11": "10.7.194.60",
-      "kavlan-12": "10.11.194.60",
-      "kavlan-13": "10.15.194.60",
-      "kavlan-14": "10.19.194.60",
-      "kavlan-16": "10.27.194.60",
-      "kavlan-18": "10.35.194.60",
-      "kavlan-2": "192.168.210.26",
-      "kavlan-20": "10.43.194.60",
-      "kavlan-21": "10.47.194.60",
-      "kavlan-3": "192.168.226.26",
-      "kavlan-4": "10.4.2.26",
-      "kavlan-5": "10.4.66.26",
-      "kavlan-6": "10.4.130.26",
-      "kavlan-7": "10.4.193.26",
-      "kavlan-8": "10.5.2.26",
-      "kavlan-9": "10.5.66.26"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.26",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:54",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-26.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 12 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:55",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c8ff",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.26",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:ff",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-26-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.26",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:aa",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-26-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751031eaa61",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-26"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
deleted file mode 100644
index d4a4f59aaddf5390df675ce9b9bcacf3a586b7a5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.28",
-      "kavlan-11": "10.7.194.62",
-      "kavlan-12": "10.11.194.62",
-      "kavlan-13": "10.15.194.62",
-      "kavlan-14": "10.19.194.62",
-      "kavlan-16": "10.27.194.62",
-      "kavlan-18": "10.35.194.62",
-      "kavlan-2": "192.168.210.28",
-      "kavlan-20": "10.43.194.62",
-      "kavlan-21": "10.47.194.62",
-      "kavlan-3": "192.168.226.28",
-      "kavlan-4": "10.4.2.28",
-      "kavlan-5": "10.4.66.28",
-      "kavlan-6": "10.4.130.28",
-      "kavlan-7": "10.4.193.28",
-      "kavlan-8": "10.5.2.28",
-      "kavlan-9": "10.5.66.28"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.28",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:48",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-28.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 14 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:49",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca6d",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.28",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:6d",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-28-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.28",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:24",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-28-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf24",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-28"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
deleted file mode 100644
index e2978d1519873621e9d255f17b1a9d5f9fb117ab..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.29",
-      "kavlan-11": "10.7.194.63",
-      "kavlan-12": "10.11.194.63",
-      "kavlan-13": "10.15.194.63",
-      "kavlan-14": "10.19.194.63",
-      "kavlan-16": "10.27.194.63",
-      "kavlan-18": "10.35.194.63",
-      "kavlan-2": "192.168.210.29",
-      "kavlan-20": "10.43.194.63",
-      "kavlan-21": "10.47.194.63",
-      "kavlan-3": "192.168.226.29",
-      "kavlan-4": "10.4.2.29",
-      "kavlan-5": "10.4.66.29",
-      "kavlan-6": "10.4.130.29",
-      "kavlan-7": "10.4.193.29",
-      "kavlan-8": "10.5.2.29",
-      "kavlan-9": "10.5.66.29"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.29",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:be",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-29.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 15 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:bf",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c99e",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.29",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:9e",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-29-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.29",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:df",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-29-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367be8c",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-29"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
deleted file mode 100644
index e2d32347006cde2479415c48ebd08996eb0aa880..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.3",
-      "kavlan-11": "10.7.194.37",
-      "kavlan-12": "10.11.194.37",
-      "kavlan-13": "10.15.194.37",
-      "kavlan-14": "10.19.194.37",
-      "kavlan-16": "10.27.194.37",
-      "kavlan-18": "10.35.194.37",
-      "kavlan-2": "192.168.210.3",
-      "kavlan-20": "10.43.194.37",
-      "kavlan-21": "10.47.194.37",
-      "kavlan-3": "192.168.226.3",
-      "kavlan-4": "10.4.2.3",
-      "kavlan-5": "10.4.66.3",
-      "kavlan-6": "10.4.130.3",
-      "kavlan-7": "10.4.193.3",
-      "kavlan-8": "10.5.2.3",
-      "kavlan-9": "10.5.66.3"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.3",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:8c",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-3.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 7 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:8d",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c953",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.3",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:53",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-3-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.3",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:c6",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-3-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751032eca94",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-3"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
deleted file mode 100644
index d48a6940654f08512c49c435f40cc488d951e29f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.30",
-      "kavlan-11": "10.7.194.64",
-      "kavlan-12": "10.11.194.64",
-      "kavlan-13": "10.15.194.64",
-      "kavlan-14": "10.19.194.64",
-      "kavlan-16": "10.27.194.64",
-      "kavlan-18": "10.35.194.64",
-      "kavlan-2": "192.168.210.30",
-      "kavlan-20": "10.43.194.64",
-      "kavlan-21": "10.47.194.64",
-      "kavlan-3": "192.168.226.30",
-      "kavlan-4": "10.4.2.30",
-      "kavlan-5": "10.4.66.30",
-      "kavlan-6": "10.4.130.30",
-      "kavlan-7": "10.4.193.30",
-      "kavlan-8": "10.5.2.30",
-      "kavlan-9": "10.5.66.30"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.30",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:ba",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-30.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 16 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:bb",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c998",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.30",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:98",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-30-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.30",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:dd",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-30-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751031ea9b6",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-30"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
deleted file mode 100644
index 75a2e19cca0f4cf7b23dad9953bc7cc6ee34d72b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": "123456789"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.31",
-      "kavlan-11": "10.7.194.65",
-      "kavlan-12": "10.11.194.65",
-      "kavlan-13": "10.15.194.65",
-      "kavlan-14": "10.19.194.65",
-      "kavlan-16": "10.27.194.65",
-      "kavlan-18": "10.35.194.65",
-      "kavlan-2": "192.168.210.31",
-      "kavlan-20": "10.43.194.65",
-      "kavlan-21": "10.47.194.65",
-      "kavlan-3": "192.168.226.31",
-      "kavlan-4": "10.4.2.31",
-      "kavlan-5": "10.4.66.31",
-      "kavlan-6": "10.4.130.31",
-      "kavlan-7": "10.4.193.31",
-      "kavlan-8": "10.5.2.31",
-      "kavlan-9": "10.5.66.31"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.17.31",
-      "kavlan": true,
-      "mac": "08:00:38:35:af:3e",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-31.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 17 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:af:3f",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "rate": 1000000000,
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135cede",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.31",
-      "ip6": "fe80::a00:3800:135:cede",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ce:de",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-31-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.31",
-      "kavlan": false,
-      "mac": "08:00:38:35:a5:9f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-31-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "rev": 40.0,
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-31"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
deleted file mode 100644
index ebfa408e38ad0b492f87f1fd9166206664bfb215..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.32",
-      "kavlan-11": "10.7.194.66",
-      "kavlan-12": "10.11.194.66",
-      "kavlan-13": "10.15.194.66",
-      "kavlan-14": "10.19.194.66",
-      "kavlan-16": "10.27.194.66",
-      "kavlan-18": "10.35.194.66",
-      "kavlan-2": "192.168.210.32",
-      "kavlan-20": "10.43.194.66",
-      "kavlan-21": "10.47.194.66",
-      "kavlan-3": "192.168.226.32",
-      "kavlan-4": "10.4.2.32",
-      "kavlan-5": "10.4.66.32",
-      "kavlan-6": "10.4.130.32",
-      "kavlan-7": "10.4.193.32",
-      "kavlan-8": "10.5.2.32",
-      "kavlan-9": "10.5.66.32"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.32",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:46",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-32.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 18 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:47",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c8ea",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.32",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:ea",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-32-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.32",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:a3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-32-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bee9",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-32"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
deleted file mode 100644
index 3564b62775f4735b476f958c95e8ebcd34322bdd..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": "123456789"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.33",
-      "kavlan-11": "10.7.194.67",
-      "kavlan-12": "10.11.194.67",
-      "kavlan-13": "10.15.194.67",
-      "kavlan-14": "10.19.194.67",
-      "kavlan-16": "10.27.194.67",
-      "kavlan-18": "10.35.194.67",
-      "kavlan-2": "192.168.210.33",
-      "kavlan-20": "10.43.194.67",
-      "kavlan-21": "10.47.194.67",
-      "kavlan-3": "192.168.226.33",
-      "kavlan-4": "10.4.2.33",
-      "kavlan-5": "10.4.66.33",
-      "kavlan-6": "10.4.130.33",
-      "kavlan-7": "10.4.193.33",
-      "kavlan-8": "10.5.2.33",
-      "kavlan-9": "10.5.66.33"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.17.33",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:4c",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-33.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:4d",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "rate": 1000000000,
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca73",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.33",
-      "ip6": "fe80::a00:3800:135:ca73",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:73",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-33-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.33",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:26",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-33-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "rev": 40.0,
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-33"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
deleted file mode 100644
index 5432a7f6481248d3ef4f8c82ca7ff1d1f3386a47..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.34",
-      "kavlan-11": "10.7.194.68",
-      "kavlan-12": "10.11.194.68",
-      "kavlan-13": "10.15.194.68",
-      "kavlan-14": "10.19.194.68",
-      "kavlan-16": "10.27.194.68",
-      "kavlan-18": "10.35.194.68",
-      "kavlan-2": "192.168.210.34",
-      "kavlan-20": "10.43.194.68",
-      "kavlan-21": "10.47.194.68",
-      "kavlan-3": "192.168.226.34",
-      "kavlan-4": "10.4.2.34",
-      "kavlan-5": "10.4.66.34",
-      "kavlan-6": "10.4.130.34",
-      "kavlan-7": "10.4.193.34",
-      "kavlan-8": "10.5.2.34",
-      "kavlan-9": "10.5.66.34"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.34",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:a2",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-34.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:a3",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c974",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.34",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:74",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-34-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.34",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:d1",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-34-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751030225e5",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": 7,
-      "interface": "SATA",
-      "model": "C300-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-34"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
deleted file mode 100644
index 0c6f95dcb0f7120b30a10a960793b7ab75997b9f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": "123456789"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.35",
-      "kavlan-11": "10.7.194.69",
-      "kavlan-12": "10.11.194.69",
-      "kavlan-13": "10.15.194.69",
-      "kavlan-14": "10.19.194.69",
-      "kavlan-16": "10.27.194.69",
-      "kavlan-18": "10.35.194.69",
-      "kavlan-2": "192.168.210.35",
-      "kavlan-20": "10.43.194.69",
-      "kavlan-21": "10.47.194.69",
-      "kavlan-3": "192.168.226.35",
-      "kavlan-4": "10.4.2.35",
-      "kavlan-5": "10.4.66.35",
-      "kavlan-6": "10.4.130.35",
-      "kavlan-7": "10.4.193.35",
-      "kavlan-8": "10.5.2.35",
-      "kavlan-9": "10.5.66.35"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.17.35",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:62",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-35.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:63",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "rate": 1000000000,
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c914",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.35",
-      "ip6": "fe80::a00:3800:135:c914",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:14",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-35-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.35",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:b1",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-35-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "rev": 40.0,
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-35"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
deleted file mode 100644
index 7ee3f3f1ed56dfebb80cec27166c8114c0606369..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.36",
-      "kavlan-11": "10.7.194.70",
-      "kavlan-12": "10.11.194.70",
-      "kavlan-13": "10.15.194.70",
-      "kavlan-14": "10.19.194.70",
-      "kavlan-16": "10.27.194.70",
-      "kavlan-18": "10.35.194.70",
-      "kavlan-2": "192.168.210.36",
-      "kavlan-20": "10.43.194.70",
-      "kavlan-21": "10.47.194.70",
-      "kavlan-3": "192.168.226.36",
-      "kavlan-4": "10.4.2.36",
-      "kavlan-5": "10.4.66.36",
-      "kavlan-6": "10.4.130.36",
-      "kavlan-7": "10.4.193.36",
-      "kavlan-8": "10.5.2.36",
-      "kavlan-9": "10.5.66.36"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.36",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:e6",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-36.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-2",
-      "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.5.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:e7",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c9da",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.36",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:da",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-36-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.36",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:f3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-36-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751031ea9c5",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-36"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
deleted file mode 100644
index e2d57f05ba68dfc8d922d59e4d598a0f1bd97568..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.37",
-      "kavlan-11": "10.7.194.71",
-      "kavlan-12": "10.11.194.71",
-      "kavlan-13": "10.15.194.71",
-      "kavlan-14": "10.19.194.71",
-      "kavlan-16": "10.27.194.71",
-      "kavlan-18": "10.35.194.71",
-      "kavlan-2": "192.168.210.37",
-      "kavlan-20": "10.43.194.71",
-      "kavlan-21": "10.47.194.71",
-      "kavlan-3": "192.168.226.37",
-      "kavlan-4": "10.4.2.37",
-      "kavlan-5": "10.4.66.37",
-      "kavlan-6": "10.4.130.37",
-      "kavlan-7": "10.4.193.37",
-      "kavlan-8": "10.5.2.37",
-      "kavlan-9": "10.5.66.37"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.37",
-      "kavlan": true,
-      "mac": "08:00:38:36:f3:06",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-37.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 5 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:36:f3:07",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x0800380001375e8a",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.37",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:8a",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-37-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "enabled": false,
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.37",
-      "kavlan": false,
-      "mac": "08:00:38:36:af:83",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-37-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf10",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-37"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
deleted file mode 100644
index 142aa6606cc680bd33e8560aee578483e51bc30e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.38",
-      "kavlan-11": "10.7.194.72",
-      "kavlan-12": "10.11.194.72",
-      "kavlan-13": "10.15.194.72",
-      "kavlan-14": "10.19.194.72",
-      "kavlan-16": "10.27.194.72",
-      "kavlan-18": "10.35.194.72",
-      "kavlan-2": "192.168.210.38",
-      "kavlan-20": "10.43.194.72",
-      "kavlan-21": "10.47.194.72",
-      "kavlan-3": "192.168.226.38",
-      "kavlan-4": "10.4.2.38",
-      "kavlan-5": "10.4.66.38",
-      "kavlan-6": "10.4.130.38",
-      "kavlan-7": "10.4.193.38",
-      "kavlan-8": "10.5.2.38",
-      "kavlan-9": "10.5.66.38"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.38",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:d2",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-38.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 6 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:d3",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c9bc",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.38",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:bc",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-38-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.38",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:e9",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-38-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751032ecb1d",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-38"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
deleted file mode 100644
index efa581739384ed725be0f2f9b3863a7d09d282d2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.39",
-      "kavlan-11": "10.7.194.73",
-      "kavlan-12": "10.11.194.73",
-      "kavlan-13": "10.15.194.73",
-      "kavlan-14": "10.19.194.73",
-      "kavlan-16": "10.27.194.73",
-      "kavlan-18": "10.35.194.73",
-      "kavlan-2": "192.168.210.39",
-      "kavlan-20": "10.43.194.73",
-      "kavlan-21": "10.47.194.73",
-      "kavlan-3": "192.168.226.39",
-      "kavlan-4": "10.4.2.39",
-      "kavlan-5": "10.4.66.39",
-      "kavlan-6": "10.4.130.39",
-      "kavlan-7": "10.4.193.39",
-      "kavlan-8": "10.5.2.39",
-      "kavlan-9": "10.5.66.39"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.39",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:2a",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-39.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 7 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:2b",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca40",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.39",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:40",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-39-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.39",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:15",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-39-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf26",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-39"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
deleted file mode 100644
index a756ba2d697cc319dae4509ae81260797afa72b2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": "123456789"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.4",
-      "kavlan-11": "10.7.194.38",
-      "kavlan-12": "10.11.194.38",
-      "kavlan-13": "10.15.194.38",
-      "kavlan-14": "10.19.194.38",
-      "kavlan-16": "10.27.194.38",
-      "kavlan-18": "10.35.194.38",
-      "kavlan-2": "192.168.210.4",
-      "kavlan-20": "10.43.194.38",
-      "kavlan-21": "10.47.194.38",
-      "kavlan-3": "192.168.226.4",
-      "kavlan-4": "10.4.2.4",
-      "kavlan-5": "10.4.66.4",
-      "kavlan-6": "10.4.130.4",
-      "kavlan-7": "10.4.193.4",
-      "kavlan-8": "10.5.2.4",
-      "kavlan-9": "10.5.66.4"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.17.4",
-      "kavlan": true,
-      "mac": "08:00:38:36:d2:4c",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-4.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:36:d2:4d",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "rate": 1000000000,
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x0800380001372d73",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.4",
-      "ip6": "fe80::a00:3800:137:2d73",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:2d:73",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-4-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.4",
-      "kavlan": false,
-      "mac": "08:00:38:36:9f:26",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-4-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "rev": 40.0,
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
deleted file mode 100644
index 8acda7b356b1b59aa955fcf7824360bb3537e5f0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.40",
-      "kavlan-11": "10.7.194.74",
-      "kavlan-12": "10.11.194.74",
-      "kavlan-13": "10.15.194.74",
-      "kavlan-14": "10.19.194.74",
-      "kavlan-16": "10.27.194.74",
-      "kavlan-18": "10.35.194.74",
-      "kavlan-2": "192.168.210.40",
-      "kavlan-20": "10.43.194.74",
-      "kavlan-21": "10.47.194.74",
-      "kavlan-3": "192.168.226.40",
-      "kavlan-4": "10.4.2.40",
-      "kavlan-5": "10.4.66.40",
-      "kavlan-6": "10.4.130.40",
-      "kavlan-7": "10.4.193.40",
-      "kavlan-8": "10.5.2.40",
-      "kavlan-9": "10.5.66.40"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.40",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:a8",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-40.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:a9",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c97d",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.40",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:7d",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-40-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.40",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:d4",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-40-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf13",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-40"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
deleted file mode 100644
index ecd8dc73e865a6e5adf7ec60d9defdf5d4cdca13..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.41",
-      "kavlan-11": "10.7.194.75",
-      "kavlan-12": "10.11.194.75",
-      "kavlan-13": "10.15.194.75",
-      "kavlan-14": "10.19.194.75",
-      "kavlan-16": "10.27.194.75",
-      "kavlan-18": "10.35.194.75",
-      "kavlan-2": "192.168.210.41",
-      "kavlan-20": "10.43.194.75",
-      "kavlan-21": "10.47.194.75",
-      "kavlan-3": "192.168.226.41",
-      "kavlan-4": "10.4.2.41",
-      "kavlan-5": "10.4.66.41",
-      "kavlan-6": "10.4.130.41",
-      "kavlan-7": "10.4.193.41",
-      "kavlan-8": "10.5.2.41",
-      "kavlan-9": "10.5.66.41"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.17.41",
-      "kavlan": true,
-      "mac": "08:00:38:36:f5:a4",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-41.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 9 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:36:f5:a5",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x0800380001376277",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.41",
-      "ip6": "fe80::a00:3800:137:6277",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:62:77",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-41-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "enabled": false,
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.41",
-      "kavlan": false,
-      "mac": "08:00:38:36:b0:d2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-41-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf1f",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "rev": "040H",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-41"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
deleted file mode 100644
index 612f7878f7b721e6905e9707502baaae7b08c6bf..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.42",
-      "kavlan-11": "10.7.194.76",
-      "kavlan-12": "10.11.194.76",
-      "kavlan-13": "10.15.194.76",
-      "kavlan-14": "10.19.194.76",
-      "kavlan-16": "10.27.194.76",
-      "kavlan-18": "10.35.194.76",
-      "kavlan-2": "192.168.210.42",
-      "kavlan-20": "10.43.194.76",
-      "kavlan-21": "10.47.194.76",
-      "kavlan-3": "192.168.226.42",
-      "kavlan-4": "10.4.2.42",
-      "kavlan-5": "10.4.66.42",
-      "kavlan-6": "10.4.130.42",
-      "kavlan-7": "10.4.193.42",
-      "kavlan-8": "10.5.2.42",
-      "kavlan-9": "10.5.66.42"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.42",
-      "kavlan": true,
-      "mac": "08:00:38:36:cf:d8",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-42.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 10 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:36:cf:d9",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x08003800013729c5",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.42",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:29:c5",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-42-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "enabled": false,
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.42",
-      "kavlan": false,
-      "mac": "08:00:38:36:9d:ec",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-42-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367beec",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-42"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
deleted file mode 100644
index be3b08f0985e4eae0298e753eae15d7605689739..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.43",
-      "kavlan-11": "10.7.194.77",
-      "kavlan-12": "10.11.194.77",
-      "kavlan-13": "10.15.194.77",
-      "kavlan-14": "10.19.194.77",
-      "kavlan-16": "10.27.194.77",
-      "kavlan-18": "10.35.194.77",
-      "kavlan-2": "192.168.210.43",
-      "kavlan-20": "10.43.194.77",
-      "kavlan-21": "10.47.194.77",
-      "kavlan-3": "192.168.226.43",
-      "kavlan-4": "10.4.2.43",
-      "kavlan-5": "10.4.66.43",
-      "kavlan-6": "10.4.130.43",
-      "kavlan-7": "10.4.193.43",
-      "kavlan-8": "10.5.2.43",
-      "kavlan-9": "10.5.66.43"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.43",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:d4",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-43.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 11 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:d5",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c9bf",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.43",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:bf",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-43-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.43",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:ea",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-43-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf0e",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-43"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
deleted file mode 100644
index df700a21be5ed5ba00911a3cb77314a95a9cbc83..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.44",
-      "kavlan-11": "10.7.194.78",
-      "kavlan-12": "10.11.194.78",
-      "kavlan-13": "10.15.194.78",
-      "kavlan-14": "10.19.194.78",
-      "kavlan-16": "10.27.194.78",
-      "kavlan-18": "10.35.194.78",
-      "kavlan-2": "192.168.210.44",
-      "kavlan-20": "10.43.194.78",
-      "kavlan-21": "10.47.194.78",
-      "kavlan-3": "192.168.226.44",
-      "kavlan-4": "10.4.2.44",
-      "kavlan-5": "10.4.66.44",
-      "kavlan-6": "10.4.130.44",
-      "kavlan-7": "10.4.193.44",
-      "kavlan-8": "10.5.2.44",
-      "kavlan-9": "10.5.66.44"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.44",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:aa",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-44.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 12 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:ab",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c980",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.44",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:80",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-44-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.44",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:d5",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-44-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751032ecb0b",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-44"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
deleted file mode 100644
index 8d7cb939bb35367681523daf43454a17012cd4ce..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": "123456789"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.46",
-      "kavlan-11": "10.7.194.80",
-      "kavlan-12": "10.11.194.80",
-      "kavlan-13": "10.15.194.80",
-      "kavlan-14": "10.19.194.80",
-      "kavlan-16": "10.27.194.80",
-      "kavlan-18": "10.35.194.80",
-      "kavlan-2": "192.168.210.46",
-      "kavlan-20": "10.43.194.80",
-      "kavlan-21": "10.47.194.80",
-      "kavlan-3": "192.168.226.46",
-      "kavlan-4": "10.4.2.46",
-      "kavlan-5": "10.4.66.46",
-      "kavlan-6": "10.4.130.46",
-      "kavlan-7": "10.4.193.46",
-      "kavlan-8": "10.5.2.46",
-      "kavlan-9": "10.5.66.46"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.17.46",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:4a",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-46.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 14 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:4b",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "rate": 1000000000,
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c8f0",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.46",
-      "ip6": "fe80::a00:3800:135:c8f0",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:f0",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-46-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.46",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:a5",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-46-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "rev": 40.0,
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-46"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
deleted file mode 100644
index f360b486415fbcab934a54714f811f2309b2e87b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.47",
-      "kavlan-11": "10.7.194.81",
-      "kavlan-12": "10.11.194.81",
-      "kavlan-13": "10.15.194.81",
-      "kavlan-14": "10.19.194.81",
-      "kavlan-16": "10.27.194.81",
-      "kavlan-18": "10.35.194.81",
-      "kavlan-2": "192.168.210.47",
-      "kavlan-20": "10.43.194.81",
-      "kavlan-21": "10.47.194.81",
-      "kavlan-3": "192.168.226.47",
-      "kavlan-4": "10.4.2.47",
-      "kavlan-5": "10.4.66.47",
-      "kavlan-6": "10.4.130.47",
-      "kavlan-7": "10.4.193.47",
-      "kavlan-8": "10.5.2.47",
-      "kavlan-9": "10.5.66.47"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.47",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:bc",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-47.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 15 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:bd",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c99b",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.47",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:9b",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-47-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.47",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:de",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-47-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751032f1151",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-47"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
deleted file mode 100644
index 12e7c4b03a6863a8420ca1d3bb37e5a3d8e37815..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.48",
-      "kavlan-11": "10.7.194.82",
-      "kavlan-12": "10.11.194.82",
-      "kavlan-13": "10.15.194.82",
-      "kavlan-14": "10.19.194.82",
-      "kavlan-16": "10.27.194.82",
-      "kavlan-18": "10.35.194.82",
-      "kavlan-2": "192.168.210.48",
-      "kavlan-20": "10.43.194.82",
-      "kavlan-21": "10.47.194.82",
-      "kavlan-3": "192.168.226.48",
-      "kavlan-4": "10.4.2.48",
-      "kavlan-5": "10.4.66.48",
-      "kavlan-6": "10.4.130.48",
-      "kavlan-7": "10.4.193.48",
-      "kavlan-8": "10.5.2.48",
-      "kavlan-9": "10.5.66.48"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.48",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:70",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-48.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 16 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:71",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c929",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.48",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:29",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-48-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.48",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:b8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-48-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bec0",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-48"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
deleted file mode 100644
index 4873360c9b86680d8ec3be49ba3f0887dcb43513..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.49",
-      "kavlan-11": "10.7.194.83",
-      "kavlan-12": "10.11.194.83",
-      "kavlan-13": "10.15.194.83",
-      "kavlan-14": "10.19.194.83",
-      "kavlan-16": "10.27.194.83",
-      "kavlan-18": "10.35.194.83",
-      "kavlan-2": "192.168.210.49",
-      "kavlan-20": "10.43.194.83",
-      "kavlan-21": "10.47.194.83",
-      "kavlan-3": "192.168.226.49",
-      "kavlan-4": "10.4.2.49",
-      "kavlan-5": "10.4.66.49",
-      "kavlan-6": "10.4.130.49",
-      "kavlan-7": "10.4.193.49",
-      "kavlan-8": "10.5.2.49",
-      "kavlan-9": "10.5.66.49"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.49",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:b6",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-49.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 17 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:b7",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c992",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.49",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:92",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-49-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.49",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:db",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-49-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf00",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-49"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
deleted file mode 100644
index 136d9c9aa4eb3fb487c95b3a974ea4045ce48bc7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.5",
-      "kavlan-11": "10.7.194.39",
-      "kavlan-12": "10.11.194.39",
-      "kavlan-13": "10.15.194.39",
-      "kavlan-14": "10.19.194.39",
-      "kavlan-16": "10.27.194.39",
-      "kavlan-18": "10.35.194.39",
-      "kavlan-2": "192.168.210.5",
-      "kavlan-20": "10.43.194.39",
-      "kavlan-21": "10.47.194.39",
-      "kavlan-3": "192.168.226.5",
-      "kavlan-4": "10.4.2.5",
-      "kavlan-5": "10.4.66.5",
-      "kavlan-6": "10.4.130.5",
-      "kavlan-7": "10.4.193.5",
-      "kavlan-8": "10.5.2.5",
-      "kavlan-9": "10.5.66.5"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.5",
-      "kavlan": true,
-      "mac": "08:00:38:36:f3:3a",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-5.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 9 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:36:f3:3b",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x0800380001375ed8",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.5",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:d8",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-5-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "enabled": false,
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.5",
-      "kavlan": false,
-      "mac": "08:00:38:36:af:9d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-5-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf0a",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-5"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
deleted file mode 100644
index 1dfbe31d240b2271d982624b414a3d6fed797c51..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": "123456789"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.50",
-      "kavlan-11": "10.7.194.84",
-      "kavlan-12": "10.11.194.84",
-      "kavlan-13": "10.15.194.84",
-      "kavlan-14": "10.19.194.84",
-      "kavlan-16": "10.27.194.84",
-      "kavlan-18": "10.35.194.84",
-      "kavlan-2": "192.168.210.50",
-      "kavlan-20": "10.43.194.84",
-      "kavlan-21": "10.47.194.84",
-      "kavlan-3": "192.168.226.50",
-      "kavlan-4": "10.4.2.50",
-      "kavlan-5": "10.4.66.50",
-      "kavlan-6": "10.4.130.50",
-      "kavlan-7": "10.4.193.50",
-      "kavlan-8": "10.5.2.50",
-      "kavlan-9": "10.5.66.50"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.17.50",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:10",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-50.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 18 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:11",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "rate": 1000000000,
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca19",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.50",
-      "ip6": "fe80::a00:3800:135:ca19",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:19",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-50-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.50",
-      "kavlan": false,
-      "mac": "00:08:f1:20:07:b8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-50-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "rev": 40.0,
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-50"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
deleted file mode 100644
index 312fbb3f0454cf8a60b93167984d75493311ffd1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.51",
-      "kavlan-11": "10.7.194.85",
-      "kavlan-12": "10.11.194.85",
-      "kavlan-13": "10.15.194.85",
-      "kavlan-14": "10.19.194.85",
-      "kavlan-16": "10.27.194.85",
-      "kavlan-18": "10.35.194.85",
-      "kavlan-2": "192.168.210.51",
-      "kavlan-20": "10.43.194.85",
-      "kavlan-21": "10.47.194.85",
-      "kavlan-3": "192.168.226.51",
-      "kavlan-4": "10.4.2.51",
-      "kavlan-5": "10.4.66.51",
-      "kavlan-6": "10.4.130.51",
-      "kavlan-7": "10.4.193.51",
-      "kavlan-8": "10.5.2.51",
-      "kavlan-9": "10.5.66.51"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.51",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:40",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-51.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:41",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca61",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.51",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:61",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-51-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.51",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:20",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-51-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751032ecb21",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-51"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
deleted file mode 100644
index 102a3efe5533207c3ac109a13bdf07b78bb04aea..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.52",
-      "kavlan-11": "10.7.194.86",
-      "kavlan-12": "10.11.194.86",
-      "kavlan-13": "10.15.194.86",
-      "kavlan-14": "10.19.194.86",
-      "kavlan-16": "10.27.194.86",
-      "kavlan-18": "10.35.194.86",
-      "kavlan-2": "192.168.210.52",
-      "kavlan-20": "10.43.194.86",
-      "kavlan-21": "10.47.194.86",
-      "kavlan-3": "192.168.226.52",
-      "kavlan-4": "10.4.2.52",
-      "kavlan-5": "10.4.66.52",
-      "kavlan-6": "10.4.130.52",
-      "kavlan-7": "10.4.193.52",
-      "kavlan-8": "10.5.2.52",
-      "kavlan-9": "10.5.66.52"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.52",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:1a",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-52.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:1b",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca28",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.52",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:28",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-52-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.52",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:0d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-52-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367beda",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-52"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
deleted file mode 100644
index 2c6aed837fba20c7504907430d753a230d8da1ce..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.53",
-      "kavlan-11": "10.7.194.87",
-      "kavlan-12": "10.11.194.87",
-      "kavlan-13": "10.15.194.87",
-      "kavlan-14": "10.19.194.87",
-      "kavlan-16": "10.27.194.87",
-      "kavlan-18": "10.35.194.87",
-      "kavlan-2": "192.168.210.53",
-      "kavlan-20": "10.43.194.87",
-      "kavlan-21": "10.47.194.87",
-      "kavlan-3": "192.168.226.53",
-      "kavlan-4": "10.4.2.53",
-      "kavlan-5": "10.4.66.53",
-      "kavlan-6": "10.4.130.53",
-      "kavlan-7": "10.4.193.53",
-      "kavlan-8": "10.5.2.53",
-      "kavlan-9": "10.5.66.53"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.53",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:34",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-53.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-3",
-      "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:35",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca4f",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.53",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:4f",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-53-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.53",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:1a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-53-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751032ecb0d",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-53"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
deleted file mode 100644
index 70f8a8553f7c1aec8d7611703e6d43e0bbeeedd7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.55",
-      "kavlan-11": "10.7.194.89",
-      "kavlan-12": "10.11.194.89",
-      "kavlan-13": "10.15.194.89",
-      "kavlan-14": "10.19.194.89",
-      "kavlan-16": "10.27.194.89",
-      "kavlan-18": "10.35.194.89",
-      "kavlan-2": "192.168.210.55",
-      "kavlan-20": "10.43.194.89",
-      "kavlan-21": "10.47.194.89",
-      "kavlan-3": "192.168.226.55",
-      "kavlan-4": "10.4.2.55",
-      "kavlan-5": "10.4.66.55",
-      "kavlan-6": "10.4.130.55",
-      "kavlan-7": "10.4.193.55",
-      "kavlan-8": "10.5.2.55",
-      "kavlan-9": "10.5.66.55"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.55",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:e8",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-55.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 5 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:e9",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c9dd",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.55",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:dd",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-55-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.55",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:f4",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-55-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf1e",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-55"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
deleted file mode 100644
index dd9fec6093f7de07c517b33afbb3bfb6b0ec3648..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.56",
-      "kavlan-11": "10.7.194.90",
-      "kavlan-12": "10.11.194.90",
-      "kavlan-13": "10.15.194.90",
-      "kavlan-14": "10.19.194.90",
-      "kavlan-16": "10.27.194.90",
-      "kavlan-18": "10.35.194.90",
-      "kavlan-2": "192.168.210.56",
-      "kavlan-20": "10.43.194.90",
-      "kavlan-21": "10.47.194.90",
-      "kavlan-3": "192.168.226.56",
-      "kavlan-4": "10.4.2.56",
-      "kavlan-5": "10.4.66.56",
-      "kavlan-6": "10.4.130.56",
-      "kavlan-7": "10.4.193.56",
-      "kavlan-8": "10.5.2.56",
-      "kavlan-9": "10.5.66.56"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.56",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:00",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-56.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 6 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:01",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca01",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.56",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:01",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-56-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.56",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:00",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-56-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367beee",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-56"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
deleted file mode 100644
index f99a8e1eee25cc3fb403d4519efde3f68836562d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.57",
-      "kavlan-11": "10.7.194.91",
-      "kavlan-12": "10.11.194.91",
-      "kavlan-13": "10.15.194.91",
-      "kavlan-14": "10.19.194.91",
-      "kavlan-16": "10.27.194.91",
-      "kavlan-18": "10.35.194.91",
-      "kavlan-2": "192.168.210.57",
-      "kavlan-20": "10.43.194.91",
-      "kavlan-21": "10.47.194.91",
-      "kavlan-3": "192.168.226.57",
-      "kavlan-4": "10.4.2.57",
-      "kavlan-5": "10.4.66.57",
-      "kavlan-6": "10.4.130.57",
-      "kavlan-7": "10.4.193.57",
-      "kavlan-8": "10.5.2.57",
-      "kavlan-9": "10.5.66.57"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.57",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:ae",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-57.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 7 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:af",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c986",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.57",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:86",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-57-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.57",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:d7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-57-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf2b",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-57"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
deleted file mode 100644
index 136964adf8822695db83d15d6480397dc4477df1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.58",
-      "kavlan-11": "10.7.194.92",
-      "kavlan-12": "10.11.194.92",
-      "kavlan-13": "10.15.194.92",
-      "kavlan-14": "10.19.194.92",
-      "kavlan-16": "10.27.194.92",
-      "kavlan-18": "10.35.194.92",
-      "kavlan-2": "192.168.210.58",
-      "kavlan-20": "10.43.194.92",
-      "kavlan-21": "10.47.194.92",
-      "kavlan-3": "192.168.226.58",
-      "kavlan-4": "10.4.2.58",
-      "kavlan-5": "10.4.66.58",
-      "kavlan-6": "10.4.130.58",
-      "kavlan-7": "10.4.193.58",
-      "kavlan-8": "10.5.2.58",
-      "kavlan-9": "10.5.66.58"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.58",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:08",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-58.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:09",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca0d",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.58",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:0d",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-58-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.58",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:04",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-58-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751032ecade",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-58"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
deleted file mode 100644
index 965b55dcac8d5db1e5852a29d6224a81a1879942..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.59",
-      "kavlan-11": "10.7.194.93",
-      "kavlan-12": "10.11.194.93",
-      "kavlan-13": "10.15.194.93",
-      "kavlan-14": "10.19.194.93",
-      "kavlan-16": "10.27.194.93",
-      "kavlan-18": "10.35.194.93",
-      "kavlan-2": "192.168.210.59",
-      "kavlan-20": "10.43.194.93",
-      "kavlan-21": "10.47.194.93",
-      "kavlan-3": "192.168.226.59",
-      "kavlan-4": "10.4.2.59",
-      "kavlan-5": "10.4.66.59",
-      "kavlan-6": "10.4.130.59",
-      "kavlan-7": "10.4.193.59",
-      "kavlan-8": "10.5.2.59",
-      "kavlan-9": "10.5.66.59"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.59",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:5a",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-59.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 9 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:5b",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c908",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.59",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:08",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-59-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.59",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:ad",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-59-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bead",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-59"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
deleted file mode 100644
index 1503f3809c91bdff9e80e488d698bcd935d46a83..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.6",
-      "kavlan-11": "10.7.194.40",
-      "kavlan-12": "10.11.194.40",
-      "kavlan-13": "10.15.194.40",
-      "kavlan-14": "10.19.194.40",
-      "kavlan-16": "10.27.194.40",
-      "kavlan-18": "10.35.194.40",
-      "kavlan-2": "192.168.210.6",
-      "kavlan-20": "10.43.194.40",
-      "kavlan-21": "10.47.194.40",
-      "kavlan-3": "192.168.226.6",
-      "kavlan-4": "10.4.2.6",
-      "kavlan-5": "10.4.66.6",
-      "kavlan-6": "10.4.130.6",
-      "kavlan-7": "10.4.193.6",
-      "kavlan-8": "10.5.2.6",
-      "kavlan-9": "10.5.66.6"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.6",
-      "kavlan": true,
-      "mac": "08:00:38:36:ec:5e",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-6.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 10 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:36:ec:5f",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000137548e",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.6",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:54:8e",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-6-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "enabled": false,
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "management": false,
-      "mountable": false,
-      "mounted": false
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.6",
-      "kavlan": false,
-      "mac": "08:00:38:36:ac:2f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-6-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bec8",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-6"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
deleted file mode 100644
index 08a3078a3402705b6ab827fe52fd033a5e4fc401..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.60",
-      "kavlan-11": "10.7.194.94",
-      "kavlan-12": "10.11.194.94",
-      "kavlan-13": "10.15.194.94",
-      "kavlan-14": "10.19.194.94",
-      "kavlan-16": "10.27.194.94",
-      "kavlan-18": "10.35.194.94",
-      "kavlan-2": "192.168.210.60",
-      "kavlan-20": "10.43.194.94",
-      "kavlan-21": "10.47.194.94",
-      "kavlan-3": "192.168.226.60",
-      "kavlan-4": "10.4.2.60",
-      "kavlan-5": "10.4.66.60",
-      "kavlan-6": "10.4.130.60",
-      "kavlan-7": "10.4.193.60",
-      "kavlan-8": "10.5.2.60",
-      "kavlan-9": "10.5.66.60"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.60",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:24",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-60.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 10 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:25",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca37",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.60",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:37",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-60-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.60",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:12",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-60-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751032eca65",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-60"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
deleted file mode 100644
index 07daa21f85f68e5d4f26f6b55335f238e8b6a413..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.62",
-      "kavlan-11": "10.7.194.96",
-      "kavlan-12": "10.11.194.96",
-      "kavlan-13": "10.15.194.96",
-      "kavlan-14": "10.19.194.96",
-      "kavlan-16": "10.27.194.96",
-      "kavlan-18": "10.35.194.96",
-      "kavlan-2": "192.168.210.62",
-      "kavlan-20": "10.43.194.96",
-      "kavlan-21": "10.47.194.96",
-      "kavlan-3": "192.168.226.62",
-      "kavlan-4": "10.4.2.62",
-      "kavlan-5": "10.4.66.62",
-      "kavlan-6": "10.4.130.62",
-      "kavlan-7": "10.4.193.62",
-      "kavlan-8": "10.5.2.62",
-      "kavlan-9": "10.5.66.62"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.62",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:da",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-62.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 12 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:db",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c9c8",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.62",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c8",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-62-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.62",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:ed",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-62-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf02",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-62"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
deleted file mode 100644
index 3de695f6f1305477a33d0951e0f4ea339c844592..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": "123456789"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.63",
-      "kavlan-11": "10.7.194.97",
-      "kavlan-12": "10.11.194.97",
-      "kavlan-13": "10.15.194.97",
-      "kavlan-14": "10.19.194.97",
-      "kavlan-16": "10.27.194.97",
-      "kavlan-18": "10.35.194.97",
-      "kavlan-2": "192.168.210.63",
-      "kavlan-20": "10.43.194.97",
-      "kavlan-21": "10.47.194.97",
-      "kavlan-3": "192.168.226.63",
-      "kavlan-4": "10.4.2.63",
-      "kavlan-5": "10.4.66.63",
-      "kavlan-6": "10.4.130.63",
-      "kavlan-7": "10.4.193.63",
-      "kavlan-8": "10.5.2.63",
-      "kavlan-9": "10.5.66.63"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.17.63",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:b2",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-63.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 13 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:b3",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "rate": 1000000000,
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c98c",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.63",
-      "ip6": "fe80::a00:3800:135:c98c",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:8c",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-63-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.63",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:d9",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-63-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "rev": 40.0,
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-63"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
deleted file mode 100644
index 8f077df00aa482b2e3ee2420a11fb7fc127f1bf0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.64",
-      "kavlan-11": "10.7.194.98",
-      "kavlan-12": "10.11.194.98",
-      "kavlan-13": "10.15.194.98",
-      "kavlan-14": "10.19.194.98",
-      "kavlan-16": "10.27.194.98",
-      "kavlan-18": "10.35.194.98",
-      "kavlan-2": "192.168.210.64",
-      "kavlan-20": "10.43.194.98",
-      "kavlan-21": "10.47.194.98",
-      "kavlan-3": "192.168.226.64",
-      "kavlan-4": "10.4.2.64",
-      "kavlan-5": "10.4.66.64",
-      "kavlan-6": "10.4.130.64",
-      "kavlan-7": "10.4.193.64",
-      "kavlan-8": "10.5.2.64",
-      "kavlan-9": "10.5.66.64"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.64",
-      "kavlan": true,
-      "mac": "08:00:38:35:ad:be",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-64.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 14 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ad:bf",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135cc9e",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.64",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:cc:9e",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-64-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.64",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:df",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-64-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510202c00f",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-64"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
deleted file mode 100644
index a5f0dc62dcb640684da3e9688c308cee6f14fee8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.65",
-      "kavlan-11": "10.7.194.99",
-      "kavlan-12": "10.11.194.99",
-      "kavlan-13": "10.15.194.99",
-      "kavlan-14": "10.19.194.99",
-      "kavlan-16": "10.27.194.99",
-      "kavlan-18": "10.35.194.99",
-      "kavlan-2": "192.168.210.65",
-      "kavlan-20": "10.43.194.99",
-      "kavlan-21": "10.47.194.99",
-      "kavlan-3": "192.168.226.65",
-      "kavlan-4": "10.4.2.65",
-      "kavlan-5": "10.4.66.65",
-      "kavlan-6": "10.4.130.65",
-      "kavlan-7": "10.4.193.65",
-      "kavlan-8": "10.5.2.65",
-      "kavlan-9": "10.5.66.65"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.65",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:e4",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-65.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 15 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:e5",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c9d7",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.65",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:d7",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-65-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.65",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:f2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-65-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf05",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-65"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
deleted file mode 100644
index 6dae8fa8ef02f4f3447344905ff3c1f1bc0a7b9d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.66",
-      "kavlan-11": "10.7.194.100",
-      "kavlan-12": "10.11.194.100",
-      "kavlan-13": "10.15.194.100",
-      "kavlan-14": "10.19.194.100",
-      "kavlan-16": "10.27.194.100",
-      "kavlan-18": "10.35.194.100",
-      "kavlan-2": "192.168.210.66",
-      "kavlan-20": "10.43.194.100",
-      "kavlan-21": "10.47.194.100",
-      "kavlan-3": "192.168.226.66",
-      "kavlan-4": "10.4.2.66",
-      "kavlan-5": "10.4.66.66",
-      "kavlan-6": "10.4.130.66",
-      "kavlan-7": "10.4.193.66",
-      "kavlan-8": "10.5.2.66",
-      "kavlan-9": "10.5.66.66"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.66",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:14",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-66.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 16 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:15",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca1f",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.66",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:1f",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-66-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.66",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:0a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-66-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf1a",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-66"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
deleted file mode 100644
index 3d2d7476610eb7c24a364080e3ebc925a108cfe9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.67",
-      "kavlan-11": "10.7.194.101",
-      "kavlan-12": "10.11.194.101",
-      "kavlan-13": "10.15.194.101",
-      "kavlan-14": "10.19.194.101",
-      "kavlan-16": "10.27.194.101",
-      "kavlan-18": "10.35.194.101",
-      "kavlan-2": "192.168.210.67",
-      "kavlan-20": "10.43.194.101",
-      "kavlan-21": "10.47.194.101",
-      "kavlan-3": "192.168.226.67",
-      "kavlan-4": "10.4.2.67",
-      "kavlan-5": "10.4.66.67",
-      "kavlan-6": "10.4.130.67",
-      "kavlan-7": "10.4.193.67",
-      "kavlan-8": "10.5.2.67",
-      "kavlan-9": "10.5.66.67"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.67",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:fa",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-67.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 17 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:fb",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c9f8",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.67",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:f8",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-67-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.67",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:fd",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-67-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367befe",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-67"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
deleted file mode 100644
index 133b26d38d93a61ffb536811079b2b4b9faca862..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.68",
-      "kavlan-11": "10.7.194.102",
-      "kavlan-12": "10.11.194.102",
-      "kavlan-13": "10.15.194.102",
-      "kavlan-14": "10.19.194.102",
-      "kavlan-16": "10.27.194.102",
-      "kavlan-18": "10.35.194.102",
-      "kavlan-2": "192.168.210.68",
-      "kavlan-20": "10.43.194.102",
-      "kavlan-21": "10.47.194.102",
-      "kavlan-3": "192.168.226.68",
-      "kavlan-4": "10.4.2.68",
-      "kavlan-5": "10.4.66.68",
-      "kavlan-6": "10.4.130.68",
-      "kavlan-7": "10.4.193.68",
-      "kavlan-8": "10.5.2.68",
-      "kavlan-9": "10.5.66.68"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.68",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:b0",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-68.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 18 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:b1",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c989",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.68",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:89",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-68-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.68",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:d8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-68-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bec6",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-68"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
deleted file mode 100644
index d27620d896856b4e0029e282c8db530eb52e6221..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.69",
-      "kavlan-11": "10.7.194.103",
-      "kavlan-12": "10.11.194.103",
-      "kavlan-13": "10.15.194.103",
-      "kavlan-14": "10.19.194.103",
-      "kavlan-16": "10.27.194.103",
-      "kavlan-18": "10.35.194.103",
-      "kavlan-2": "192.168.210.69",
-      "kavlan-20": "10.43.194.103",
-      "kavlan-21": "10.47.194.103",
-      "kavlan-3": "192.168.226.69",
-      "kavlan-4": "10.4.2.69",
-      "kavlan-5": "10.4.66.69",
-      "kavlan-6": "10.4.130.69",
-      "kavlan-7": "10.4.193.69",
-      "kavlan-8": "10.5.2.69",
-      "kavlan-9": "10.5.66.69"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.69",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:68",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-69.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 19 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:69",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca9d",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.69",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:9d",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-69-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.69",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:34",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-69-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367befa",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-69"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
deleted file mode 100644
index 5d35c88eb1a82c5f25c7b32c2c3b6cd3dd6f1585..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.7",
-      "kavlan-11": "10.7.194.41",
-      "kavlan-12": "10.11.194.41",
-      "kavlan-13": "10.15.194.41",
-      "kavlan-14": "10.19.194.41",
-      "kavlan-16": "10.27.194.41",
-      "kavlan-18": "10.35.194.41",
-      "kavlan-2": "192.168.210.7",
-      "kavlan-20": "10.43.194.41",
-      "kavlan-21": "10.47.194.41",
-      "kavlan-3": "192.168.226.7",
-      "kavlan-4": "10.4.2.7",
-      "kavlan-5": "10.4.66.7",
-      "kavlan-6": "10.4.130.7",
-      "kavlan-7": "10.4.193.7",
-      "kavlan-8": "10.5.2.7",
-      "kavlan-9": "10.5.66.7"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.7",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:40",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-7.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 11 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:41",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c8e1",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.7",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:e1",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-7-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.7",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:a0",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-7-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a0751032ecad1",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA064M",
-      "size": 64023257088,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-7"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
deleted file mode 100644
index 7c4a39c32b5c451317a713353cf0961444d0a212..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.70",
-      "kavlan-11": "10.7.194.104",
-      "kavlan-12": "10.11.194.104",
-      "kavlan-13": "10.15.194.104",
-      "kavlan-14": "10.19.194.104",
-      "kavlan-16": "10.27.194.104",
-      "kavlan-18": "10.35.194.104",
-      "kavlan-2": "192.168.210.70",
-      "kavlan-20": "10.43.194.104",
-      "kavlan-21": "10.47.194.104",
-      "kavlan-3": "192.168.226.70",
-      "kavlan-4": "10.4.2.70",
-      "kavlan-5": "10.4.66.70",
-      "kavlan-6": "10.4.130.70",
-      "kavlan-7": "10.4.193.70",
-      "kavlan-8": "10.5.2.70",
-      "kavlan-9": "10.5.66.70"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.17.70",
-      "kavlan": true,
-      "mac": "08:00:38:35:ac:66",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-70.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 20 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ac:67",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135ca9a",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.70",
-      "ip6": "fe80::a00:3800:135:ca9a",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:9a",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-70-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.70",
-      "kavlan": false,
-      "mac": "08:00:38:35:a4:33",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-70-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367beaf",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "rev": "040H",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-70"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
deleted file mode 100644
index cf3070896f4efc3a295a867ad933221974a30c9d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.71",
-      "kavlan-11": "10.7.194.105",
-      "kavlan-12": "10.11.194.105",
-      "kavlan-13": "10.15.194.105",
-      "kavlan-14": "10.19.194.105",
-      "kavlan-16": "10.27.194.105",
-      "kavlan-18": "10.35.194.105",
-      "kavlan-2": "192.168.210.71",
-      "kavlan-20": "10.43.194.105",
-      "kavlan-21": "10.47.194.105",
-      "kavlan-3": "192.168.226.71",
-      "kavlan-4": "10.4.2.71",
-      "kavlan-5": "10.4.66.71",
-      "kavlan-6": "10.4.130.71",
-      "kavlan-7": "10.4.193.71",
-      "kavlan-8": "10.5.2.71",
-      "kavlan-9": "10.5.66.71"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.71",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:66",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-71.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 21 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:67",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c91a",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.71",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:1a",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-71-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.71",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:b3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-71-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bed6",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-71"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
deleted file mode 100644
index eb543bf23c21a51e75533ff1036f4d7e49ff4f6b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": "123456789"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.72",
-      "kavlan-11": "10.7.194.106",
-      "kavlan-12": "10.11.194.106",
-      "kavlan-13": "10.15.194.106",
-      "kavlan-14": "10.19.194.106",
-      "kavlan-16": "10.27.194.106",
-      "kavlan-18": "10.35.194.106",
-      "kavlan-2": "192.168.210.72",
-      "kavlan-20": "10.43.194.106",
-      "kavlan-21": "10.47.194.106",
-      "kavlan-3": "192.168.226.72",
-      "kavlan-4": "10.4.2.72",
-      "kavlan-5": "10.4.66.72",
-      "kavlan-6": "10.4.130.72",
-      "kavlan-7": "10.4.193.72",
-      "kavlan-8": "10.5.2.72",
-      "kavlan-9": "10.5.66.72"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.17.72",
-      "kavlan": true,
-      "mac": "08:00:38:36:f3:dc",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-72.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-4",
-      "switch_port": "Unit: 1 Slot: 0 Port: 22 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:36:f3:dd",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "rate": 1000000000,
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x0800380001375fcb",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.72",
-      "ip6": "fe80::a00:3800:137:5fcb",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:5f:cb",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-72-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.72",
-      "kavlan": false,
-      "mac": "08:00:38:36:af:ee",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-72-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "node-was-not-available-to-retrieve-this-value",
-      "device": "sda",
-      "driver": "ahci",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "rev": 40.0,
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-72"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
deleted file mode 100644
index cf51f2fdc73579e67568802f57651b5b8944e834..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.8",
-      "kavlan-11": "10.7.194.42",
-      "kavlan-12": "10.11.194.42",
-      "kavlan-13": "10.15.194.42",
-      "kavlan-14": "10.19.194.42",
-      "kavlan-16": "10.27.194.42",
-      "kavlan-18": "10.35.194.42",
-      "kavlan-2": "192.168.210.8",
-      "kavlan-20": "10.43.194.42",
-      "kavlan-21": "10.47.194.42",
-      "kavlan-3": "192.168.226.8",
-      "kavlan-4": "10.4.2.8",
-      "kavlan-5": "10.4.66.8",
-      "kavlan-6": "10.4.130.8",
-      "kavlan-7": "10.4.193.8",
-      "kavlan-8": "10.5.2.8",
-      "kavlan-9": "10.5.66.8"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.8",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:56",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-8.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 12 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:57",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c902",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.8",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:02",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-8-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.8",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:ab",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-8-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367bf1b",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-8"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
deleted file mode 100644
index b9882f9982a8cc8d6f0c778a787b7a62475930a6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/26/2011",
-    "vendor": "INSYDE",
-    "version": "Thurley.3.60.18.0037_BUILD_NCB_N00021"
-  },
-  "chassis": {
-    "manufacturer": "INSYDE",
-    "name": "Thurley",
-    "serial": 123456789
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.194.9",
-      "kavlan-11": "10.7.194.43",
-      "kavlan-12": "10.11.194.43",
-      "kavlan-13": "10.15.194.43",
-      "kavlan-14": "10.19.194.43",
-      "kavlan-16": "10.27.194.43",
-      "kavlan-18": "10.35.194.43",
-      "kavlan-2": "192.168.210.9",
-      "kavlan-20": "10.43.194.43",
-      "kavlan-21": "10.47.194.43",
-      "kavlan-3": "192.168.226.9",
-      "kavlan-4": "10.4.2.9",
-      "kavlan-5": "10.4.66.9",
-      "kavlan-6": "10.4.130.9",
-      "kavlan-7": "10.4.193.9",
-      "kavlan-8": "10.5.2.9",
-      "kavlan-9": "10.5.66.9"
-    }
-  },
-  "main_memory": {
-    "ram_size": 25769803776
-  },
-  "monitoring": {
-    "wattmeter": "outofband"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "igb",
-      "enabled": true,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "ip": "172.16.17.9",
-      "kavlan": true,
-      "mac": "08:00:38:35:ab:d8",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp1s0f0",
-      "network_address": "edel-9.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sw-edel-1",
-      "switch_port": "Unit: 1 Slot: 0 Port: 13 Gigabit - Level",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "2.0.6",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "08:00:38:35:ab:d9",
-      "management": false,
-      "model": "82576 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp1s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "guid": "0x080038000135c9c5",
-      "interface": "InfiniBand",
-      "ip": "172.18.17.9",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c5",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "edel-9-ib0.grenoble.grid5000.fr",
-      "rate": 40000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "guid": "0x0000000000000000",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
-      "management": false,
-      "model": "MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.17.9",
-      "kavlan": false,
-      "mac": "08:00:38:35:a3:ec",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "edel-9-bmc.grenoble.grid5000.fr",
-      "rate": 100000000,
-      "vendor": "Unknown"
-    }
-  ],
-  "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": 7134000000,
-    "node_flops": 55450000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Nehalem",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz",
-    "vendor": "Intel",
-    "version": "E5520"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "ipmi": {
-          "sensors": {
-            "Power": "Power"
-          }
-        }
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x500a07510367beb5",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "040H",
-      "interface": "SATA",
-      "model": "C400-MTFDDAA128M",
-      "size": 128035676160,
-      "storage": "SSD",
-      "vendor": "ATA"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "edel-9"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/genepi.json b/data/grid5000/sites/grenoble/clusters/genepi/genepi.json
deleted file mode 100644
index 7a5f6c1fac0138f856b6412fb0bf98db90e5b722..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/genepi.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "created_at": "Tue, 30 Sep 2008 22:00:00 GMT",
-  "kavlan": true,
-  "model": "Bull R422-E1",
-  "queues": [
-    "default",
-    "admin"
-  ],
-  "type": "cluster",
-  "uid": "genepi"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
deleted file mode 100644
index 1ff18255967f94a70c6ecb9f7df75f70a2ff4b63..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00183"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.1",
-      "kavlan-11": "10.7.194.1",
-      "kavlan-12": "10.11.194.1",
-      "kavlan-13": "10.15.194.1",
-      "kavlan-14": "10.19.194.1",
-      "kavlan-16": "10.27.194.1",
-      "kavlan-18": "10.35.194.1",
-      "kavlan-2": "192.168.211.1",
-      "kavlan-20": "10.43.194.1",
-      "kavlan-21": "10.47.194.1",
-      "kavlan-3": "192.168.227.1",
-      "kavlan-4": "10.4.3.1",
-      "kavlan-5": "10.4.67.1",
-      "kavlan-6": "10.4.131.1",
-      "kavlan-7": "10.4.194.1",
-      "kavlan-8": "10.5.3.1",
-      "kavlan-9": "10.5.67.1"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:85:be",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.1",
-      "kavlan": true,
-      "mac": "00:30:48:7f:85:bf",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-1.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:22",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000158b9",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.1",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:b9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-1-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000158ba",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:ba",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.1",
-      "kavlan": false,
-      "mac": "00:30:48:96:d6:b5",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-1-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee155ea69d5",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
deleted file mode 100644
index 56fc42f2d0596352c9c2f1052857b793099e698d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00187"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.10",
-      "kavlan-11": "10.7.194.10",
-      "kavlan-12": "10.11.194.10",
-      "kavlan-13": "10.15.194.10",
-      "kavlan-14": "10.19.194.10",
-      "kavlan-16": "10.27.194.10",
-      "kavlan-18": "10.35.194.10",
-      "kavlan-2": "192.168.211.10",
-      "kavlan-20": "10.43.194.10",
-      "kavlan-21": "10.47.194.10",
-      "kavlan-3": "192.168.227.10",
-      "kavlan-4": "10.4.3.10",
-      "kavlan-5": "10.4.67.10",
-      "kavlan-6": "10.4.131.10",
-      "kavlan-7": "10.4.194.10",
-      "kavlan-8": "10.5.3.10",
-      "kavlan-9": "10.5.67.10"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:41:fc",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.10",
-      "kavlan": true,
-      "mac": "00:30:48:7f:41:fd",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-10.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:37",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000159a5",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.10",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-10-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000159a6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a6",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.10",
-      "kavlan": false,
-      "mac": "00:30:48:96:d7:76",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-10-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1ab3942f4",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-10"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
deleted file mode 100644
index a3100ffcfb90c9013eefb38674b5cd6fa884c160..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00188"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.11",
-      "kavlan-11": "10.7.194.11",
-      "kavlan-12": "10.11.194.11",
-      "kavlan-13": "10.15.194.11",
-      "kavlan-14": "10.19.194.11",
-      "kavlan-16": "10.27.194.11",
-      "kavlan-18": "10.35.194.11",
-      "kavlan-2": "192.168.211.11",
-      "kavlan-20": "10.43.194.11",
-      "kavlan-21": "10.47.194.11",
-      "kavlan-3": "192.168.227.11",
-      "kavlan-4": "10.4.3.11",
-      "kavlan-5": "10.4.67.11",
-      "kavlan-6": "10.4.131.11",
-      "kavlan-7": "10.4.194.11",
-      "kavlan-8": "10.5.3.11",
-      "kavlan-9": "10.5.67.11"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:42:06",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.11",
-      "kavlan": true,
-      "mac": "00:30:48:7f:42:07",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-11.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:9",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015431",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.11",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:54:31",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-11-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015432",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:54:32",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.11",
-      "kavlan": false,
-      "mac": "00:30:48:96:d6:90",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-11-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1ab396547",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-11"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
deleted file mode 100644
index a3676fe2a40efe89c9092e92b308cc3c0318e19c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00188"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.12",
-      "kavlan-11": "10.7.194.12",
-      "kavlan-12": "10.11.194.12",
-      "kavlan-13": "10.15.194.12",
-      "kavlan-14": "10.19.194.12",
-      "kavlan-16": "10.27.194.12",
-      "kavlan-18": "10.35.194.12",
-      "kavlan-2": "192.168.211.12",
-      "kavlan-20": "10.43.194.12",
-      "kavlan-21": "10.47.194.12",
-      "kavlan-3": "192.168.227.12",
-      "kavlan-4": "10.4.3.12",
-      "kavlan-5": "10.4.67.12",
-      "kavlan-6": "10.4.131.12",
-      "kavlan-7": "10.4.194.12",
-      "kavlan-8": "10.5.3.12",
-      "kavlan-9": "10.5.67.12"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7e:a3:d4",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.12",
-      "kavlan": true,
-      "mac": "00:30:48:7e:a3:d5",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-12.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:38",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000159a1",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.12",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a1",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-12-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000159a2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a2",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.12",
-      "kavlan": false,
-      "mac": "00:30:48:96:d2:39",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-12-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee100956ff0",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-12"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
deleted file mode 100644
index 1efb99f6ad0f625165fd10f0bfd2ccadd94d7381..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00189"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.13",
-      "kavlan-11": "10.7.194.13",
-      "kavlan-12": "10.11.194.13",
-      "kavlan-13": "10.15.194.13",
-      "kavlan-14": "10.19.194.13",
-      "kavlan-16": "10.27.194.13",
-      "kavlan-18": "10.35.194.13",
-      "kavlan-2": "192.168.211.13",
-      "kavlan-20": "10.43.194.13",
-      "kavlan-21": "10.47.194.13",
-      "kavlan-3": "192.168.227.13",
-      "kavlan-4": "10.4.3.13",
-      "kavlan-5": "10.4.67.13",
-      "kavlan-6": "10.4.131.13",
-      "kavlan-7": "10.4.194.13",
-      "kavlan-8": "10.5.3.13",
-      "kavlan-9": "10.5.67.13"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:3e:c6",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.13",
-      "kavlan": true,
-      "mac": "00:30:48:7f:3e:c7",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-13.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:17",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155c9",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.13",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:c9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-13-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155ca",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ca",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.13",
-      "kavlan": false,
-      "mac": "00:30:48:96:d4:9a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-13-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee155f09c9c",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-13"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
deleted file mode 100644
index 2eebfb4b81939b8934769d68944948e6ae0977e6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00189"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.14",
-      "kavlan-11": "10.7.194.14",
-      "kavlan-12": "10.11.194.14",
-      "kavlan-13": "10.15.194.14",
-      "kavlan-14": "10.19.194.14",
-      "kavlan-16": "10.27.194.14",
-      "kavlan-18": "10.35.194.14",
-      "kavlan-2": "192.168.211.14",
-      "kavlan-20": "10.43.194.14",
-      "kavlan-21": "10.47.194.14",
-      "kavlan-3": "192.168.227.14",
-      "kavlan-4": "10.4.3.14",
-      "kavlan-5": "10.4.67.14",
-      "kavlan-6": "10.4.131.14",
-      "kavlan-7": "10.4.194.14",
-      "kavlan-8": "10.5.3.14",
-      "kavlan-9": "10.5.67.14"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:41:f2",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.14",
-      "kavlan": true,
-      "mac": "00:30:48:7f:41:f3",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-14.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:29",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155cd",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.14",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:cd",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-14-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155ce",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ce",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.14",
-      "kavlan": false,
-      "mac": "00:30:48:96:d3:40",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-14-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1009bccc2",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-14"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
deleted file mode 100644
index 3477ab4fdf8228197c09ae119c54719cd198b0f4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00190"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.15",
-      "kavlan-11": "10.7.194.15",
-      "kavlan-12": "10.11.194.15",
-      "kavlan-13": "10.15.194.15",
-      "kavlan-14": "10.19.194.15",
-      "kavlan-16": "10.27.194.15",
-      "kavlan-18": "10.35.194.15",
-      "kavlan-2": "192.168.211.15",
-      "kavlan-20": "10.43.194.15",
-      "kavlan-21": "10.47.194.15",
-      "kavlan-3": "192.168.227.15",
-      "kavlan-4": "10.4.3.15",
-      "kavlan-5": "10.4.67.15",
-      "kavlan-6": "10.4.131.15",
-      "kavlan-7": "10.4.194.15",
-      "kavlan-8": "10.5.3.15",
-      "kavlan-9": "10.5.67.15"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:3e:f2",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.15",
-      "kavlan": true,
-      "mac": "00:30:48:7f:3e:f3",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-15.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:7",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155d9",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.15",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-15-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155da",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:da",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.15",
-      "kavlan": false,
-      "mac": "00:30:48:96:d3:2f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-15-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1ab3fa9f1",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-15"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
deleted file mode 100644
index dbd90d66dc6e9a2e8cbeff77849ba907f89d4d0d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00190"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.16",
-      "kavlan-11": "10.7.194.16",
-      "kavlan-12": "10.11.194.16",
-      "kavlan-13": "10.15.194.16",
-      "kavlan-14": "10.19.194.16",
-      "kavlan-16": "10.27.194.16",
-      "kavlan-18": "10.35.194.16",
-      "kavlan-2": "192.168.211.16",
-      "kavlan-20": "10.43.194.16",
-      "kavlan-21": "10.47.194.16",
-      "kavlan-3": "192.168.227.16",
-      "kavlan-4": "10.4.3.16",
-      "kavlan-5": "10.4.67.16",
-      "kavlan-6": "10.4.131.16",
-      "kavlan-7": "10.4.194.16",
-      "kavlan-8": "10.5.3.16",
-      "kavlan-9": "10.5.67.16"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:3e:b8",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.16",
-      "kavlan": true,
-      "mac": "00:30:48:7f:3e:b9",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-16.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:25",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155e9",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.16",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-16-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155ea",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ea",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.16",
-      "kavlan": false,
-      "mac": "00:30:48:96:d4:37",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-16-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1ab3fa9d6",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-16"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
deleted file mode 100644
index 3970fb7e27ff8bf231f4fcbbe8fe671ac80778d3..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00191"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.17",
-      "kavlan-11": "10.7.194.17",
-      "kavlan-12": "10.11.194.17",
-      "kavlan-13": "10.15.194.17",
-      "kavlan-14": "10.19.194.17",
-      "kavlan-16": "10.27.194.17",
-      "kavlan-18": "10.35.194.17",
-      "kavlan-2": "192.168.211.17",
-      "kavlan-20": "10.43.194.17",
-      "kavlan-21": "10.47.194.17",
-      "kavlan-3": "192.168.227.17",
-      "kavlan-4": "10.4.3.17",
-      "kavlan-5": "10.4.67.17",
-      "kavlan-6": "10.4.131.17",
-      "kavlan-7": "10.4.194.17",
-      "kavlan-8": "10.5.3.17",
-      "kavlan-9": "10.5.67.17"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:8a:8c",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.17",
-      "kavlan": true,
-      "mac": "00:30:48:7f:8a:8d",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-17.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:6",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155e1",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.17",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e1",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-17-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155e2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e2",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.17",
-      "kavlan": false,
-      "mac": "00:30:48:96:d2:42",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-17-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee155ea2c07",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-17"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
deleted file mode 100644
index 94660be35c31afbdbc2f5df4888317ec5b7e1786..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00119"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.18",
-      "kavlan-11": "10.7.194.18",
-      "kavlan-12": "10.11.194.18",
-      "kavlan-13": "10.15.194.18",
-      "kavlan-14": "10.19.194.18",
-      "kavlan-16": "10.27.194.18",
-      "kavlan-18": "10.35.194.18",
-      "kavlan-2": "192.168.211.18",
-      "kavlan-20": "10.43.194.18",
-      "kavlan-21": "10.47.194.18",
-      "kavlan-3": "192.168.227.18",
-      "kavlan-4": "10.4.3.18",
-      "kavlan-5": "10.4.67.18",
-      "kavlan-6": "10.4.131.18",
-      "kavlan-7": "10.4.194.18",
-      "kavlan-8": "10.5.3.18",
-      "kavlan-9": "10.5.67.18"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:85:fa",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.18",
-      "kavlan": true,
-      "mac": "00:30:48:7f:85:fb",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-18.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:27",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155d5",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.18",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-18-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155d6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d6",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.18",
-      "kavlan": false,
-      "mac": "00:30:48:96:d3:4d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-18-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee155ea4e1c",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-18"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
deleted file mode 100644
index 70cb3c3b034700d56709d8119dd1678511091d60..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00192"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.19",
-      "kavlan-11": "10.7.194.19",
-      "kavlan-12": "10.11.194.19",
-      "kavlan-13": "10.15.194.19",
-      "kavlan-14": "10.19.194.19",
-      "kavlan-16": "10.27.194.19",
-      "kavlan-18": "10.35.194.19",
-      "kavlan-2": "192.168.211.19",
-      "kavlan-20": "10.43.194.19",
-      "kavlan-21": "10.47.194.19",
-      "kavlan-3": "192.168.227.19",
-      "kavlan-4": "10.4.3.19",
-      "kavlan-5": "10.4.67.19",
-      "kavlan-6": "10.4.131.19",
-      "kavlan-7": "10.4.194.19",
-      "kavlan-8": "10.5.3.19",
-      "kavlan-9": "10.5.67.19"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:8a:8a",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.19",
-      "kavlan": true,
-      "mac": "00:30:48:7f:8a:8b",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-19.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:16",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c9030001565d",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.19",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:5d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-19-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c9030001565e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:5e",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.19",
-      "kavlan": false,
-      "mac": "00:30:48:96:d1:f5",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-19-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1009bd2a6",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-19"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
deleted file mode 100644
index b4cd954399596018b8eda8ff73b7241df15bd567..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00183"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.2",
-      "kavlan-11": "10.7.194.2",
-      "kavlan-12": "10.11.194.2",
-      "kavlan-13": "10.15.194.2",
-      "kavlan-14": "10.19.194.2",
-      "kavlan-16": "10.27.194.2",
-      "kavlan-18": "10.35.194.2",
-      "kavlan-2": "192.168.211.2",
-      "kavlan-20": "10.43.194.2",
-      "kavlan-21": "10.47.194.2",
-      "kavlan-3": "192.168.227.2",
-      "kavlan-4": "10.4.3.2",
-      "kavlan-5": "10.4.67.2",
-      "kavlan-6": "10.4.131.2",
-      "kavlan-7": "10.4.194.2",
-      "kavlan-8": "10.5.3.2",
-      "kavlan-9": "10.5.67.2"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:91:62",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.2",
-      "kavlan": true,
-      "mac": "00:30:48:7f:91:63",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-2.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:42",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000158d5",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.2",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:d5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-2-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000158d6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:d6",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.2",
-      "kavlan": false,
-      "mac": "00:30:48:96:d1:e2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-2-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee155ea4a58",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
deleted file mode 100644
index d14a4be64b7f34b42bfcbe82403197ddadbf2e0f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00192"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.20",
-      "kavlan-11": "10.7.194.20",
-      "kavlan-12": "10.11.194.20",
-      "kavlan-13": "10.15.194.20",
-      "kavlan-14": "10.19.194.20",
-      "kavlan-16": "10.27.194.20",
-      "kavlan-18": "10.35.194.20",
-      "kavlan-2": "192.168.211.20",
-      "kavlan-20": "10.43.194.20",
-      "kavlan-21": "10.47.194.20",
-      "kavlan-3": "192.168.227.20",
-      "kavlan-4": "10.4.3.20",
-      "kavlan-5": "10.4.67.20",
-      "kavlan-6": "10.4.131.20",
-      "kavlan-7": "10.4.194.20",
-      "kavlan-8": "10.5.3.20",
-      "kavlan-9": "10.5.67.20"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:8a:86",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.20",
-      "kavlan": true,
-      "mac": "00:30:48:7f:8a:87",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-20.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:31",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155e5",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.20",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-20-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155e6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e6",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.20",
-      "kavlan": false,
-      "mac": "00:30:48:96:d3:bf",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-20-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1ab3fa9c7",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-20"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
deleted file mode 100644
index c7fcb76459a8f6551eab0510f5319ee53b72f8f4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00193"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.21",
-      "kavlan-11": "10.7.194.21",
-      "kavlan-12": "10.11.194.21",
-      "kavlan-13": "10.15.194.21",
-      "kavlan-14": "10.19.194.21",
-      "kavlan-16": "10.27.194.21",
-      "kavlan-18": "10.35.194.21",
-      "kavlan-2": "192.168.211.21",
-      "kavlan-20": "10.43.194.21",
-      "kavlan-21": "10.47.194.21",
-      "kavlan-3": "192.168.227.21",
-      "kavlan-4": "10.4.3.21",
-      "kavlan-5": "10.4.67.21",
-      "kavlan-6": "10.4.131.21",
-      "kavlan-7": "10.4.194.21",
-      "kavlan-8": "10.5.3.21",
-      "kavlan-9": "10.5.67.21"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:3e:f0",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.21",
-      "kavlan": true,
-      "mac": "00:30:48:7f:3e:f1",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-21.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:10",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155d1",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.21",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d1",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-21-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155d2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d2",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.21",
-      "kavlan": false,
-      "mac": "00:30:48:96:d3:56",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-21-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1009bd31f",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-21"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
deleted file mode 100644
index 06abc355e96e2f367105a9ba2e0d1ee75489d899..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00193"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.22",
-      "kavlan-11": "10.7.194.22",
-      "kavlan-12": "10.11.194.22",
-      "kavlan-13": "10.15.194.22",
-      "kavlan-14": "10.19.194.22",
-      "kavlan-16": "10.27.194.22",
-      "kavlan-18": "10.35.194.22",
-      "kavlan-2": "192.168.211.22",
-      "kavlan-20": "10.43.194.22",
-      "kavlan-21": "10.47.194.22",
-      "kavlan-3": "192.168.227.22",
-      "kavlan-4": "10.4.3.22",
-      "kavlan-5": "10.4.67.22",
-      "kavlan-6": "10.4.131.22",
-      "kavlan-7": "10.4.194.22",
-      "kavlan-8": "10.5.3.22",
-      "kavlan-9": "10.5.67.22"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:41:f4",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.22",
-      "kavlan": true,
-      "mac": "00:30:48:7f:41:f5",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-22.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:32",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155c1",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.22",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:c1",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-22-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155c2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:c2",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.22",
-      "kavlan": false,
-      "mac": "00:30:48:96:d2:fd",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-22-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1009bd2cd",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-22"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
deleted file mode 100644
index c0e0ef8349a2f37356a2ceb3f8341610ba47f4ec..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00194"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.23",
-      "kavlan-11": "10.7.194.23",
-      "kavlan-12": "10.11.194.23",
-      "kavlan-13": "10.15.194.23",
-      "kavlan-14": "10.19.194.23",
-      "kavlan-16": "10.27.194.23",
-      "kavlan-18": "10.35.194.23",
-      "kavlan-2": "192.168.211.23",
-      "kavlan-20": "10.43.194.23",
-      "kavlan-21": "10.47.194.23",
-      "kavlan-3": "192.168.227.23",
-      "kavlan-4": "10.4.3.23",
-      "kavlan-5": "10.4.67.23",
-      "kavlan-6": "10.4.131.23",
-      "kavlan-7": "10.4.194.23",
-      "kavlan-8": "10.5.3.23",
-      "kavlan-9": "10.5.67.23"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:29:dc",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.23",
-      "kavlan": true,
-      "mac": "00:30:48:7f:29:dd",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-23.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:14",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015631",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.23",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:31",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-23-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015632",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:32",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.23",
-      "kavlan": false,
-      "mac": "00:30:48:96:d2:d1",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-23-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee100958280",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-23"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
deleted file mode 100644
index a6f80d6ed04e9a169a97f72cbf377f0ffd0c159b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00194"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.24",
-      "kavlan-11": "10.7.194.24",
-      "kavlan-12": "10.11.194.24",
-      "kavlan-13": "10.15.194.24",
-      "kavlan-14": "10.19.194.24",
-      "kavlan-16": "10.27.194.24",
-      "kavlan-18": "10.35.194.24",
-      "kavlan-2": "192.168.211.24",
-      "kavlan-20": "10.43.194.24",
-      "kavlan-21": "10.47.194.24",
-      "kavlan-3": "192.168.227.24",
-      "kavlan-4": "10.4.3.24",
-      "kavlan-5": "10.4.67.24",
-      "kavlan-6": "10.4.131.24",
-      "kavlan-7": "10.4.194.24",
-      "kavlan-8": "10.5.3.24",
-      "kavlan-9": "10.5.67.24"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:29:de",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.24",
-      "kavlan": true,
-      "mac": "00:30:48:7f:29:df",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-24.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:30",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015b01",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.24",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:01",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-24-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015b02",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:02",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.24",
-      "kavlan": false,
-      "mac": "00:30:48:96:d6:ff",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-24-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee155ea332a",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-24"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
deleted file mode 100644
index 90f9b4559a3ea6574def7b347db02a958c366f4e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00195"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.25",
-      "kavlan-11": "10.7.194.25",
-      "kavlan-12": "10.11.194.25",
-      "kavlan-13": "10.15.194.25",
-      "kavlan-14": "10.19.194.25",
-      "kavlan-16": "10.27.194.25",
-      "kavlan-18": "10.35.194.25",
-      "kavlan-2": "192.168.211.25",
-      "kavlan-20": "10.43.194.25",
-      "kavlan-21": "10.47.194.25",
-      "kavlan-3": "192.168.227.25",
-      "kavlan-4": "10.4.3.25",
-      "kavlan-5": "10.4.67.25",
-      "kavlan-6": "10.4.131.25",
-      "kavlan-7": "10.4.194.25",
-      "kavlan-8": "10.5.3.25",
-      "kavlan-9": "10.5.67.25"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:41:5a",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.25",
-      "kavlan": true,
-      "mac": "00:30:48:7f:41:5b",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-25.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:15",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015601",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.25",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:01",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-25-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015602",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:02",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.25",
-      "kavlan": false,
-      "mac": "00:30:48:96:d3:2d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-25-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee155ea4acc",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-25"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
deleted file mode 100644
index fe860c49ee9c4af857e596204b4f19995253ff5c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00195"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.26",
-      "kavlan-11": "10.7.194.26",
-      "kavlan-12": "10.11.194.26",
-      "kavlan-13": "10.15.194.26",
-      "kavlan-14": "10.19.194.26",
-      "kavlan-16": "10.27.194.26",
-      "kavlan-18": "10.35.194.26",
-      "kavlan-2": "192.168.211.26",
-      "kavlan-20": "10.43.194.26",
-      "kavlan-21": "10.47.194.26",
-      "kavlan-3": "192.168.227.26",
-      "kavlan-4": "10.4.3.26",
-      "kavlan-5": "10.4.67.26",
-      "kavlan-6": "10.4.131.26",
-      "kavlan-7": "10.4.194.26",
-      "kavlan-8": "10.5.3.26",
-      "kavlan-9": "10.5.67.26"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:41:5c",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.26",
-      "kavlan": true,
-      "mac": "00:30:48:7f:41:5d",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-26.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:8",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000157fd",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.26",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:fd",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-26-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000157fe",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:fe",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.26",
-      "kavlan": false,
-      "mac": "00:30:48:96:d6:08",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-26-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1ab3957aa",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-26"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
deleted file mode 100644
index 7a77b086f2011866dec01c4755548d30579c27d1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00197"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.29",
-      "kavlan-11": "10.7.194.29",
-      "kavlan-12": "10.11.194.29",
-      "kavlan-13": "10.15.194.29",
-      "kavlan-14": "10.19.194.29",
-      "kavlan-16": "10.27.194.29",
-      "kavlan-18": "10.35.194.29",
-      "kavlan-2": "192.168.211.29",
-      "kavlan-20": "10.43.194.29",
-      "kavlan-21": "10.47.194.29",
-      "kavlan-3": "192.168.227.29",
-      "kavlan-4": "10.4.3.29",
-      "kavlan-5": "10.4.67.29",
-      "kavlan-6": "10.4.131.29",
-      "kavlan-7": "10.4.194.29",
-      "kavlan-8": "10.5.3.29",
-      "kavlan-9": "10.5.67.29"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:29:ec",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.29",
-      "kavlan": true,
-      "mac": "00:30:48:7f:29:ed",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-29.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:3",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155b5",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.29",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:b5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-29-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155b6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:b6",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.29",
-      "kavlan": false,
-      "mac": "00:30:48:96:d2:db",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-29-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1ab3fa9dc",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-29"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
deleted file mode 100644
index fb5e331853ed51ad848a23743535eeba2622d324..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00184"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.3",
-      "kavlan-11": "10.7.194.3",
-      "kavlan-12": "10.11.194.3",
-      "kavlan-13": "10.15.194.3",
-      "kavlan-14": "10.19.194.3",
-      "kavlan-16": "10.27.194.3",
-      "kavlan-18": "10.35.194.3",
-      "kavlan-2": "192.168.211.3",
-      "kavlan-20": "10.43.194.3",
-      "kavlan-21": "10.47.194.3",
-      "kavlan-3": "192.168.227.3",
-      "kavlan-4": "10.4.3.3",
-      "kavlan-5": "10.4.67.3",
-      "kavlan-6": "10.4.131.3",
-      "kavlan-7": "10.4.194.3",
-      "kavlan-8": "10.5.3.3",
-      "kavlan-9": "10.5.67.3"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:3f:0a",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.3",
-      "kavlan": true,
-      "mac": "00:30:48:7f:3f:0b",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-3.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:21",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000159a9",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.3",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-3-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000159aa",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:aa",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.3",
-      "kavlan": false,
-      "mac": "00:30:48:96:d3:44",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-3-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee155ea6946",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-3"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
deleted file mode 100644
index e90367f4ce14499cc424b7ac1ce4db470dc13ecb..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00197"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.30",
-      "kavlan-11": "10.7.194.30",
-      "kavlan-12": "10.11.194.30",
-      "kavlan-13": "10.15.194.30",
-      "kavlan-14": "10.19.194.30",
-      "kavlan-16": "10.27.194.30",
-      "kavlan-18": "10.35.194.30",
-      "kavlan-2": "192.168.211.30",
-      "kavlan-20": "10.43.194.30",
-      "kavlan-21": "10.47.194.30",
-      "kavlan-3": "192.168.227.30",
-      "kavlan-4": "10.4.3.30",
-      "kavlan-5": "10.4.67.30",
-      "kavlan-6": "10.4.131.30",
-      "kavlan-7": "10.4.194.30",
-      "kavlan-8": "10.5.3.30",
-      "kavlan-9": "10.5.67.30"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:29:da",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.30",
-      "kavlan": true,
-      "mac": "00:30:48:7f:29:db",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-30.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:28",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015661",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.30",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:61",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-30-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015662",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:62",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.30",
-      "kavlan": false,
-      "mac": "00:30:48:96:d4:2f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-30-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1ab3fa988",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-30"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
deleted file mode 100644
index 3b0d00786940d062031b0ff131501ed49b7ecb10..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00198"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.31",
-      "kavlan-11": "10.7.194.31",
-      "kavlan-12": "10.11.194.31",
-      "kavlan-13": "10.15.194.31",
-      "kavlan-14": "10.19.194.31",
-      "kavlan-16": "10.27.194.31",
-      "kavlan-18": "10.35.194.31",
-      "kavlan-2": "192.168.211.31",
-      "kavlan-20": "10.43.194.31",
-      "kavlan-21": "10.47.194.31",
-      "kavlan-3": "192.168.227.31",
-      "kavlan-4": "10.4.3.31",
-      "kavlan-5": "10.4.67.31",
-      "kavlan-6": "10.4.131.31",
-      "kavlan-7": "10.4.194.31",
-      "kavlan-8": "10.5.3.31",
-      "kavlan-9": "10.5.67.31"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:41:56",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.31",
-      "kavlan": true,
-      "mac": "00:30:48:7f:41:57",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-31.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:13",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.8.0",
-      "guid": "0x0002c90300015665",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.31",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:65",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-31-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.8.0",
-      "guid": "0x0002c90300015666",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:66",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.31",
-      "kavlan": false,
-      "mac": "00:30:48:96:d4:24",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-31-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee155f09c4d",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-31"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
deleted file mode 100644
index 31d20a2ce314fa5abde471ed36d6b8b70b631308..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00198"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.32",
-      "kavlan-11": "10.7.194.32",
-      "kavlan-12": "10.11.194.32",
-      "kavlan-13": "10.15.194.32",
-      "kavlan-14": "10.19.194.32",
-      "kavlan-16": "10.27.194.32",
-      "kavlan-18": "10.35.194.32",
-      "kavlan-2": "192.168.211.32",
-      "kavlan-20": "10.43.194.32",
-      "kavlan-21": "10.47.194.32",
-      "kavlan-3": "192.168.227.32",
-      "kavlan-4": "10.4.3.32",
-      "kavlan-5": "10.4.67.32",
-      "kavlan-6": "10.4.131.32",
-      "kavlan-7": "10.4.194.32",
-      "kavlan-8": "10.5.3.32",
-      "kavlan-9": "10.5.67.32"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:41:50",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.32",
-      "kavlan": true,
-      "mac": "00:30:48:7f:41:51",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-32.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:34",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155ed",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.32",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ed",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-32-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000155ee",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ee",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.32",
-      "kavlan": false,
-      "mac": "00:30:48:96:d7:84",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-32-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1009bd2bf",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-32"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
deleted file mode 100644
index 1a625cbe1da2c5223b81b2bb3012a08e01085ffb..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00199"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.33",
-      "kavlan-11": "10.7.194.33",
-      "kavlan-12": "10.11.194.33",
-      "kavlan-13": "10.15.194.33",
-      "kavlan-14": "10.19.194.33",
-      "kavlan-16": "10.27.194.33",
-      "kavlan-18": "10.35.194.33",
-      "kavlan-2": "192.168.211.33",
-      "kavlan-20": "10.43.194.33",
-      "kavlan-21": "10.47.194.33",
-      "kavlan-3": "192.168.227.33",
-      "kavlan-4": "10.4.3.33",
-      "kavlan-5": "10.4.67.33",
-      "kavlan-6": "10.4.131.33",
-      "kavlan-7": "10.4.194.33",
-      "kavlan-8": "10.5.3.33",
-      "kavlan-9": "10.5.67.33"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:29:ee",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.33",
-      "kavlan": true,
-      "mac": "00:30:48:7f:29:ef",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-33.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:5",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015805",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.33",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:05",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-33-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015806",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:06",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.33",
-      "kavlan": false,
-      "mac": "00:30:48:96:d2:dc",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-33-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1009bd2e3",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-33"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
deleted file mode 100644
index 19426f826b1bccef454d31125c754d838e9f7199..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00184"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.4",
-      "kavlan-11": "10.7.194.4",
-      "kavlan-12": "10.11.194.4",
-      "kavlan-13": "10.15.194.4",
-      "kavlan-14": "10.19.194.4",
-      "kavlan-16": "10.27.194.4",
-      "kavlan-18": "10.35.194.4",
-      "kavlan-2": "192.168.211.4",
-      "kavlan-20": "10.43.194.4",
-      "kavlan-21": "10.47.194.4",
-      "kavlan-3": "192.168.227.4",
-      "kavlan-4": "10.4.3.4",
-      "kavlan-5": "10.4.67.4",
-      "kavlan-6": "10.4.131.4",
-      "kavlan-7": "10.4.194.4",
-      "kavlan-8": "10.5.3.4",
-      "kavlan-9": "10.5.67.4"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:44:8c",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.4",
-      "kavlan": true,
-      "mac": "00:30:48:7f:44:8d",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-4.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:40",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000158bd",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.4",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:bd",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-4-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000158be",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:be",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.4",
-      "kavlan": false,
-      "mac": "00:30:48:96:d2:5d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-4-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1ab3947d8",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
deleted file mode 100644
index 31640859495c1770cec2a717ec44f8199c378d4b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00185"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.5",
-      "kavlan-11": "10.7.194.5",
-      "kavlan-12": "10.11.194.5",
-      "kavlan-13": "10.15.194.5",
-      "kavlan-14": "10.19.194.5",
-      "kavlan-16": "10.27.194.5",
-      "kavlan-18": "10.35.194.5",
-      "kavlan-2": "192.168.211.5",
-      "kavlan-20": "10.43.194.5",
-      "kavlan-21": "10.47.194.5",
-      "kavlan-3": "192.168.227.5",
-      "kavlan-4": "10.4.3.5",
-      "kavlan-5": "10.4.67.5",
-      "kavlan-6": "10.4.131.5",
-      "kavlan-7": "10.4.194.5",
-      "kavlan-8": "10.5.3.5",
-      "kavlan-9": "10.5.67.5"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:c1:b4:a6",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.5",
-      "kavlan": true,
-      "mac": "00:30:48:c1:b4:a7",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-5.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:19",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015b0d",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.5",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:0d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-5-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015b0e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:0e",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.5",
-      "kavlan": false,
-      "mac": "00:30:48:93:39:e8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-5-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee10095a00b",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-5"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
deleted file mode 100644
index 1ee0996458b78b55abb14d75b4388e6fd48cd867..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00185"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.6",
-      "kavlan-11": "10.7.194.6",
-      "kavlan-12": "10.11.194.6",
-      "kavlan-13": "10.15.194.6",
-      "kavlan-14": "10.19.194.6",
-      "kavlan-16": "10.27.194.6",
-      "kavlan-18": "10.35.194.6",
-      "kavlan-2": "192.168.211.6",
-      "kavlan-20": "10.43.194.6",
-      "kavlan-21": "10.47.194.6",
-      "kavlan-3": "192.168.227.6",
-      "kavlan-4": "10.4.3.6",
-      "kavlan-5": "10.4.67.6",
-      "kavlan-6": "10.4.131.6",
-      "kavlan-7": "10.4.194.6",
-      "kavlan-8": "10.5.3.6",
-      "kavlan-9": "10.5.67.6"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:29:f2",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.6",
-      "kavlan": true,
-      "mac": "00:30:48:7f:29:f3",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-6.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:41",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c9030001552d",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.6",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:2d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-6-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c9030001552e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:2e",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.6",
-      "kavlan": false,
-      "mac": "00:30:48:96:d3:1f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-6-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee155ea343a",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-6"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
deleted file mode 100644
index 34b8e3c8d8821d11c79e8f301d5f919f61ce2613..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00186"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.7",
-      "kavlan-11": "10.7.194.7",
-      "kavlan-12": "10.11.194.7",
-      "kavlan-13": "10.15.194.7",
-      "kavlan-14": "10.19.194.7",
-      "kavlan-16": "10.27.194.7",
-      "kavlan-18": "10.35.194.7",
-      "kavlan-2": "192.168.211.7",
-      "kavlan-20": "10.43.194.7",
-      "kavlan-21": "10.47.194.7",
-      "kavlan-3": "192.168.227.7",
-      "kavlan-4": "10.4.3.7",
-      "kavlan-5": "10.4.67.7",
-      "kavlan-6": "10.4.131.7",
-      "kavlan-7": "10.4.194.7",
-      "kavlan-8": "10.5.3.7",
-      "kavlan-9": "10.5.67.7"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:29:e0",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.7",
-      "kavlan": true,
-      "mac": "00:30:48:7f:29:e1",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-7.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:20",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000159ad",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.7",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:ad",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-7-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c903000159ae",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:ae",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.7",
-      "kavlan": false,
-      "mac": "00:30:48:96:d1:d2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-7-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee155ea486f",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-7"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
deleted file mode 100644
index 09ae66931951d1f9e95d79783b036ab06b6e1c41..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5S-00186"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.8",
-      "kavlan-11": "10.7.194.8",
-      "kavlan-12": "10.11.194.8",
-      "kavlan-13": "10.15.194.8",
-      "kavlan-14": "10.19.194.8",
-      "kavlan-16": "10.27.194.8",
-      "kavlan-18": "10.35.194.8",
-      "kavlan-2": "192.168.211.8",
-      "kavlan-20": "10.43.194.8",
-      "kavlan-21": "10.47.194.8",
-      "kavlan-3": "192.168.227.8",
-      "kavlan-4": "10.4.3.8",
-      "kavlan-5": "10.4.67.8",
-      "kavlan-6": "10.4.131.8",
-      "kavlan-7": "10.4.194.8",
-      "kavlan-8": "10.5.3.8",
-      "kavlan-9": "10.5.67.8"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:29:e2",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.8",
-      "kavlan": true,
-      "mac": "00:30:48:7f:29:e3",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-8.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 3:39",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015b19",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.8",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:19",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-8-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015b1a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:1a",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.8",
-      "kavlan": false,
-      "mac": "00:30:48:96:d6:94",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-8-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee1009585bd",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-8"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
deleted file mode 100644
index cf67446d89e4218d6d0d9904f5b9579b365239df..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "04/30/2008",
-    "vendor": "Phoenix Technologies LTD",
-    "version": "1.1a"
-  },
-  "chassis": {
-    "manufacturer": "Bull SAS",
-    "name": "Novascale Universal",
-    "serial": "XAN-SM5P-00187"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth1": {
-      "kavlan-1": "192.168.195.9",
-      "kavlan-11": "10.7.194.9",
-      "kavlan-12": "10.11.194.9",
-      "kavlan-13": "10.15.194.9",
-      "kavlan-14": "10.19.194.9",
-      "kavlan-16": "10.27.194.9",
-      "kavlan-18": "10.35.194.9",
-      "kavlan-2": "192.168.211.9",
-      "kavlan-20": "10.43.194.9",
-      "kavlan-21": "10.47.194.9",
-      "kavlan-3": "192.168.227.9",
-      "kavlan-4": "10.4.3.9",
-      "kavlan-5": "10.4.67.9",
-      "kavlan-6": "10.4.131.9",
-      "kavlan-7": "10.4.194.9",
-      "kavlan-8": "10.5.3.9",
-      "kavlan-9": "10.5.67.9"
-    }
-  },
-  "main_memory": {
-    "ram_size": 8589934592
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": false,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:30:48:7f:3e:ea",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": true,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "2.1-12",
-      "interface": "Ethernet",
-      "ip": "172.16.16.9",
-      "kavlan": true,
-      "mac": "00:30:48:7f:3e:eb",
-      "management": false,
-      "model": "80003ES2LAN Gigabit Ethernet Controller (Copper)",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp5s0f1",
-      "network_address": "genepi-9.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-grenoble",
-      "switch_port": "BD-8810 Port 4:18",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015b15",
-      "interface": "InfiniBand",
-      "ip": "172.18.16.9",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:15",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "network_address": "genepi-9-ib0.grenoble.grid5000.fr",
-      "rate": 20000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.7.0",
-      "guid": "0x0002c90300015b16",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:16",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": false,
-      "mounted": false,
-      "name": "ib1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.16.9",
-      "kavlan": false,
-      "mac": "00:30:48:96:d4:8e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "genepi-9-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000,
-      "vendor": "Peppercon AG (10437)"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 7651000000,
-    "node_flops": 49650000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 6291456,
-    "cache_l3": 0,
-    "clock_speed": 2500000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Harpertown",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz",
-    "vendor": "Intel",
-    "version": "E5420"
-  },
-  "sensors": {
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x50014ee100951626",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ata_piix",
-      "firmware_version": "20.06C06",
-      "interface": "SATA",
-      "model": "WDC WD1600YS-01S",
-      "size": 164696555520,
-      "storage": "HDD",
-      "vendor": "Western Digital"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "genepi-9"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json b/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
index 030e44bde694c1027ed8bde15286746bbf87f05a..4963b8287a74e62cce05643cd556417dd2742279 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
@@ -18,76 +18,28 @@
         {
         },
         {
-          "aggregation": "trunk",
-          "kind": "switch",
-          "port": "0/1",
-          "uid": "sw-edel-2"
         },
         {
-          "aggregation": "trunk",
-          "kind": "switch",
-          "port": "0/2",
-          "uid": "sw-edel-2"
         },
         {
-          "aggregation": "trunk",
-          "kind": "switch",
-          "port": "0/3",
-          "uid": "sw-edel-2"
         },
         {
-          "aggregation": "trunk",
-          "kind": "switch",
-          "port": "0/1",
-          "uid": "sw-edel-1"
         },
         {
-          "aggregation": "trunk",
-          "kind": "switch",
-          "port": "0/2",
-          "uid": "sw-edel-1"
         },
         {
-          "aggregation": "trunk",
-          "kind": "switch",
-          "port": "0/3",
-          "uid": "sw-edel-1"
         },
         {
-          "aggregation": "trunk",
-          "kind": "switch",
-          "port": "0/1",
-          "uid": "sw-edel-3"
         },
         {
-          "aggregation": "trunk",
-          "kind": "switch",
-          "port": "0/2",
-          "uid": "sw-edel-3"
         },
         {
-          "aggregation": "trunk",
-          "kind": "switch",
-          "port": "0/3",
-          "uid": "sw-edel-3"
         },
         {
-          "aggregation": "trunk",
-          "kind": "switch",
-          "port": "0/1",
-          "uid": "sw-edel-4"
         },
         {
-          "aggregation": "trunk",
-          "kind": "switch",
-          "port": "0/2",
-          "uid": "sw-edel-4"
         },
         {
-          "aggregation": "trunk",
-          "kind": "switch",
-          "port": "0/3",
-          "uid": "sw-edel-4"
         },
         {
         },
@@ -110,29 +62,16 @@
         {
         },
         {
-          "kind": "switch",
-          "uid": "voltaire-1"
         },
         {
-          "kind": "switch",
-          "uid": "voltaire-2"
         },
         {
         },
         {
-          "kind": "other",
-          "port": "eth3",
-          "uid": "digsed"
         },
         {
-          "kind": "other",
-          "port": "bmc",
-          "uid": "digsed"
         },
         {
-          "kind": "other",
-          "port": "eth2",
-          "uid": "digsed"
         }
       ],
       "rate": 1000000000,
@@ -146,44 +85,20 @@
         {
         },
         {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "digmgt"
         },
         {
-          "kind": "other",
-          "port": "eth1",
-          "uid": "digmgt"
         },
         {
-          "kind": "other",
-          "port": "eth2",
-          "uid": "digmgt"
         },
         {
-          "kind": "other",
-          "port": "eth3",
-          "uid": "digmgt"
         },
         {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "grimage-9"
         },
         {
-          "kind": "other",
-          "port": "eth1",
-          "uid": "grimage-9"
         },
         {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "grimage-10"
         },
         {
-          "kind": "other",
-          "port": "eth1",
-          "uid": "grimage-10"
         },
         {
         },
@@ -210,8 +125,6 @@
         {
         },
         {
-          "kind": "switch",
-          "uid": "voltaire-3"
         },
         {
         },
@@ -220,82 +133,40 @@
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-16"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-18"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-30"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-14"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-24"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-20"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-22"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-32"
         },
         {
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-10"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-12"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-8"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-4"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-6"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-2"
         }
       ],
       "rate": 1000000000,
@@ -309,150 +180,68 @@
         {
         },
         {
-          "kind": "other",
-          "uid": "summit-grimage"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-29"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-33"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-17"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-15"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-26"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-11"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-21"
         },
         {
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-31"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-23"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-25"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-19"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-13"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-9"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-5"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-7"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-3"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "uid": "genepi-1"
         },
         {
-          "kind": "virtual",
-          "uid": "vthd-inria"
         },
         {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "alpes"
         },
         {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "grimage-1"
         },
         {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "grimage-2"
         },
         {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "grimage-3"
         },
         {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "grimage-4"
         },
         {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "grimage-5"
         },
         {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "grimage-6"
         },
         {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "grimage-7"
         },
         {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "grimage-8"
         }
       ],
       "rate": 1000000000,
diff --git a/data/grid5000/sites/grenoble/network_equipments/ib-grenoble.json b/data/grid5000/sites/grenoble/network_equipments/ib-grenoble.json
deleted file mode 100644
index 4b5bc5a6eb8524d345c9ec3699a759a21377478f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/network_equipments/ib-grenoble.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "backplane_bps": 960000000000,
-  "kind": "switch",
-  "linecards": [
-    {
-      "kind": "switch",
-      "ports": [
-        {
-          "kind": "switch",
-          "uid": "voltaire-1"
-        },
-        {
-          "kind": "switch",
-          "uid": "voltaire-2"
-        },
-        {
-          "kind": "switch",
-          "uid": "voltaire-3"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "%LINECARD%/%PORT%"
-    }
-  ],
-  "model": "Infiniband",
-  "site": "grenoble",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "ib-grenoble",
-  "vlans": {
-  },
-  "warranty": "expired",
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-edel-1.json b/data/grid5000/sites/grenoble/network_equipments/sw-edel-1.json
deleted file mode 100644
index 61e07e1876a27b0d2d3d40e2a41141988ac781c6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/network_equipments/sw-edel-1.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-  "backplane_bps": 2880000000000,
-  "kind": "switch",
-  "linecards": [
-    {
-    },
-    {
-      "kavlan_pattern": "%LINECARD%/0/%PORT%",
-      "kind": "node",
-      "port": "eth0",
-      "ports": [
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "edel-cmc-1"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-1"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-2"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-3"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-4"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-5"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-6"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-7"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-8"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-9"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-10"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-11"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-12"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-13"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-14"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-18"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-17"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-16"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-15"
-        },
-        {
-        },
-        {
-        },
-        {
-          "aggregation": "trunk",
-          "kind": "router",
-          "port": "2:4",
-          "uid": "gw-grenoble"
-        },
-        {
-          "aggregation": "trunk",
-          "kind": "router",
-          "port": "2:5",
-          "uid": "gw-grenoble"
-        },
-        {
-          "aggregation": "trunk",
-          "kind": "router",
-          "port": "2:6",
-          "uid": "gw-grenoble"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "Unit: %LINECARD% Slot: 0 Port: %PORT% Gigabit - Level"
-    }
-  ],
-  "model": "Broadcom",
-  "mtu": 9216,
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
-  "site": "grenoble",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "sw-edel-1",
-  "vlans": {
-  },
-  "warranty": "expired",
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-edel-2.json b/data/grid5000/sites/grenoble/network_equipments/sw-edel-2.json
deleted file mode 100644
index cdbc75991e8e29da754dfe91826f24e2585bbefb..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/network_equipments/sw-edel-2.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-  "backplane_bps": 2880000000000,
-  "kind": "switch",
-  "linecards": [
-    {
-    },
-    {
-      "kavlan_pattern": "%LINECARD%/0/%PORT%",
-      "kind": "node",
-      "port": "eth0",
-      "ports": [
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "edel-cmc-2"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-19"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-20"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-21"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-22"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-23"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-24"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-25"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-26"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-28"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-29"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-30"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-31"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-32"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-33"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-34"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-35"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-36"
-        },
-        {
-        },
-        {
-        },
-        {
-          "aggregation": "trunk",
-          "kind": "router",
-          "port": "2:1",
-          "uid": "gw-grenoble"
-        },
-        {
-          "aggregation": "trunk",
-          "kind": "router",
-          "port": "2:2",
-          "uid": "gw-grenoble"
-        },
-        {
-          "aggregation": "trunk",
-          "kind": "router",
-          "port": "2:3",
-          "uid": "gw-grenoble"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "Unit: %LINECARD% Slot: 0 Port: %PORT% Gigabit - Level"
-    }
-  ],
-  "model": "Broadcom",
-  "mtu": 9216,
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
-  "site": "grenoble",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "sw-edel-2",
-  "vlans": {
-  },
-  "warranty": "expired",
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-edel-3.json b/data/grid5000/sites/grenoble/network_equipments/sw-edel-3.json
deleted file mode 100644
index bb9da5d2a947f9462bf064af1ad93c6d9a861ec0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/network_equipments/sw-edel-3.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-  "backplane_bps": 2880000000000,
-  "kind": "switch",
-  "linecards": [
-    {
-    },
-    {
-      "kavlan_pattern": "%LINECARD%/0/%PORT%",
-      "kind": "node",
-      "port": "eth0",
-      "ports": [
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "edel-cmc-3"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-37"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-38"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-39"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-40"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-41"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-42"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-43"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-44"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-46"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-47"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-48"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-49"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-50"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-51"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-52"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-53"
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-          "aggregation": "trunk",
-          "kind": "router",
-          "port": "2:7",
-          "uid": "gw-grenoble"
-        },
-        {
-          "aggregation": "trunk",
-          "kind": "router",
-          "port": "2:8",
-          "uid": "gw-grenoble"
-        },
-        {
-          "aggregation": "trunk",
-          "kind": "router",
-          "port": "2:9",
-          "uid": "gw-grenoble"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "Unit: %LINECARD% Slot: 0 Port: %PORT% Gigabit - Level"
-    }
-  ],
-  "model": "Broadcom",
-  "mtu": 9216,
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
-  "site": "grenoble",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "sw-edel-3",
-  "vlans": {
-  },
-  "warranty": "expired",
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-edel-4.json b/data/grid5000/sites/grenoble/network_equipments/sw-edel-4.json
deleted file mode 100644
index e7ec2309855cd77ec755ada05bd2d4fc57cbd5e2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/network_equipments/sw-edel-4.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-  "backplane_bps": 2880000000000,
-  "kind": "switch",
-  "linecards": [
-    {
-    },
-    {
-      "kavlan_pattern": "%LINECARD%/0/%PORT%",
-      "kind": "node",
-      "port": "eth0",
-      "ports": [
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-          "kind": "other",
-          "port": "eth0",
-          "uid": "edel-cmc-4"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-55"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-56"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-57"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-58"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-59"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-60"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-62"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-63"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-64"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-65"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-66"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-67"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-68"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-69"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-70"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-71"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "edel-72"
-        },
-        {
-        },
-        {
-        },
-        {
-          "aggregation": "trunk",
-          "kind": "router",
-          "port": "2:10",
-          "uid": "gw-grenoble"
-        },
-        {
-          "aggregation": "trunk",
-          "kind": "router",
-          "port": "2:11",
-          "uid": "gw-grenoble"
-        },
-        {
-          "aggregation": "trunk",
-          "kind": "router",
-          "port": "2:12",
-          "uid": "gw-grenoble"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "Unit: %LINECARD% Slot: 0 Port: %PORT% Gigabit - Level"
-    }
-  ],
-  "model": "Broadcom",
-  "mtu": 9216,
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
-  "site": "grenoble",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "sw-edel-4",
-  "vlans": {
-  },
-  "warranty": "expired",
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/voltaire-1.json b/data/grid5000/sites/grenoble/network_equipments/voltaire-1.json
deleted file mode 100644
index 9c31b020ec368fd2a64cf47c8c50612610eef2af..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/network_equipments/voltaire-1.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "backplane_bps": 960000000000,
-  "kind": "switch",
-  "linecards": [
-    {
-      "kind": "switch",
-      "ports": [
-        {
-          "kind": "switch",
-          "uid": "ib-grenoble"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "%LINECARD%/%PORT%"
-    }
-  ],
-  "model": "Infiniband",
-  "site": "grenoble",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "voltaire-1",
-  "vlans": {
-  },
-  "warranty": "expired",
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/voltaire-2.json b/data/grid5000/sites/grenoble/network_equipments/voltaire-2.json
deleted file mode 100644
index c4ad0ecf43582ba760e4f71100a6311f4e60cedd..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/network_equipments/voltaire-2.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "backplane_bps": 960000000000,
-  "kind": "switch",
-  "linecards": [
-    {
-      "kind": "switch",
-      "ports": [
-        {
-          "kind": "switch",
-          "uid": "ib-grenoble"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "%LINECARD%/%PORT%"
-    }
-  ],
-  "model": "Infiniband",
-  "site": "grenoble",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "voltaire-2",
-  "vlans": {
-  },
-  "warranty": "expired",
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/voltaire-3.json b/data/grid5000/sites/grenoble/network_equipments/voltaire-3.json
deleted file mode 100644
index 8321b79882876d1d94ef7711fb2f242d8d7890a8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/network_equipments/voltaire-3.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "backplane_bps": 960000000000,
-  "kind": "switch",
-  "linecards": [
-    {
-      "kind": "switch",
-      "ports": [
-        {
-          "kind": "switch",
-          "uid": "ib-grenoble"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "%LINECARD%/%PORT%"
-    }
-  ],
-  "model": "Infiniband",
-  "site": "grenoble",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "voltaire-3",
-  "vlans": {
-  },
-  "warranty": "expired",
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/generators/input-validators/check-cluster-homogeneity.yaml.erb b/generators/input-validators/check-cluster-homogeneity.yaml.erb
index 00624a06eb9d903c23a6e0c5cc254959d7d71348..3066c9c44559371f2bfb9511108537a966f98d51 100644
--- a/generators/input-validators/check-cluster-homogeneity.yaml.erb
+++ b/generators/input-validators/check-cluster-homogeneity.yaml.erb
@@ -18,8 +18,6 @@
 #   griffon-[1-91]: missing some serial
 #   griffon-[11-14]: additional myrinet interface
 #
-# grenoble:
-#   edel: some nodes have only 1 IB interface (probably after a hardware replacement)
 ---
 nancy:
   graphique-[1-2]:
@@ -103,13 +101,3 @@ sophia:
   uvb-14:
     - +chassis.serial
     - ~chassis.manufacturer
-grenoble:
-  edel-[1-72]:
-    - +network_adapters.ib1.guid
-    - -network_adapters.ib1.guid
-    - +network_adapters.ib1.model
-    - -network_adapters.ib1.model
-    - +network_adapters.ib1.vendor
-    - -network_adapters.ib1.vendor
-    - ~network_adapters.eth0.firmware_version
-    - ~network_adapters.eth1.firmware_version
diff --git a/generators/puppet/conf-examples/console-password.yaml b/generators/puppet/conf-examples/console-password.yaml
index a3c76754406e9122bbd591339893228e8e09a34a..aae2f16e251ed38793806b394144de191f85333d 100644
--- a/generators/puppet/conf-examples/console-password.yaml
+++ b/generators/puppet/conf-examples/console-password.yaml
@@ -1,8 +1,5 @@
 # This is an EXAMPLE of input file for [conmang5k,lanpowerg5k].rb
 ---
-grenoble:
-  genepi: login password
-  edel: login password
 lille:
   chirloute: login password
   chimint: login password
diff --git a/generators/puppet/conf-examples/console.yaml b/generators/puppet/conf-examples/console.yaml
index 81c919ab1b27ad0f00606d93463284325237e483..88f8e7a1ea5dd81d4bf0f34fcb3eeca527969c71 100644
--- a/generators/puppet/conf-examples/console.yaml
+++ b/generators/puppet/conf-examples/console.yaml
@@ -27,15 +27,6 @@ nancy:
       suffix: "-bmc -I lanplus -C 3"
       sleep: "4"
       command_delay: 15
-grenoble:
-  edel:
-    conman:
-      device: ipmi
-      workaround_flag: solpayloadsize
-  genepi:
-    conman:
-      device: ipmi
-      workaround_flag: solpayloadsize
 lille:
   chimint:
     lanpower:
diff --git a/generators/puppet/conf-examples/kadeployg5k-dev.yaml b/generators/puppet/conf-examples/kadeployg5k-dev.yaml
index 7cf39e301ecc7df02596ac11aae3c26d73528dad..2cf040d5f0c3d9ebce68b7b80225ab717e4c7951 100644
--- a/generators/puppet/conf-examples/kadeployg5k-dev.yaml
+++ b/generators/puppet/conf-examples/kadeployg5k-dev.yaml
@@ -1,39 +1,5 @@
 # This is an EXAMPLE of input file for kadeployg5k.rb
 ---
-grenoble:
-  edel:
-    remoteops.console.soft.cmd: "/usr/local/conman/bin/conman -d conman HOSTNAME_SHORT"
-    reboot.timeout: 200
-    reboot.kexec: 100
-    partitioning.disable_swap: false
-    partitioning.script: partitioning-edel.sh
-    user.params: console=tty0 console=ttyS1,115200n8
-    deploy.params: console=tty0 console=ttyS1,115200n8 ramdisk_size=290000 rw noapic
-      init=/linuxrc
-    dhcp.serial: 0 38400
-    deployment.timeout: 480
-    broadcast.retries: 0
-    broadcast.timeout: 800
-    boot.timeout.0: 150
-    boot.timeout.1: 450
-    remoteops.reboot.hard.cmd: "/usr/local/bin/lanpower -c reset -m HOSTNAME_SHORT"
-    remoteops.reboot.very_hard.cmd: "/usr/local/bin/lanpower -c safety_cycle -m HOSTNAME_SHORT"
-  genepi:
-    remoteops.console.soft.cmd: "/usr/local/conman/bin/conman -d conman HOSTNAME_SHORT"
-    reboot.timeout: 200
-    reboot.kexec: 100
-    partitioning.disable_swap: false
-    user.params: console=tty0 console=ttyS1,115200n8
-    deploy.drivers: ata_piix
-    deploy.params: ETH_DEV=eth1 console=tty0 console=ttyS1,115200n8 ramdisk_size=290000
-      rw noapic init=/linuxrc radeon.modeset=0
-    dhcp.serial: 0 38400
-    deployment.timeout: 450
-    broadcast.retries: 0
-    broadcast.timeout: 600
-    boot.timeout.0: 150
-    boot.timeout.1: 400
-    remoteops.reboot.very_hard.cmd: "/usr/local/bin/lanpower -c safety_cycle -m HOSTNAME_SHORT"
 lille:
   chimint:
     reboot.timeout: 250
diff --git a/generators/puppet/conf-examples/kadeployg5k.yaml b/generators/puppet/conf-examples/kadeployg5k.yaml
index 66b2ae3e7c91d370ee99e2e4a7030f90624b213f..81e7a643bf063556b8bd14a53cd87ca59e68b492 100644
--- a/generators/puppet/conf-examples/kadeployg5k.yaml
+++ b/generators/puppet/conf-examples/kadeployg5k.yaml
@@ -1,41 +1,5 @@
 # This is an EXAMPLE of input file for kadeployg5k.rb
 ---
-grenoble:
-  edel:
-    reboot.timeout: 250
-    reboot.kexec: 150
-    partitioning.disable_swap: false
-    partitioning.script: partitioning-edel.sh
-    user.params: console=tty0 console=ttyS1,115200n8
-    deploy.params: console=tty0 console=ttyS1,115200n8 ramdisk_size=290000 rw noapic
-      init=/linuxrc
-    dhcp.serial: 0 38400
-    nfsroot.params: rw console=ttyS0,38400n8 console=tty0 root=/dev/nfs ip=dhcp nfsroot=172.24.120.35:/mnt/nfsroot/rootfs
-      init=/sbin/init
-    deployment.timeout: 480
-    broadcast.retries: 0
-    broadcast.timeout: 800
-    boot.timeout.0: 150
-    boot.timeout.1: 450
-    remoteops.reboot.hard.cmd: "/usr/local/bin/lanpower -c reset -m HOSTNAME_SHORT"
-    remoteops.reboot.very_hard.cmd: "/usr/local/bin/lanpower -c safety_cycle -m HOSTNAME_SHORT"
-  genepi:
-    reboot.timeout: 250
-    reboot.kexec: 100
-    partitioning.disable_swap: false
-    user.params: console=tty0 console=ttyS1,115200n8
-    deploy.drivers: ata_piix
-    deploy.params: ETH_DEV=eth1 console=tty0 console=ttyS1,115200n8 ramdisk_size=290000
-      rw noapic init=/linuxrc radeon.modeset=0
-    dhcp.serial: 0 38400
-    nfsroot.params: rw console=ttyS0,38400n8 console=tty0 root=/dev/nfs ip=dhcp nfsroot=172.24.120.35:/mnt/nfsroot/rootfs
-      init=/sbin/init
-    deployment.timeout: 450
-    broadcast.retries: 0
-    broadcast.timeout: 600
-    boot.timeout.0: 150
-    boot.timeout.1: 400
-    remoteops.reboot.very_hard.cmd: "/usr/local/bin/lanpower -c safety_cycle -m HOSTNAME_SHORT"
 lille:
   chimint:
     reboot.timeout: 250
diff --git a/generators/wiki/lib/generators/oar_properties.rb b/generators/wiki/lib/generators/oar_properties.rb
index 4a996653997e2df69640bf2e4e36d1e6c7d4eea1..3598d44aa8a6d52fe6887cc1fe1dc630bb33c9b7 100644
--- a/generators/wiki/lib/generators/oar_properties.rb
+++ b/generators/wiki/lib/generators/oar_properties.rb
@@ -46,14 +46,14 @@ class OarPropertiesGenerator < WikiGenerator
     },
     "host" => {
       "description" => "A user-friendly name for the network_address property",
-      "possible_values" => "edel-1.grenoble.grid5000.fr, ..."
+      "possible_values" => "dahu-1.grenoble.grid5000.fr, ..."
     },
     "ip" => {
       "description" => "The IPv4 address of the node the resource is part of"
     },
     "network_address" => {
       "description" => "The full hostname of the node the resource is part of",
-      "possible_values" => "edel-1.grenoble.grid5000.fr, ..."
+      "possible_values" => "dahu-1.grenoble.grid5000.fr, ..."
     },
     "switch" => {
       "description" => "On what switch the resource is directly connected ?"
diff --git a/input/grid5000/sites/grenoble/clusters/edel/edel.yaml b/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
deleted file mode 100644
index 1165b8fa82ac146c27eb01209dd9aff69d2fdd87..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-# Cluster description
-model: Bull bullx B500 compute blades
-created_at: 2008-10-03
-kavlan: true
-queues:
-  - default
-  - admin
-
-nodes:
-
-# Global node properties
-  edel-[1-72]:
-    monitoring:
-      wattmeter: outofband
-    sensors:
-      power:
-        available: true
-        via:
-          ipmi:
-            sensors:
-              Power: Power
-    processor:
-      microarchitecture: Nehalem
-    performance:
-        core_flops: 7134000000
-        node_flops: 55450000000
-    supported_job_types:
-      deploy: true
-      besteffort: true
-      max_walltime: 0
-      queues:
-        - default
-        - admin
-    storage_devices:
-      sda:
-        interface: SATA
-        driver: ahci
-        storage: SSD
-    network_adapters:
-      eth0:
-        enabled: true
-        mountable: true
-        mounted: true
-        bridged: true
-      eth1:
-        enabled: false
-        mountable: false
-        mounted: false
-        bridged: false
-      ib0:
-        enabled: true
-        mountable: true
-        mounted: true
-      ib1:
-        enabled: false
-        mountable: false
-        mounted: false
-      bmc:
-        interface: Ethernet
-        rate: 100.0e+6
-        enabled: true
-        mountable: false
-        mounted: false
-        vendor: Unknown
-    gpu:
-      gpu: false
diff --git a/input/grid5000/sites/grenoble/clusters/edel/edel_ip.yaml.erb b/input/grid5000/sites/grenoble/clusters/edel/edel_ip.yaml.erb
deleted file mode 100644
index bb609b86067479d56b72124e8015e5ffe42184d8..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/edel_ip.yaml.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-nodes:
-<% global_grenoble_edel_offset = 34 %>
-<% [*1..72].each { |i| %>
-  edel-<%= i %>:
-    kavlan:
-      eth0:
-        kavlan-1: 192.168.194.<%= i %>
-        kavlan-2: 192.168.210.<%= i %>
-        kavlan-3: 192.168.226.<%= i %>
-        kavlan-4: 10.4.2.<%= i %>
-        kavlan-5: 10.4.66.<%= i %>
-        kavlan-6: 10.4.130.<%= i %>
-        kavlan-7: 10.4.193.<%= i %>
-        kavlan-8: 10.5.2.<%= i %>
-        kavlan-9: 10.5.66.<%= i %>
-        kavlan-11: 10.7.194.<%= i + global_grenoble_edel_offset %>
-        kavlan-12: 10.11.194.<%= i + global_grenoble_edel_offset %>
-        kavlan-13: 10.15.194.<%= i + global_grenoble_edel_offset %>
-        kavlan-14: 10.19.194.<%= i + global_grenoble_edel_offset %>
-        kavlan-16: 10.27.194.<%= i + global_grenoble_edel_offset %>
-        kavlan-18: 10.35.194.<%= i + global_grenoble_edel_offset %>
-        kavlan-20: 10.43.194.<%= i + global_grenoble_edel_offset %>
-        kavlan-21: 10.47.194.<%= i + global_grenoble_edel_offset %>
-<% } %>
diff --git a/input/grid5000/sites/grenoble/clusters/edel/edel_network.yaml b/input/grid5000/sites/grenoble/clusters/edel/edel_network.yaml
deleted file mode 100644
index 5aa0604d938319a5a98f833e937c0dacf1f5c8e0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/edel_network.yaml
+++ /dev/null
@@ -1,363 +0,0 @@
----
-nodes:
-  edel-1:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/5
-  edel-2:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/6
-  edel-3:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/7
-  edel-4:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/8
-  edel-5:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/9
-  edel-6:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/10
-  edel-7:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/11
-  edel-8:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/12
-  edel-9:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/13
-  edel-10:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/14
-  edel-11:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/15
-  edel-12:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/16
-  edel-13:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/17
-  edel-14:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/18
-  edel-15:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/19
-  edel-16:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/20
-  edel-17:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/21
-  edel-18:
-    network_adapters:
-      eth0:
-        switch: sw-edel-1
-        switch_port: Gi1/0/22
-  edel-19:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/5
-  edel-20:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/6
-  edel-21:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/7
-  edel-22:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/8
-  edel-23:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/9
-  edel-24:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/10
-  edel-25:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/11
-  edel-26:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/12
-  edel-27:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/13
-  edel-28:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/14
-  edel-29:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/15
-  edel-30:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/16
-  edel-31:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/17
-  edel-32:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/18
-  edel-33:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/19
-  edel-34:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/20
-  edel-35:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/21
-  edel-36:
-    network_adapters:
-      eth0:
-        switch: sw-edel-2
-        switch_port: Gi1/0/22
-  edel-37:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/5
-  edel-38:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/6
-  edel-39:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/7
-  edel-40:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/8
-  edel-41:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/9
-  edel-42:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/10
-  edel-43:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/11
-  edel-44:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/12
-  edel-45:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/13
-  edel-46:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/14
-  edel-47:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/15
-  edel-48:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/16
-  edel-49:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/17
-  edel-50:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/18
-  edel-51:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/19
-  edel-52:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/20
-  edel-53:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/21
-  edel-54:
-    network_adapters:
-      eth0:
-        switch: sw-edel-3
-        switch_port: Gi1/0/22
-  edel-55:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/5
-  edel-56:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/6
-  edel-57:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/7
-  edel-58:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/8
-  edel-59:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/9
-  edel-60:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/10
-  edel-61:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/11
-  edel-62:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/12
-  edel-63:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/13
-  edel-64:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/14
-  edel-65:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/15
-  edel-66:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/16
-  edel-67:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/17
-  edel-68:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/18
-  edel-69:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/19
-  edel-70:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/20
-  edel-71:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/21
-  edel-72:
-    network_adapters:
-      eth0:
-        switch: sw-edel-4
-        switch_port: Gi1/0/22
-  
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml
deleted file mode 100644
index a187625de8083560304a2d921961f5dcf37cca18..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-1:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.1
-      mac: 08:00:38:36:af:df
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.1
-      mac: 08:00:38:36:f3:be
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:36:f3:bf
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x0800380001375f9e'
-      interface: InfiniBand
-      ip: 172.18.17.1
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:5f:9e
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      interface: InfiniBand
-      management: false
-  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
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367beb0"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml
deleted file mode 100644
index b01e9024f1fbea709a6bd7a8b9616c53a0c92ae3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-10:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.10
-      mac: 08:00:38:35:a3:ca
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.10
-      mac: 08:00:38:35:ab:94
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:95
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c95f'
-      interface: InfiniBand
-      ip: 172.18.17.10
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:5f
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751032ecb19"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.yaml
deleted file mode 100644
index 776706675f0881389970a81fac7cef413197535e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-11:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.11
-      mac: 08:00:38:35:a3:c8
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.11
-      mac: 08:00:38:35:ab:90
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:91
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c959'
-      interface: InfiniBand
-      ip: 172.18.17.11
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:59
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751031ea9df"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.yaml
deleted file mode 100644
index 81a56bb6b2937ea0bdd541a21c5eb14241ef2afd..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-12:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.12
-      mac: 08:00:38:35:a4:1e
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.12
-      mac: 08:00:38:35:ac:3c
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ac:3d
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca5b'
-      interface: InfiniBand
-      ip: 172.18.17.12
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:5b
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf06"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.yaml
deleted file mode 100644
index 728ca663f9db4c5f2df3b3977999eb313617d340..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-13:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.13
-      mac: 08:00:38:35:a3:ee
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.13
-      mac: 08:00:38:35:ab:dc
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:dd
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c9cb'
-      interface: InfiniBand
-      ip: 172.18.17.13
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:cb
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751032f1152"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.yaml
deleted file mode 100644
index 74219d10b9a3b71e2d1ecd83ff9512279a940db7..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-14:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.14
-      mac: 08:00:38:35:a3:d6
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.14
-      mac: 08:00:38:35:ab:ac
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:ad
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c983'
-      interface: InfiniBand
-      ip: 172.18.17.14
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:83
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751032eca74"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.yaml
deleted file mode 100644
index a3bfba23fa4ce0723cd5062daa560bbeda53ea9b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-15:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.15
-      mac: 08:00:38:35:a3:fe
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.15
-      mac: 08:00:38:35:ab:fc
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:fd
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c9fb'
-      interface: InfiniBand
-      ip: 172.18.17.15
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:fb
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367be94"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.yaml
deleted file mode 100644
index 4fb15dd76822664959d744135c334064af485d60..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-16:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.16
-      mac: 08:00:38:36:af:96
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.16
-      mac: 08:00:38:36:f3:2c
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:36:f3:2d
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x0800380001375ec3'
-      interface: InfiniBand
-      ip: 172.18.17.16
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:c3
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      interface: InfiniBand
-      management: false
-  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
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bea9"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.yaml
deleted file mode 100644
index 114c8c177d846aba4bd1607669b71e05ccd9e149..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-17:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.17
-      mac: 08:00:38:35:a3:cf
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      ip: 172.16.17.17
-      mac: 08:00:38:35:ab:9e
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:9f
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c96e'
-      interface: InfiniBand
-      ip: 172.18.17.17
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:6e
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510302023f"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 7
-      model: C300-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.yaml
deleted file mode 100644
index 38d27cab29e7630aa859d7d5e904c57369e18499..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-18:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: '123456789'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.18
-      mac: 08:00:38:35:a3:c1
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.18
-      mac: 08:00:38:35:ab:82
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: true
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:35:ab:83
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: false
-      name: enp1s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c944'
-      interface: InfiniBand
-      ip: 172.18.17.18
-      ip6: fe80::a00:3800:135:c944
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:44
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: true
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: false
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: C400-MTFDDAA064M
-      rev: 40.0
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.yaml
deleted file mode 100644
index 2fbb4ea0262d8136d635d7852b4365a724d808c1..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-19:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.19
-      mac: 08:00:38:35:a3:e8
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.19
-      mac: 08:00:38:35:ab:d0
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:d1
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c9b9'
-      interface: InfiniBand
-      ip: 172.18.17.19
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:b9
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367befb"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.yaml
deleted file mode 100644
index 4dbd6a8732979452fd6126fdbabcbf8d12c03228..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-2:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.2
-      mac: 08:00:38:36:b0:d4
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.2
-      mac: 08:00:38:36:f5:a8
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:36:f5:a9
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000137627d'
-      interface: InfiniBand
-      ip: 172.18.17.2
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:62:7d
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      interface: InfiniBand
-      management: false
-  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
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510202c03c"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.yaml
deleted file mode 100644
index b184ad9f5bae8451ad1c1627214c0a1b84de85be..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-20:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.20
-      mac: 08:00:38:35:a3:bc
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.20
-      mac: 08:00:38:35:ab:78
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:79
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c935'
-      interface: InfiniBand
-      ip: 172.18.17.20
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:35
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510202c04b"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.yaml
deleted file mode 100644
index 5fbc26f81715f44e5c4fa1771926570b3c6efde0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-21:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.21
-      mac: 08:00:38:35:a4:25
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      ip: 172.16.17.21
-      mac: 08:00:38:35:ac:4a
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      mac: 08:00:38:35:ac:4b
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca70'
-      interface: InfiniBand
-      ip: 172.18.17.21
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:70
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367befc"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.yaml
deleted file mode 100644
index dd88bf5fb2b2adafdb9ac1682015521ab3fa6eb5..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-22:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.22
-      mac: 08:00:38:35:a3:ce
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.22
-      mac: 08:00:38:35:ab:9c
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:9d
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c96b'
-      interface: InfiniBand
-      ip: 172.18.17.22
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:6b
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751031eaa40"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.yaml
deleted file mode 100644
index 7117f465af62e63a8db4893d7dd90058e74f4b11..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-23:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.23
-      mac: 08:00:38:35:a3:eb
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.23
-      mac: 08:00:38:35:ab:d6
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:d7
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c9c2'
-      interface: InfiniBand
-      ip: 172.18.17.23
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c2
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf03"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.yaml
deleted file mode 100644
index 5816d381beac794c750830b01d48d5b856c8173e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-24:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.24
-      mac: 08:00:38:35:a4:13
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.24
-      mac: 08:00:38:35:ac:26
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:35:ac:27
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca3a'
-      interface: InfiniBand
-      ip: 172.18.17.24
-      ip6: fe80::a00:3800:135:ca3a
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:3a
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bef6"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      model: C400-MTFDDAA128M
-      rev: 040H
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.yaml
deleted file mode 100644
index 798fff9555a2d78b735bc070d43d197265122cfb..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-25:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: '123456789'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.25
-      mac: 08:00:38:35:a3:5c
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.25
-      mac: 08:00:38:35:aa:b8
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: true
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:35:aa:b9
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: false
-      name: enp1s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c815'
-      interface: InfiniBand
-      ip: 172.18.17.25
-      ip6: fe80::a00:3800:135:c815
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:15
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: true
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: false
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: C400-MTFDDAA128M
-      rev: 40.0
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.yaml
deleted file mode 100644
index fb44ecf6101489460f495b2751d218bb6f503193..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-26:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.26
-      mac: 08:00:38:35:a3:aa
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      ip: 172.16.17.26
-      mac: 08:00:38:35:ab:54
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:55
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c8ff'
-      interface: InfiniBand
-      ip: 172.18.17.26
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:ff
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751031eaa61"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.yaml
deleted file mode 100644
index 99591d5c4f3b1d81dbad2a4f4759953ec5271a98..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-27:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 12/20/2010
-    vendor: INSYDE
-    version: Thurley.3.59.48.0028_BUILD_NCB_N0017
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: '123456789'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.27
-      mac: 08:00:38:35:a4:1f
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.27
-      mac: 08:00:38:35:ac:3e
-      management: false
-      mounted: true
-      rate: 1000000000
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:35:ac:3f
-      management: false
-      mounted: false
-      rate: 1000000000
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca5e'
-      interface: InfiniBand
-      ip: 172.18.17.27
-      ip6: fe80::a00:3800:135:ca5e
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:5e
-      management: false
-      mounted: true
-      name: ib0
-      rate: 40000000000
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      mounted: false
-      name: ib1
-      rate: 10000000000
-  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
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  status: retired
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: C400-MTFDDAA128M
-      rev: 40.0
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.yaml
deleted file mode 100644
index cb49dc998741228bfab4a5424a52a22ca4240a7e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-28:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.28
-      mac: 08:00:38:35:a4:24
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      ip: 172.16.17.28
-      mac: 08:00:38:35:ac:48
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      mac: 08:00:38:35:ac:49
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca6d'
-      interface: InfiniBand
-      ip: 172.18.17.28
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:6d
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf24"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.yaml
deleted file mode 100644
index df8816f70d924534a3c44ebf43952bd5b763367b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-29:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.29
-      mac: 08:00:38:35:a3:df
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      ip: 172.16.17.29
-      mac: 08:00:38:35:ab:be
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:bf
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c99e'
-      interface: InfiniBand
-      ip: 172.18.17.29
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:9e
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367be8c"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.yaml
deleted file mode 100644
index dd4575931c39559e29abc11f4cdb9caa46aa3b35..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-3:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.3
-      mac: 08:00:38:35:a3:c6
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.3
-      mac: 08:00:38:35:ab:8c
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:8d
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c953'
-      interface: InfiniBand
-      ip: 172.18.17.3
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:53
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751032eca94"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.yaml
deleted file mode 100644
index 38fee495d06df077d34684e202aeb619755b9f6e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-30:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.30
-      mac: 08:00:38:35:a3:dd
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      ip: 172.16.17.30
-      mac: 08:00:38:35:ab:ba
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:bb
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c998'
-      interface: InfiniBand
-      ip: 172.18.17.30
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:98
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751031ea9b6"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml
deleted file mode 100644
index d4cbb9eb470abf2a3561cc6b5dfe2bd0617e81c9..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-31:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: '123456789'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.31
-      mac: 08:00:38:35:a5:9f
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.31
-      mac: 08:00:38:35:af:3e
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: true
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:35:af:3f
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: false
-      name: enp1s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135cede'
-      interface: InfiniBand
-      ip: 172.18.17.31
-      ip6: fe80::a00:3800:135:cede
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ce:de
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: true
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: false
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: C400-MTFDDAA064M
-      rev: 40.0
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.yaml
deleted file mode 100644
index 452aa7e8acf4e498e003602d12ad672f2848f18b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-32:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.32
-      mac: 08:00:38:35:a3:a3
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      ip: 172.16.17.32
-      mac: 08:00:38:35:ab:46
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:47
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c8ea'
-      interface: InfiniBand
-      ip: 172.18.17.32
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:ea
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bee9"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml
deleted file mode 100644
index 5af00fd081a51e3d70ef983e66cdeeeba07d0cbf..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-33:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: '123456789'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.33
-      mac: 08:00:38:35:a4:26
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.33
-      mac: 08:00:38:35:ac:4c
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: true
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:35:ac:4d
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: false
-      name: enp1s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca73'
-      interface: InfiniBand
-      ip: 172.18.17.33
-      ip6: fe80::a00:3800:135:ca73
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:73
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: true
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: false
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: C400-MTFDDAA064M
-      rev: 40.0
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.yaml
deleted file mode 100644
index c87db5bf0fd870d6c963842f309d3b268292f685..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-34:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.34
-      mac: 08:00:38:35:a3:d1
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      ip: 172.16.17.34
-      mac: 08:00:38:35:ab:a2
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:a3
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c974'
-      interface: InfiniBand
-      ip: 172.18.17.34
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:74
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751030225e5"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 7
-      model: C300-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.yaml
deleted file mode 100644
index 5d44fcce1e56b96196e3c8a48ac174e3ced17355..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-35:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: '123456789'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.35
-      mac: 08:00:38:35:a3:b1
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.35
-      mac: 08:00:38:35:ab:62
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: true
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:35:ab:63
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: false
-      name: enp1s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c914'
-      interface: InfiniBand
-      ip: 172.18.17.35
-      ip6: fe80::a00:3800:135:c914
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:14
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: true
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: false
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: C400-MTFDDAA128M
-      rev: 40.0
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.yaml
deleted file mode 100644
index e35ba8a0e5e7316fcd1400cc35e370a98272d744..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-36:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.36
-      mac: 08:00:38:35:a3:f3
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      ip: 172.16.17.36
-      mac: 08:00:38:35:ab:e6
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 1.5.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:e7
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c9da'
-      interface: InfiniBand
-      ip: 172.18.17.36
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:da
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751031ea9c5"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.yaml
deleted file mode 100644
index 7e0190220752cb24c9eab970519d2f494193a026..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-37:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.37
-      mac: 08:00:38:36:af:83
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.37
-      mac: 08:00:38:36:f3:06
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:36:f3:07
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x0800380001375e8a'
-      interface: InfiniBand
-      ip: 172.18.17.37
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:8a
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      interface: InfiniBand
-      management: false
-  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
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf10"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.yaml
deleted file mode 100644
index 8d015ef63b23c88e06fa0dd064038e93328feda5..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-38:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.38
-      mac: 08:00:38:35:a3:e9
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.38
-      mac: 08:00:38:35:ab:d2
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:d3
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c9bc'
-      interface: InfiniBand
-      ip: 172.18.17.38
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:bc
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751032ecb1d"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.yaml
deleted file mode 100644
index 87d4cc665152bbc0e0416a18ef0818646621dddd..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-39:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.39
-      mac: 08:00:38:35:a4:15
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.39
-      mac: 08:00:38:35:ac:2a
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ac:2b
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca40'
-      interface: InfiniBand
-      ip: 172.18.17.39
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:40
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf26"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml
deleted file mode 100644
index 8ba0f5e15ce1fd0565e6b99cfb1ab1295b8499e8..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-4:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: '123456789'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.4
-      mac: 08:00:38:36:9f:26
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.4
-      mac: 08:00:38:36:d2:4c
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: true
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:36:d2:4d
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: false
-      name: enp1s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x0800380001372d73'
-      interface: InfiniBand
-      ip: 172.18.17.4
-      ip6: fe80::a00:3800:137:2d73
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:2d:73
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: true
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: false
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: C400-MTFDDAA064M
-      rev: 40.0
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.yaml
deleted file mode 100644
index 921314efe22a2deda294f0a2376fb3057c72a30c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-40:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.40
-      mac: 08:00:38:35:a3:d4
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.40
-      mac: 08:00:38:35:ab:a8
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:a9
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c97d'
-      interface: InfiniBand
-      ip: 172.18.17.40
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:7d
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf13"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.yaml
deleted file mode 100644
index 57bf9318cc740fe90578577c254ca319d3905150..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-41:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.41
-      mac: 08:00:38:36:b0:d2
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.41
-      mac: 08:00:38:36:f5:a4
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:36:f5:a5
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x0800380001376277'
-      interface: InfiniBand
-      ip: 172.18.17.41
-      ip6: fe80::a00:3800:137:6277
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:62:77
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      interface: InfiniBand
-      management: false
-  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
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf1f"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      model: C400-MTFDDAA128M
-      rev: 040H
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.yaml
deleted file mode 100644
index 4dd96d6c477f2800b8647bf9130607f5aedcc6f5..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-42:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.42
-      mac: 08:00:38:36:9d:ec
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.42
-      mac: 08:00:38:36:cf:d8
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:36:cf:d9
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x08003800013729c5'
-      interface: InfiniBand
-      ip: 172.18.17.42
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:29:c5
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      interface: InfiniBand
-      management: false
-  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
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367beec"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.yaml
deleted file mode 100644
index a41461b897f61e875853c078b39058a1c8759517..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-43:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.43
-      mac: 08:00:38:35:a3:ea
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.43
-      mac: 08:00:38:35:ab:d4
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:d5
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c9bf'
-      interface: InfiniBand
-      ip: 172.18.17.43
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:bf
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf0e"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.yaml
deleted file mode 100644
index 3f8009647ffd2b5e455351b81e2c5883ef30a42c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-44:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.44
-      mac: 08:00:38:35:a3:d5
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.44
-      mac: 08:00:38:35:ab:aa
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:ab
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c980'
-      interface: InfiniBand
-      ip: 172.18.17.44
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:80
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751032ecb0b"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.yaml
deleted file mode 100644
index f71df99c4ebee35536d2ce1e3714c018dd0ba6cb..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-45:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 12/20/2010
-    vendor: INSYDE
-    version: Thurley.3.59.48.0028_BUILD_NCB_N0017
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: '123456789'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.45
-      mac: 08:00:38:35:a4:11
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.45
-      mac: 08:00:38:35:ac:22
-      management: false
-      mounted: true
-      rate: 1000000000
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:35:ac:23
-      management: false
-      mounted: false
-      rate: 1000000000
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca34'
-      interface: InfiniBand
-      ip: 172.18.17.45
-      ip6: fe80::a00:3800:135:ca34
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:34
-      management: false
-      mounted: true
-      name: ib0
-      rate: 40000000000
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      mounted: false
-      name: ib1
-      rate: 10000000000
-  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
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  status: retired
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: C400-MTFDDAA128M
-      rev: 40.0
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml
deleted file mode 100644
index c7505a8fcddbefa7ab92e86fa222a5b07d79deaf..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-46:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: '123456789'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.46
-      mac: 08:00:38:35:a3:a5
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.46
-      mac: 08:00:38:35:ab:4a
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: true
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:35:ab:4b
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: false
-      name: enp1s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c8f0'
-      interface: InfiniBand
-      ip: 172.18.17.46
-      ip6: fe80::a00:3800:135:c8f0
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:f0
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: true
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: false
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: C400-MTFDDAA128M
-      rev: 40.0
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.yaml
deleted file mode 100644
index 7b68f28aa5370eb0e1115c769f4d1c5594e0e833..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-47:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.47
-      mac: 08:00:38:35:a3:de
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.47
-      mac: 08:00:38:35:ab:bc
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:bd
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c99b'
-      interface: InfiniBand
-      ip: 172.18.17.47
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:9b
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751032f1151"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.yaml
deleted file mode 100644
index ae850152a721fa3a463c0ff391abd2abc5233102..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-48:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.48
-      mac: 08:00:38:35:a3:b8
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.48
-      mac: 08:00:38:35:ab:70
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:71
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c929'
-      interface: InfiniBand
-      ip: 172.18.17.48
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:29
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bec0"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.yaml
deleted file mode 100644
index cedf45ddfad7fad67034d36b8f0ab035a24976e7..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-49:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.49
-      mac: 08:00:38:35:a3:db
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.49
-      mac: 08:00:38:35:ab:b6
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:b7
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c992'
-      interface: InfiniBand
-      ip: 172.18.17.49
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:92
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf00"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.yaml
deleted file mode 100644
index c0c80baaff4b41cc706979239ac8df9e04d93748..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-5:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.5
-      mac: 08:00:38:36:af:9d
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.5
-      mac: 08:00:38:36:f3:3a
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:36:f3:3b
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x0800380001375ed8'
-      interface: InfiniBand
-      ip: 172.18.17.5
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:d8
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      interface: InfiniBand
-      management: false
-  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
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf0a"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.yaml
deleted file mode 100644
index 9b43263af8c08f42d2934562b67f092dd2913061..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-50:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: '123456789'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.50
-      mac: 00:08:f1:20:07:b8
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.50
-      mac: 08:00:38:35:ac:10
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: true
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:35:ac:11
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: false
-      name: enp1s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca19'
-      interface: InfiniBand
-      ip: 172.18.17.50
-      ip6: fe80::a00:3800:135:ca19
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:19
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: true
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: false
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: C400-MTFDDAA128M
-      rev: 40.0
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.yaml
deleted file mode 100644
index d66ee71bdaabe94009d4f3cca143edf63f9165d0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-51:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.51
-      mac: 08:00:38:35:a4:20
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.51
-      mac: 08:00:38:35:ac:40
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ac:41
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca61'
-      interface: InfiniBand
-      ip: 172.18.17.51
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:61
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751032ecb21"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.yaml
deleted file mode 100644
index e041848074ffc2fc10a5edc22f8c02098d965e04..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-52:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.52
-      mac: 08:00:38:35:a4:0d
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.52
-      mac: 08:00:38:35:ac:1a
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ac:1b
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca28'
-      interface: InfiniBand
-      ip: 172.18.17.52
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:28
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367beda"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.yaml
deleted file mode 100644
index fb4d5be9dbe68f5899db00afc023cad93384a459..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-53:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.53
-      mac: 08:00:38:35:a4:1a
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.53
-      mac: 08:00:38:35:ac:34
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ac:35
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca4f'
-      interface: InfiniBand
-      ip: 172.18.17.53
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:4f
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751032ecb0d"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml
deleted file mode 100644
index 09b04af26789b44d96bd2680a4b6f5346064014c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-54:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: '123456789'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.54
-      mac: 08:00:38:35:a4:1d
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.54
-      mac: 08:00:38:35:ac:3a
-      management: false
-      mounted: true
-      rate: 1000000000
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:35:ac:3b
-      management: false
-      mounted: false
-      rate: 1000000000
-    ib0:
-      driver: mlx4_core
-      guid: '0x0800380001375ed8'
-      interface: InfiniBand
-      ip: 172.18.17.54
-      ip6: fe80::a00:3800:137:5ed8
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:d8
-      management: false
-      mounted: true
-      name: ib0
-      rate: 40000000000
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      mounted: false
-      name: ib1
-      rate: 10000000000
-  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
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  status: retired
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: C200-MTFDBAA060M
-      rev: 5.0
-      size: 60022480896
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.yaml
deleted file mode 100644
index 2402a24ec0a671f986c079b1254b0e003fa56439..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-55:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.55
-      mac: 08:00:38:35:a3:f4
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.55
-      mac: 08:00:38:35:ab:e8
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:e9
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c9dd'
-      interface: InfiniBand
-      ip: 172.18.17.55
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:dd
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf1e"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.yaml
deleted file mode 100644
index b4b13dbe38e607e8e21ebaa3659ff578a725800b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-56:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.56
-      mac: 08:00:38:35:a4:00
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.56
-      mac: 08:00:38:35:ac:00
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ac:01
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca01'
-      interface: InfiniBand
-      ip: 172.18.17.56
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:01
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367beee"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.yaml
deleted file mode 100644
index bf967a5a46c1f7d4eb51a88552a80abf7c4b1630..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-57:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.57
-      mac: 08:00:38:35:a3:d7
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.57
-      mac: 08:00:38:35:ab:ae
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:af
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c986'
-      interface: InfiniBand
-      ip: 172.18.17.57
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:86
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf2b"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.yaml
deleted file mode 100644
index e8500cb5c2a3e8ae94bee4682bfdac830712a644..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-58:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.58
-      mac: 08:00:38:35:a4:04
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.58
-      mac: 08:00:38:35:ac:08
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ac:09
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca0d'
-      interface: InfiniBand
-      ip: 172.18.17.58
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:0d
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751032ecade"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.yaml
deleted file mode 100644
index c204b1f33e2937beb4b1512980218d6c98bc4bad..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-59:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.59
-      mac: 08:00:38:35:a3:ad
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.59
-      mac: 08:00:38:35:ab:5a
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:5b
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c908'
-      interface: InfiniBand
-      ip: 172.18.17.59
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:08
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bead"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.yaml
deleted file mode 100644
index d679ea5b903a478686581197c81e893edb0c27d1..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-6:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.6
-      mac: 08:00:38:36:ac:2f
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.6
-      mac: 08:00:38:36:ec:5e
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:36:ec:5f
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000137548e'
-      interface: InfiniBand
-      ip: 172.18.17.6
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:54:8e
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      interface: InfiniBand
-      management: false
-  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
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bec8"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.yaml
deleted file mode 100644
index 24db5e0cd66dc8fcd0071b101c6688a61c8389c1..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-60:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.60
-      mac: 08:00:38:35:a4:12
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.60
-      mac: 08:00:38:35:ac:24
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ac:25
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca37'
-      interface: InfiniBand
-      ip: 172.18.17.60
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:37
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751032eca65"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml
deleted file mode 100644
index 341d15a10d8be9539dbe5f29be720b27f367299b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-61:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: '123456789'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.61
-      mac: 08:00:38:35:a3:ae
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.61
-      mac: 08:00:38:35:ab:5c
-      management: false
-      mounted: true
-      rate: 1000000000
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:35:ab:5d
-      management: false
-      mounted: false
-      rate: 1000000000
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c90b'
-      interface: InfiniBand
-      ip: 172.18.17.61
-      ip6: fe80::a00:3800:135:c90b
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:0b
-      management: false
-      mounted: true
-      name: ib0
-      rate: 40000000000
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      mounted: false
-      name: ib1
-      rate: 10000000000
-  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
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  status: retired
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: C400-MTFDDAA128M
-      rev: 40.0
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.yaml
deleted file mode 100644
index bd3b98a5ae3bdfe538288e6b47b45ddb92b3cf15..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-62:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.62
-      mac: 08:00:38:35:a3:ed
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.62
-      mac: 08:00:38:35:ab:da
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:db
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c9c8'
-      interface: InfiniBand
-      ip: 172.18.17.62
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c8
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf02"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml
deleted file mode 100644
index 6283bedfe0944725471a0b171d1805aab589376b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-63:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: '123456789'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.63
-      mac: 08:00:38:35:a3:d9
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.63
-      mac: 08:00:38:35:ab:b2
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: true
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:35:ab:b3
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: false
-      name: enp1s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c98c'
-      interface: InfiniBand
-      ip: 172.18.17.63
-      ip6: fe80::a00:3800:135:c98c
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:8c
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: true
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: false
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: C400-MTFDDAA128M
-      rev: 40.0
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.yaml
deleted file mode 100644
index 4a5e10e6ec9aa253c90b43f82d6282d468af3d72..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-64:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.64
-      mac: 08:00:38:35:a4:df
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.64
-      mac: 08:00:38:35:ad:be
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ad:bf
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135cc9e'
-      interface: InfiniBand
-      ip: 172.18.17.64
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:cc:9e
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510202c00f"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml
deleted file mode 100644
index 9f931a1c28e267ac0c0acecaf6a03e5c54007059..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-65:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.65
-      mac: 08:00:38:35:a3:f2
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.65
-      mac: 08:00:38:35:ab:e4
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:e5
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c9d7'
-      interface: InfiniBand
-      ip: 172.18.17.65
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:d7
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf05"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.yaml
deleted file mode 100644
index 4b9d3d1ce37c9d64af170a18fcb202efdee30821..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-66:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.66
-      mac: 08:00:38:35:a4:0a
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.66
-      mac: 08:00:38:35:ac:14
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ac:15
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca1f'
-      interface: InfiniBand
-      ip: 172.18.17.66
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:1f
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf1a"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.yaml
deleted file mode 100644
index a0eac677536469d18c471357c4f4935ce8a9b282..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-67:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.67
-      mac: 08:00:38:35:a3:fd
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.67
-      mac: 08:00:38:35:ab:fa
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:fb
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c9f8'
-      interface: InfiniBand
-      ip: 172.18.17.67
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:f8
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367befe"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.yaml
deleted file mode 100644
index 35f4ec52def257597cac48cdceb9228ab9792a32..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-68:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.68
-      mac: 08:00:38:35:a3:d8
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.68
-      mac: 08:00:38:35:ab:b0
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:b1
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c989'
-      interface: InfiniBand
-      ip: 172.18.17.68
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:89
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bec6"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.yaml
deleted file mode 100644
index aaa541c763fac9225ff0c7a9d66a389dc102426d..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-69:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.69
-      mac: 08:00:38:35:a4:34
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.69
-      mac: 08:00:38:35:ac:68
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ac:69
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca9d'
-      interface: InfiniBand
-      ip: 172.18.17.69
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:9d
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367befa"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.yaml
deleted file mode 100644
index 7f6052bb80b3fb78d51fb481364156d6f9bc1ae3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-7:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.7
-      mac: 08:00:38:35:a3:a0
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.7
-      mac: 08:00:38:35:ab:40
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:41
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c8e1'
-      interface: InfiniBand
-      ip: 172.18.17.7
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:e1
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a0751032ecad1"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.yaml
deleted file mode 100644
index d9e6cf9c6b1441dd302d1a5c01016262725f2602..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-70:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.70
-      mac: 08:00:38:35:a4:33
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.70
-      mac: 08:00:38:35:ac:66
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:35:ac:67
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135ca9a'
-      interface: InfiniBand
-      ip: 172.18.17.70
-      ip6: fe80::a00:3800:135:ca9a
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:9a
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367beaf"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      model: C400-MTFDDAA128M
-      rev: 040H
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.yaml
deleted file mode 100644
index b644274301e18b047cf4ebff5c5bb1cdef73418a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-71:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.71
-      mac: 08:00:38:35:a3:b3
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.71
-      mac: 08:00:38:35:ab:66
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:67
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c91a'
-      interface: InfiniBand
-      ip: 172.18.17.71
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:1a
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bed6"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml
deleted file mode 100644
index 4789f1f2b9630ccfcbc9ec586e21ec1fb2d3cca3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-72:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: '123456789'
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.72
-      mac: 08:00:38:36:af:ee
-      management: true
-    eth0:
-      driver: igb
-      interface: Ethernet
-      ip: 172.16.17.72
-      mac: 08:00:38:36:f3:dc
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: true
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      interface: Ethernet
-      mac: 08:00:38:36:f3:dd
-      management: false
-      model: 82576 Gigabit Network Connection
-      mounted: false
-      name: enp1s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x0800380001375fcb'
-      interface: InfiniBand
-      ip: 172.18.17.72
-      ip6: fe80::a00:3800:137:5fcb
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:37:5f:cb
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: true
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      mounted: false
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    vendor: Intel
-    version: E5520
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: C400-MTFDDAA128M
-      rev: 40.0
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.yaml
deleted file mode 100644
index b958e77a6cd8289e4e61232cdfa5e3897bade728..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-8:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.8
-      mac: 08:00:38:35:a3:ab
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.8
-      mac: 08:00:38:35:ab:56
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:57
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c902'
-      interface: InfiniBand
-      ip: 172.18.17.8
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:02
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367bf1b"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.yaml
deleted file mode 100644
index 14010691f2abe77595010309b3845803090605b0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-edel-9:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  chassis:
-    manufacturer: INSYDE
-    name: Thurley
-    serial: 123456789
-  main_memory:
-    ram_size: 25769803776
-  network_adapters:
-    bmc:
-      ip: 172.17.17.9
-      mac: 08:00:38:35:a3:ec
-      management: true
-    eth0:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      ip: 172.16.17.9
-      mac: 08:00:38:35:ab:d8
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: igb
-      firmware_version: 2.0.6
-      interface: Ethernet
-      mac: 08:00:38:35:ab:d9
-      management: false
-      model: 82576 Gigabit Network Connection
-      name: enp1s0f1
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      guid: '0x080038000135c9c5'
-      interface: InfiniBand
-      ip: 172.18.17.9
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c5
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib0
-      rate: 40000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      guid: '0x0000000000000000'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      management: false
-      model: MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2300000000
-    ht_capable: true
-    instruction_set: x86-64
-    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-0x500a07510367beb5"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 040H
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      vendor: ATA
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml b/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
deleted file mode 100644
index 7101ea201a298133f64e9633dda2ed20e7c48ab5..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
----
-# Cluster description
-model: Bull R422-E1
-created_at: 2008-10-01
-kavlan: true
-queues:
-  - default
-  - admin
-
-nodes:
-
-# Global node properties
-  genepi-[1-34]:
-    processor:
-      microarchitecture: Harpertown
-    performance:
-      core_flops: 7651000000
-      node_flops: 49650000000
-    supported_job_types:
-      deploy: true
-      besteffort: true
-      max_walltime: 0
-      queues:
-        - default
-        - admin
-    storage_devices:
-      sda:
-        interface: SATA
-        driver: ata_piix
-        storage: HDD
-    network_adapters:
-      eth0:
-        enabled: false
-        mountable: false
-        mounted: false
-        bridged: false
-      eth1:
-        enabled: true
-        mountable: true
-        mounted: true
-        bridged: true
-      ib0:
-        enabled: true
-        mountable: true
-        mounted: true
-        rate: 20000000000
-      ib1:
-        enabled: false
-        mountable: false
-        mounted: false
-      bmc:
-        interface: Ethernet
-        rate: 1.0e+9
-        enabled: true
-        management: true
-        mountable: false
-        mounted: false
-        vendor: Peppercon AG (10437)
-    gpu:
-      gpu: false
-    monitoring:
-      wattmeter: false
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/genepi_ip.yaml.erb b/input/grid5000/sites/grenoble/clusters/genepi/genepi_ip.yaml.erb
deleted file mode 100644
index ef7e5fa5eb1b3cd6e749a9f353abcdb4e07b15bc..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/genepi_ip.yaml.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-nodes:
-<% [*1..34].each { |i| %>
-  genepi-<%= i %>:
-    kavlan:
-      eth1:
-        kavlan-1: 192.168.195.<%= i %>
-        kavlan-2: 192.168.211.<%= i %>
-        kavlan-3: 192.168.227.<%= i %>
-        kavlan-4: 10.4.3.<%= i %>
-        kavlan-5: 10.4.67.<%= i %>
-        kavlan-6: 10.4.131.<%= i %>
-        kavlan-7: 10.4.194.<%= i %>
-        kavlan-8: 10.5.3.<%= i %>
-        kavlan-9: 10.5.67.<%= i %>
-        kavlan-11: 10.7.194.<%= i %>
-        kavlan-12: 10.11.194.<%= i %>
-        kavlan-13: 10.15.194.<%= i %>
-        kavlan-14: 10.19.194.<%= i %>
-        kavlan-16: 10.27.194.<%= i %>
-        kavlan-18: 10.35.194.<%= i %>
-        kavlan-20: 10.43.194.<%= i %>
-        kavlan-21: 10.47.194.<%= i %>
-<% } %>
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/genepi_network.yaml b/input/grid5000/sites/grenoble/clusters/genepi/genepi_network.yaml
deleted file mode 100644
index d5f7cbc71b1d231990e5bd9426ddba3286d1da0e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/genepi_network.yaml
+++ /dev/null
@@ -1,173 +0,0 @@
----
-nodes:
-  genepi-1:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:22'
-  genepi-2:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:42'
-  genepi-3:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:21'
-  genepi-4:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:40'
-  genepi-5:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:19'
-  genepi-6:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:41'
-  genepi-7:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:20'
-  genepi-8:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:39'
-  genepi-9:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:18'
-  genepi-10:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:37'
-  genepi-11:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:9'
-  genepi-12:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:38'
-  genepi-13:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:17'
-  genepi-14:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:29'
-  genepi-15:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:7'
-  genepi-16:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:25'
-  genepi-17:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:6'
-  genepi-18:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:27'
-  genepi-19:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:16'
-  genepi-20:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:31'
-  genepi-21:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:10'
-  genepi-22:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:32'
-  genepi-23:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:14'
-  genepi-24:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:30'
-  genepi-25:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:15'
-  genepi-26:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:8'
-  genepi-27:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:4'
-  genepi-28:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:33'
-  genepi-29:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:3'
-  genepi-30:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:28'
-  genepi-31:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:13'
-  genepi-32:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:34'
-  genepi-33:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '4:5'
-  genepi-34:
-    network_adapters:
-      eth1:
-        switch: gw-grenoble
-        switch_port: '3:26'
-  
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml
deleted file mode 100644
index c2bb55a7dc4449ced488c8f34320bc756c3bb4e1..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-1:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00183
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.1
-      mac: 00:30:48:96:d6:b5
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:85:be
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.1
-      mac: 00:30:48:7f:85:bf
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000158b9'
-      interface: InfiniBand
-      ip: 172.18.16.1
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:b9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000158ba'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:ba
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee155ea69d5"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml
deleted file mode 100644
index 6471f8fd5188aa80834c665d27fd9f59c114f54e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-10:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00187
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.10
-      mac: 00:30:48:96:d7:76
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:41:fc
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.10
-      mac: 00:30:48:7f:41:fd
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000159a5'
-      interface: InfiniBand
-      ip: 172.18.16.10
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000159a6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a6
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1ab3942f4"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml
deleted file mode 100644
index a9ca529a42eaa5a82da2b6703862499529bfab68..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-11:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00188
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.11
-      mac: 00:30:48:96:d6:90
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:42:06
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.11
-      mac: 00:30:48:7f:42:07
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015431'
-      interface: InfiniBand
-      ip: 172.18.16.11
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:54:31
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015432'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:54:32
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1ab396547"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml
deleted file mode 100644
index cf4cd8130766260e8c7ee23f55596b39d3192a1d..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-12:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00188
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.12
-      mac: 00:30:48:96:d2:39
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7e:a3:d4
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.12
-      mac: 00:30:48:7e:a3:d5
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000159a1'
-      interface: InfiniBand
-      ip: 172.18.16.12
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000159a2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a2
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee100956ff0"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml
deleted file mode 100644
index c377737140de2ebdc731a20295666d66906b0b51..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-13:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00189
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.13
-      mac: 00:30:48:96:d4:9a
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:3e:c6
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.13
-      mac: 00:30:48:7f:3e:c7
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155c9'
-      interface: InfiniBand
-      ip: 172.18.16.13
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:c9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155ca'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ca
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee155f09c9c"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml
deleted file mode 100644
index 7f8d06aefb2ab934caacfba5c100a0d6402f34f1..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-14:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00189
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.14
-      mac: 00:30:48:96:d3:40
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:41:f2
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.14
-      mac: 00:30:48:7f:41:f3
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155cd'
-      interface: InfiniBand
-      ip: 172.18.16.14
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:cd
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155ce'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ce
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1009bccc2"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml
deleted file mode 100644
index 4e5e597356b72fbf25b01118df5f4e912eb855c2..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-15:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00190
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.15
-      mac: 00:30:48:96:d3:2f
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:3e:f2
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.15
-      mac: 00:30:48:7f:3e:f3
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155d9'
-      interface: InfiniBand
-      ip: 172.18.16.15
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155da'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:da
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1ab3fa9f1"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml
deleted file mode 100644
index 7faa5864a177b3c9bdbcd1a6df606f57098aa5dc..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-16:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00190
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.16
-      mac: 00:30:48:96:d4:37
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:3e:b8
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.16
-      mac: 00:30:48:7f:3e:b9
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155e9'
-      interface: InfiniBand
-      ip: 172.18.16.16
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155ea'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ea
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1ab3fa9d6"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml
deleted file mode 100644
index 3552652ec750ec011440a5ae08cf16e1899e5846..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-17:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00191
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.17
-      mac: 00:30:48:96:d2:42
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:8a:8c
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.17
-      mac: 00:30:48:7f:8a:8d
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155e1'
-      interface: InfiniBand
-      ip: 172.18.16.17
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155e2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e2
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee155ea2c07"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml
deleted file mode 100644
index fdc95ddadf7b187e3e677f1733ec4e215cb318f3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-18:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00119
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.18
-      mac: 00:30:48:96:d3:4d
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:85:fa
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.18
-      mac: 00:30:48:7f:85:fb
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155d5'
-      interface: InfiniBand
-      ip: 172.18.16.18
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155d6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d6
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee155ea4e1c"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml
deleted file mode 100644
index 492ff7f3a2bc674e3828a8df32f6a13e6764bc9e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-19:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00192
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.19
-      mac: 00:30:48:96:d1:f5
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:8a:8a
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.19
-      mac: 00:30:48:7f:8a:8b
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c9030001565d'
-      interface: InfiniBand
-      ip: 172.18.16.19
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:5d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c9030001565e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:5e
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1009bd2a6"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml
deleted file mode 100644
index 803cd026c66770cc4f15fdefadc67d3eb86db7fa..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-2:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00183
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.2
-      mac: 00:30:48:96:d1:e2
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:91:62
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.2
-      mac: 00:30:48:7f:91:63
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000158d5'
-      interface: InfiniBand
-      ip: 172.18.16.2
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:d5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000158d6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:d6
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee155ea4a58"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml
deleted file mode 100644
index 1d564eb237c1ad052fe73e851bc59efeebb3c5af..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-20:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00192
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.20
-      mac: 00:30:48:96:d3:bf
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:8a:86
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.20
-      mac: 00:30:48:7f:8a:87
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155e5'
-      interface: InfiniBand
-      ip: 172.18.16.20
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155e6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e6
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1ab3fa9c7"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml
deleted file mode 100644
index 6e8ac4bf5bab42336d9ca13958ac4cb83543e92a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-21:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00193
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.21
-      mac: 00:30:48:96:d3:56
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:3e:f0
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.21
-      mac: 00:30:48:7f:3e:f1
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155d1'
-      interface: InfiniBand
-      ip: 172.18.16.21
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155d2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d2
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1009bd31f"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml
deleted file mode 100644
index fdda5ce934567b42f5aaea470558132d902d561c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-22:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00193
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.22
-      mac: 00:30:48:96:d2:fd
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:41:f4
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.22
-      mac: 00:30:48:7f:41:f5
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155c1'
-      interface: InfiniBand
-      ip: 172.18.16.22
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:c1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155c2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:c2
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1009bd2cd"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml
deleted file mode 100644
index 07c9160a1ae6dc0582bfa44aaf5b4bfe9f029c92..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-23:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00194
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.23
-      mac: 00:30:48:96:d2:d1
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:29:dc
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.23
-      mac: 00:30:48:7f:29:dd
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015631'
-      interface: InfiniBand
-      ip: 172.18.16.23
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:31
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015632'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:32
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee100958280"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml
deleted file mode 100644
index 8b0665db4c4299c797494360b238d429f9bbad45..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-24:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00194
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.24
-      mac: 00:30:48:96:d6:ff
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:29:de
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.24
-      mac: 00:30:48:7f:29:df
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015b01'
-      interface: InfiniBand
-      ip: 172.18.16.24
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:01
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015b02'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:02
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee155ea332a"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml
deleted file mode 100644
index f45ec020d2136ac767f5f708e23afcbc2ca89b28..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-25:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00195
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.25
-      mac: 00:30:48:96:d3:2d
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:41:5a
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.25
-      mac: 00:30:48:7f:41:5b
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015601'
-      interface: InfiniBand
-      ip: 172.18.16.25
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:01
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015602'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:02
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee155ea4acc"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml
deleted file mode 100644
index 3cdf702abdfa1f3eff8a2dd46d28c558b529477e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-26:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00195
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.26
-      mac: 00:30:48:96:d6:08
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:41:5c
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.26
-      mac: 00:30:48:7f:41:5d
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000157fd'
-      interface: InfiniBand
-      ip: 172.18.16.26
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:fd
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000157fe'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:fe
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1ab3957aa"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
deleted file mode 100644
index c519f2caee77e05be28bd13137388e2ff5f40553..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-27:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00196
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.27
-      mac: 00:30:48:96:d3:1f
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:30:48:7f:41:4e
-      management: false
-      mounted: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.16.27
-      mac: 00:30:48:7f:41:4f
-      management: false
-      mounted: true
-      rate: 1000000000
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015731'
-      interface: InfiniBand
-      ip: 172.18.16.27
-      ip6: fe80::202:c903:1:5731
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:31
-      management: false
-      mounted: true
-      name: ib0
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015732'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:32
-      management: false
-      mounted: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: none
-    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: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  status: retired
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: WDC WD1600YS-01S
-      rev: 20.06
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
deleted file mode 100644
index 3b94a71b6c507694a2d4a0716992a30664c4fc2b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-28:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00196
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.28
-      mac: 00:30:48:96:d7:76
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:30:48:7f:41:5e
-      management: false
-      mounted: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.16.28
-      mac: 00:30:48:7f:41:5f
-      management: false
-      mounted: true
-      rate: 1000000000
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015659'
-      interface: InfiniBand
-      ip: 172.18.16.28
-      ip6: fe80::202:c903:1:5659
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:59
-      management: false
-      mounted: true
-      name: ib0
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c9030001565a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:5a
-      management: false
-      mounted: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: none
-    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: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  status: retired
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: WDC WD1600YS-01S
-      rev: 20.06
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml
deleted file mode 100644
index ac1c56c6b5a5f7a6842de97c1f7460fa8603adb4..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-29:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00197
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.29
-      mac: 00:30:48:96:d2:db
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:29:ec
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.29
-      mac: 00:30:48:7f:29:ed
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155b5'
-      interface: InfiniBand
-      ip: 172.18.16.29
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:b5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155b6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:b6
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1ab3fa9dc"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml
deleted file mode 100644
index c94d6b644d9b18992375a19c01dea8dbeb4168ae..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-3:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00184
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.3
-      mac: 00:30:48:96:d3:44
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:3f:0a
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.3
-      mac: 00:30:48:7f:3f:0b
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000159a9'
-      interface: InfiniBand
-      ip: 172.18.16.3
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000159aa'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:aa
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee155ea6946"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml
deleted file mode 100644
index 7b964e3bb2842237d671271d0e6452dbbcdfb231..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-30:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00197
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.30
-      mac: 00:30:48:96:d4:2f
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:29:da
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.30
-      mac: 00:30:48:7f:29:db
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015661'
-      interface: InfiniBand
-      ip: 172.18.16.30
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:61
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015662'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:62
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1ab3fa988"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml
deleted file mode 100644
index 4bb0844eced0eeccb55d6a0729753885a4afff02..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-31:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00198
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.31
-      mac: 00:30:48:96:d4:24
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:41:56
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.31
-      mac: 00:30:48:7f:41:57
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.8.0
-      guid: '0x0002c90300015665'
-      interface: InfiniBand
-      ip: 172.18.16.31
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:65
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.8.0
-      guid: '0x0002c90300015666'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:66
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee155f09c4d"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml
deleted file mode 100644
index e7ea104bf69795188b0ec3d19f983524beb7bb6d..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-32:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00198
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.32
-      mac: 00:30:48:96:d7:84
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:41:50
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.32
-      mac: 00:30:48:7f:41:51
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155ed'
-      interface: InfiniBand
-      ip: 172.18.16.32
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ed
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000155ee'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ee
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1009bd2bf"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml
deleted file mode 100644
index 23e102c9226edd7ba1659cdf06bfbbeee5cb9e40..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-33:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00199
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.33
-      mac: 00:30:48:96:d2:dc
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:29:ee
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.33
-      mac: 00:30:48:7f:29:ef
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015805'
-      interface: InfiniBand
-      ip: 172.18.16.33
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:05
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015806'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:06
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1009bd2e3"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
deleted file mode 100644
index 95ac5f9a52e94dfaae7281d40e63cb4f74236c76..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-34:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00199
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.34
-      mac: 00:30:48:96:d2:dd
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:30:48:7f:29:40
-      management: false
-      mounted: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.16.34
-      mac: 00:30:48:7f:29:41
-      management: false
-      mounted: true
-      rate: 1000000000
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015655'
-      interface: InfiniBand
-      ip: 172.18.16.34
-      ip6: fe80::202:c903:1:5655
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:55
-      management: false
-      mounted: true
-      name: ib0
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015656'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:56
-      management: false
-      mounted: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: none
-    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: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  status: retired
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: WDC WD1600YS-01S
-      rev: 20.06
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml
deleted file mode 100644
index 9d4fc97cc746f64c44c204f134c64626c84e9395..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-4:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00184
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.4
-      mac: 00:30:48:96:d2:5d
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:44:8c
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.4
-      mac: 00:30:48:7f:44:8d
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000158bd'
-      interface: InfiniBand
-      ip: 172.18.16.4
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:bd
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000158be'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:be
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1ab3947d8"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml
deleted file mode 100644
index c68eacaf9b5018937f3e284df101662fe1a6051c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-5:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00185
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.5
-      mac: 00:30:48:93:39:e8
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:c1:b4:a6
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.5
-      mac: 00:30:48:c1:b4:a7
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015b0d'
-      interface: InfiniBand
-      ip: 172.18.16.5
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:0d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015b0e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:0e
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee10095a00b"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml
deleted file mode 100644
index 9834b2eaf4851682f80e019612a7995f30bf6036..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-6:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00185
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.6
-      mac: 00:30:48:96:d3:1f
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:29:f2
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.6
-      mac: 00:30:48:7f:29:f3
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c9030001552d'
-      interface: InfiniBand
-      ip: 172.18.16.6
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:2d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c9030001552e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:2e
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee155ea343a"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml
deleted file mode 100644
index 3b308ac6cc051311705bfd1c2f53f2314bf39bd0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-7:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00186
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.7
-      mac: 00:30:48:96:d1:d2
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:29:e0
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.7
-      mac: 00:30:48:7f:29:e1
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000159ad'
-      interface: InfiniBand
-      ip: 172.18.16.7
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:ad
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c903000159ae'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:ae
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee155ea486f"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml
deleted file mode 100644
index cbf294e9e96c63dc664df4521ddda9a69716ed34..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-8:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5S-00186
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.8
-      mac: 00:30:48:96:d6:94
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:29:e2
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.8
-      mac: 00:30:48:7f:29:e3
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015b19'
-      interface: InfiniBand
-      ip: 172.18.16.8
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:19
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015b1a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:1a
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee1009585bd"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml
deleted file mode 100644
index 5643d204cb9e7db0883cb3eadf8cd842fa61e1b5..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-genepi-9:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  chassis:
-    manufacturer: Bull SAS
-    name: Novascale Universal
-    serial: XAN-SM5P-00187
-  main_memory:
-    ram_size: 8589934592
-  network_adapters:
-    bmc:
-      ip: 172.17.16.9
-      mac: 00:30:48:96:d4:8e
-    eth0:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      mac: 00:30:48:7f:3e:ea
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f0
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 2.1-12
-      interface: Ethernet
-      ip: 172.16.16.9
-      mac: 00:30:48:7f:3e:eb
-      management: false
-      model: 80003ES2LAN Gigabit Ethernet Controller (Copper)
-      name: enp5s0f1
-      rate: 1000000000
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015b15'
-      interface: InfiniBand
-      ip: 172.18.16.9
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:15
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.7.0
-      guid: '0x0002c90300015b16'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:16
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib1
-      rate: 10000000000
-      vendor: Mellanox Technologies
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-    clock_speed: 2500000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    vendor: Intel
-    version: E5420
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x50014ee100951626"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: 20.06C06
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
index fc47e4408f56674c0e7766fd94685757af3577c7..d5796537b3b1518ea5da61d488adf88a28bdc162 100644
--- a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
@@ -72,70 +72,23 @@ gw-grenoble:
       rate: 1000000000
       ports:
         1:
-          uid: sw-edel-2
-          port: 0/1
-          aggregation: trunk
         2:
-          uid: sw-edel-2
-          port: 0/2
-          aggregation: trunk
         3:
-          uid: sw-edel-2
-          port: 0/3
-          aggregation: trunk
         4:
-          uid: sw-edel-1
-          port: 0/1
-          aggregation: trunk
         5:
-          uid: sw-edel-1
-          port: 0/2
-          aggregation: trunk
         6:
-          uid: sw-edel-1
-          port: 0/3
-          aggregation: trunk
         7:
-          uid: sw-edel-3
-          port: 0/1
-          aggregation: trunk
         8:
-          uid: sw-edel-3
-          port: 0/2
-          aggregation: trunk
         9:
-          uid: sw-edel-3
-          port: 0/3
-          aggregation: trunk
         10:
-          uid: sw-edel-4
-          port: 0/1
-          aggregation: trunk
         11:
-          uid: sw-edel-4
-          port: 0/2
-          aggregation: trunk
         12:
-          uid: sw-edel-4
-          port: 0/3
-          aggregation: trunk
         23:
-          uid: voltaire-1
         24:
-          uid: voltaire-2
         25:
         26:
-          uid: digsed
-          port: eth3
-          kind: other
         27:
-          uid: digsed
-          port: bmc
-          kind: other
         28:
-          uid: digsed
-          port: eth2
-          kind: other
     3:
       snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%"
       kavlan_pattern: "%LINECARD%:%PORT%"
@@ -144,37 +97,13 @@ gw-grenoble:
       rate: 1000000000
       ports:
         1:
-          uid: digmgt
-          port: eth0
-          kind: other
         2:
-          uid: digmgt
-          port: eth1
-          kind: other
         3:
-          uid: digmgt
-          port: eth2
-          kind: other
         4:
-          uid: digmgt
-          port: eth3
-          kind: other
         5:
-          uid: grimage-9
-          port: eth0
-          kind: other
         6:
-          uid: grimage-9
-          port: eth1
-          kind: other
         7:
-          uid: grimage-10
-          port: eth0
-          kind: other
         8:
-          uid: grimage-10
-          port: eth1
-          kind: other
         11:
         12:
         13:
@@ -186,50 +115,20 @@ gw-grenoble:
         19:
         20:
         21:
-          uid: voltaire-3
-          kind: switch
         25:
-          uid: genepi-16
-          port: eth1
         27:
-          uid: genepi-18
-          port: eth1
         28:
-          uid: genepi-30
-          port: eth1
         29:
-          uid: genepi-14
-          port: eth1
         30:
-          uid: genepi-24
-          port: eth1
         31:
-          uid: genepi-20
-          port: eth1
         32:
-          uid: genepi-22
-          port: eth1
         34:
-          uid: genepi-32
-          port: eth1
         37:
-          uid: genepi-10
-          port: eth1
         38:
-          uid: genepi-12
-          port: eth1
         39:
-          uid: genepi-8
-          port: eth1
         40:
-          uid: genepi-4
-          port: eth1
         41:
-          uid: genepi-6
-          port: eth1
         42:
-          uid: genepi-2
-          port: eth1
     4:
       snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%"
       kavlan_pattern: "%LINECARD%:%PORT%"
@@ -238,98 +137,33 @@ gw-grenoble:
       rate: 1000000000
       ports:
         1:
-          uid: summit-grimage
-          kind: other
         3:
-          uid: genepi-29
-          port: eth1
         5:
-          uid: genepi-33
-          port: eth1
         6:
-          uid: genepi-17
-          port: eth1
         7:
-          uid: genepi-15
-          port: eth1
         8:
-          uid: genepi-26
-          port: eth1
         9:
-          uid: genepi-11
-          port: eth1
         10:
-          uid: genepi-21
-          port: eth1
         13:
-          uid: genepi-31
-          port: eth1
         14:
-          uid: genepi-23
-          port: eth1
         15:
-          uid: genepi-25
-          port: eth1
         16:
-          uid: genepi-19
-          port: eth1
         17:
-          uid: genepi-13
-          port: eth1
         18:
-          uid: genepi-9
-          port: eth1
         19:
-          uid: genepi-5
-          port: eth1
         20:
-          uid: genepi-7
-          port: eth1
         21:
-          uid: genepi-3
-          port: eth1
         22:
-          uid: genepi-1
-          port: eth1
         23:
-          uid: vthd-inria
-          kind: virtual
         24:
-          uid: alpes
-          port: eth0
-          kind: other
         25:
-          uid: grimage-1
-          port: eth0
-          kind: other
         26:
-          uid: grimage-2
-          port: eth0
-          kind: other
         27:
-          uid: grimage-3
-          port: eth0
-          kind: other
         28:
-          uid: grimage-4
-          port: eth0
-          kind: other
         29:
-          uid: grimage-5
-          port: eth0
-          kind: other
         30:
-          uid: grimage-6
-          port: eth0
-          kind: other
         31:
-          uid: grimage-7
-          port: eth0
-          kind: other
         32:
-          uid: grimage-8
-          port: eth0
-          kind: other
     10:
       snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%"
       kavlan_pattern: "%LINECARD%:%PORT%"
diff --git a/input/grid5000/sites/grenoble/networks/ib-grenoble.yaml b/input/grid5000/sites/grenoble/networks/ib-grenoble.yaml
deleted file mode 100644
index 22121c0747eeabde7bb73142eda4cfd701b288d9..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/networks/ib-grenoble.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
---- 
-ib-grenoble: 
-  model: Infiniband
-  kind: switch
-  site: grenoble
-  warranty: expired
-  snmp_community: public
-  weathermap: 
-    use_cacti: "no"
-  vlans: {}
-  backplane_bps: 960000000000
-  linecards: 
-    0:
-      kind: switch
-      rate: 10000000000
-      snmp_pattern: "%LINECARD%/%PORT%"
-      ports:
-        0: voltaire-1
-        1: voltaire-2
-        2: voltaire-3
diff --git a/input/grid5000/sites/grenoble/networks/sw-edel-1.yaml b/input/grid5000/sites/grenoble/networks/sw-edel-1.yaml
deleted file mode 100644
index 4d71079142d9c65d071ac5cf42499554209671ff..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/networks/sw-edel-1.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sw-edel-1:
-  model: Broadcom
-  kind: switch
-  site: grenoble
-  warranty: expired
-  snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-  mtu: 9216
-  weathermap:
-    use_cacti: "no"
-  vlans: {}
-  backplane_bps: 2880000000000
-  network_adapters:
-    default:
-      ip: 172.17.31.200
-      mac: 08:00:38:35:a0:16
-  linecards:
-    1:
-      snmp_pattern: "Unit: %LINECARD% Slot: 0 Port: %PORT% Gigabit - Level"
-      kavlan_pattern: "%LINECARD%/0/%PORT%"
-      kind: node
-      port: eth0
-      rate: 1000000000
-      ports:
-        4:
-          uid: edel-cmc-1
-          kind: other
-        5: edel-1
-        6: edel-2
-        7: edel-3
-        8: edel-4
-        9: edel-5
-        10: edel-6
-        11: edel-7
-        12: edel-8
-        13: edel-9
-        14: edel-10
-        15: edel-11
-        16: edel-12
-        17: edel-13
-        18: edel-14
-        19: edel-18
-        20: edel-17
-        21: edel-16
-        22: edel-15
-        25:
-          uid: gw-grenoble
-          port: "2:4"
-          kind: router
-          aggregation: trunk
-        26:
-          uid: gw-grenoble
-          port: "2:5"
-          kind: router
-          aggregation: trunk
-        27:
-          uid: gw-grenoble
-          port: "2:6"
-          kind: router
-          aggregation: trunk
diff --git a/input/grid5000/sites/grenoble/networks/sw-edel-2.yaml b/input/grid5000/sites/grenoble/networks/sw-edel-2.yaml
deleted file mode 100644
index 42ff6f1edf216303c6d44c37aa7377c8fd06e64c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/networks/sw-edel-2.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
---- 
-sw-edel-2:
-  model: Broadcom
-  kind: switch
-  site: grenoble
-  warranty: expired
-  snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-  mtu: 9216
-  weathermap: 
-    use_cacti: "no"
-  vlans: {}
-  backplane_bps: 2880000000000
-  network_adapters:
-    default:
-      ip: 172.17.31.201
-      mac: 08:00:38:38:82:88
-  linecards: 
-    1: 
-      snmp_pattern: "Unit: %LINECARD% Slot: 0 Port: %PORT% Gigabit - Level"
-      kavlan_pattern: "%LINECARD%/0/%PORT%"
-      kind: node
-      port: eth0
-      rate: 1000000000
-      ports: 
-        4: 
-          uid: edel-cmc-2
-          kind: other
-        5: edel-19
-        6: edel-20
-        7: edel-21
-        8: edel-22
-        9: edel-23
-        10: edel-24
-        11: edel-25
-        12: edel-26
-        14: edel-28
-        15: edel-29
-        16: edel-30
-        17: edel-31
-        18: edel-32
-        19: edel-33
-        20: edel-34
-        21: edel-35
-        22: edel-36
-        25:
-          uid: gw-grenoble
-          port: "2:1"
-          kind: router
-          aggregation: trunk
-        26:
-          uid: gw-grenoble
-          port: "2:2"
-          kind: router
-          aggregation: trunk
-        27:
-          uid: gw-grenoble
-          port: "2:3"
-          kind: router
-          aggregation: trunk
diff --git a/input/grid5000/sites/grenoble/networks/sw-edel-3.yaml b/input/grid5000/sites/grenoble/networks/sw-edel-3.yaml
deleted file mode 100644
index 6ea86940b5d6ee725201c0e1955ed6b95cb8d292..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/networks/sw-edel-3.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
---- 
-sw-edel-3:
-  model: Broadcom
-  kind: switch
-  site: grenoble
-  warranty: expired
-  snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-  mtu: 9216
-  weathermap: 
-    use_cacti: "no"
-  vlans: {}
-  backplane_bps: 2880000000000
-  network_adapters:
-    default:
-      ip: 172.17.31.202
-      mac: 08:00:38:35:a0:24
-  linecards: 
-    1: 
-      snmp_pattern: "Unit: %LINECARD% Slot: 0 Port: %PORT% Gigabit - Level"
-      kavlan_pattern: "%LINECARD%/0/%PORT%"
-      kind: node
-      port: eth0
-      rate: 1000000000
-      ports: 
-        4: 
-          uid: edel-cmc-3
-          kind: other
-        5: edel-37
-        6: edel-38
-        7: edel-39
-        8: edel-40
-        9: edel-41
-        10: edel-42
-        11: edel-43
-        12: edel-44
-        14: edel-46
-        15: edel-47
-        16: edel-48
-        17: edel-49
-        18: edel-50
-        19: edel-51
-        20: edel-52
-        21: edel-53
-        25:
-          uid: gw-grenoble
-          port: "2:7"
-          kind: router
-          aggregation: trunk
-        26:
-          uid: gw-grenoble
-          port: "2:8"
-          kind: router
-          aggregation: trunk
-        27:
-          uid: gw-grenoble
-          port: "2:9"
-          kind: router
-          aggregation: trunk
diff --git a/input/grid5000/sites/grenoble/networks/sw-edel-4.yaml b/input/grid5000/sites/grenoble/networks/sw-edel-4.yaml
deleted file mode 100644
index 25d64d6cf0324eac09a4be13b7f86614e3d1705b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/networks/sw-edel-4.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
---- 
-sw-edel-4:
-  model: Broadcom
-  kind: switch
-  site: grenoble
-  warranty: expired
-  snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-  mtu: 9216
-  weathermap: 
-    use_cacti: "no"
-  vlans: {}
-  backplane_bps: 2880000000000
-  network_adapters:
-    default:
-      ip: 172.17.31.203
-      mac: 08:00:38:35:a0:1f
-  linecards: 
-    1:
-      snmp_pattern: "Unit: %LINECARD% Slot: 0 Port: %PORT% Gigabit - Level"
-      kavlan_pattern: "%LINECARD%/0/%PORT%"
-      kind: node
-      port: eth0
-      rate: 1000000000
-      ports: 
-        4:
-          kind: other
-          uid: edel-cmc-4
-        5: edel-55
-        6: edel-56
-        7: edel-57
-        8: edel-58
-        9: edel-59
-        10: edel-60
-        12: edel-62
-        13: edel-63
-        14: edel-64
-        15: edel-65
-        16: edel-66
-        17: edel-67
-        18: edel-68
-        19: edel-69
-        20: edel-70
-        21: edel-71
-        22: edel-72
-        25:
-          uid: gw-grenoble
-          port: "2:10"
-          kind: router
-          aggregation: trunk
-        26:
-          uid: gw-grenoble
-          port: "2:11"
-          kind: router
-          aggregation: trunk
-        27:
-          uid: gw-grenoble
-          port: "2:12"
-          kind: router
-          aggregation: trunk
diff --git a/input/grid5000/sites/grenoble/networks/voltaire-1.yaml b/input/grid5000/sites/grenoble/networks/voltaire-1.yaml
deleted file mode 100644
index 083ee53e136ca48f91929fc973cc0165b5797662..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/networks/voltaire-1.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
---- 
-voltaire-1:
-  model: Infiniband
-  kind: switch
-  site: grenoble
-  warranty: expired
-  snmp_community: public
-  weathermap: 
-    use_cacti: "no"
-  vlans: {}
-  backplane_bps: 960000000000
-  linecards:
-    0: 
-      kind: switch
-      rate: 10000000000
-      snmp_pattern: "%LINECARD%/%PORT%"
-      ports: 
-        0: ib-grenoble
diff --git a/input/grid5000/sites/grenoble/networks/voltaire-2.yaml b/input/grid5000/sites/grenoble/networks/voltaire-2.yaml
deleted file mode 100644
index ce6a681fba31c3e0a7e2c16641b128b1915dfd8b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/networks/voltaire-2.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-voltaire-2:
-  model: Infiniband
-  kind: switch
-  site: grenoble
-  warranty: expired
-  snmp_community: public
-  weathermap: 
-    use_cacti: "no"
-  vlans: {}
-  backplane_bps: 960000000000
-  linecards: 
-    0: 
-      kind: switch
-      rate: 10000000000
-      snmp_pattern: "%LINECARD%/%PORT%"
-      ports: 
-        0: ib-grenoble
diff --git a/input/grid5000/sites/grenoble/networks/voltaire-3.yaml b/input/grid5000/sites/grenoble/networks/voltaire-3.yaml
deleted file mode 100644
index 179013e55f91873b443913dab7ce22d728875a82..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/grenoble/networks/voltaire-3.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
---- 
-voltaire-3:
-  model: Infiniband
-  kind: switch
-  site: grenoble
-  warranty: expired
-  snmp_community: public
-  weathermap: 
-    use_cacti: "no"
-  vlans: {}
-  backplane_bps: 960000000000
-  linecards: 
-    0:
-      kind: switch
-      rate: 10000000000
-      snmp_pattern: "%LINECARD%/%PORT%"
-      ports: 
-        0: ib-grenoble