diff --git a/data/grid5000/sites/nancy/clusters/graphene/graphene.json b/data/grid5000/sites/nancy/clusters/graphene/graphene.json
deleted file mode 100644
index b08a40754464d9f31548dcddd016ba8cc65edf3c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/graphene.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "created_at": "Wed, 19 Jan 2011 23:00:00 GMT",
-  "kavlan": true,
-  "model": "Carri System 5393",
-  "queues": [
-    "default",
-    "admin"
-  ],
-  "type": "cluster",
-  "uid": "graphene"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
deleted file mode 100644
index 0212c2e44afa499a81a8591067adbc45d7323a4d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.10",
-      "kavlan-11": "10.7.213.10",
-      "kavlan-12": "10.11.213.10",
-      "kavlan-13": "10.15.213.10",
-      "kavlan-14": "10.19.213.10",
-      "kavlan-16": "10.27.213.10",
-      "kavlan-18": "10.35.213.10",
-      "kavlan-2": "192.168.209.10",
-      "kavlan-20": "10.43.213.10",
-      "kavlan-21": "10.47.213.10",
-      "kavlan-3": "192.168.225.10",
-      "kavlan-4": "10.16.1.10",
-      "kavlan-5": "10.16.65.10",
-      "kavlan-6": "10.16.129.10",
-      "kavlan-7": "10.16.193.10",
-      "kavlan-8": "10.17.1.10",
-      "kavlan-9": "10.17.65.10"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.10",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:d0",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-10.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/7",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:d1",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:d2",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b916d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.10",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-10-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b916e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6e",
-      "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.64.10",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:d3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-10-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/34"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e2a7ff",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-10"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
deleted file mode 100644
index fe5dd9334b3943d73cf16edd66369d20630d9107..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.100",
-      "kavlan-11": "10.7.213.100",
-      "kavlan-12": "10.11.213.100",
-      "kavlan-13": "10.15.213.100",
-      "kavlan-14": "10.19.213.100",
-      "kavlan-16": "10.27.213.100",
-      "kavlan-18": "10.35.213.100",
-      "kavlan-2": "192.168.209.100",
-      "kavlan-20": "10.43.213.100",
-      "kavlan-21": "10.47.213.100",
-      "kavlan-3": "192.168.225.100",
-      "kavlan-4": "10.16.1.100",
-      "kavlan-5": "10.16.65.100",
-      "kavlan-6": "10.16.129.100",
-      "kavlan-7": "10.16.193.100",
-      "kavlan-8": "10.17.1.100",
-      "kavlan-9": "10.17.65.100"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.100",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:cc",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-100.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/25",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:cd",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:ce",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d0d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.100",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-100-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d0e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d: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.64.100",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:cf",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-100-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/16"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8cd4d",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-100"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
deleted file mode 100644
index 2ad820153ae46c7f45ec042878ac45ac81e30638..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.101",
-      "kavlan-11": "10.7.213.101",
-      "kavlan-12": "10.11.213.101",
-      "kavlan-13": "10.15.213.101",
-      "kavlan-14": "10.19.213.101",
-      "kavlan-16": "10.27.213.101",
-      "kavlan-18": "10.35.213.101",
-      "kavlan-2": "192.168.209.101",
-      "kavlan-20": "10.43.213.101",
-      "kavlan-21": "10.47.213.101",
-      "kavlan-3": "192.168.225.101",
-      "kavlan-4": "10.16.1.101",
-      "kavlan-5": "10.16.65.101",
-      "kavlan-6": "10.16.129.101",
-      "kavlan-7": "10.16.193.101",
-      "kavlan-8": "10.17.1.101",
-      "kavlan-9": "10.17.65.101"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.101",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:a0",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-101.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/28",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:a1",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:a2",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5cd9",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.101",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-101-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5cda",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c: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.64.101",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:a3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-101-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/17"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93b81",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-101"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
deleted file mode 100644
index 3cb4bc2c1d3eab6ddf5debbd272f5aa6edcd0c30..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.102",
-      "kavlan-11": "10.7.213.102",
-      "kavlan-12": "10.11.213.102",
-      "kavlan-13": "10.15.213.102",
-      "kavlan-14": "10.19.213.102",
-      "kavlan-16": "10.27.213.102",
-      "kavlan-18": "10.35.213.102",
-      "kavlan-2": "192.168.209.102",
-      "kavlan-20": "10.43.213.102",
-      "kavlan-21": "10.47.213.102",
-      "kavlan-3": "192.168.225.102",
-      "kavlan-4": "10.16.1.102",
-      "kavlan-5": "10.16.65.102",
-      "kavlan-6": "10.16.129.102",
-      "kavlan-7": "10.16.193.102",
-      "kavlan-8": "10.17.1.102",
-      "kavlan-9": "10.17.65.102"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.102",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:bc",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-102.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/27",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:bd",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:be",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5e71",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.102",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:71",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-102-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5e72",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:72",
-      "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.64.102",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:bf",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-102-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/18"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6a16b",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-102"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
deleted file mode 100644
index 394aeefd3e9b4c5a3d470f0ef9008c9d22b594ff..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.103",
-      "kavlan-11": "10.7.213.103",
-      "kavlan-12": "10.11.213.103",
-      "kavlan-13": "10.15.213.103",
-      "kavlan-14": "10.19.213.103",
-      "kavlan-16": "10.27.213.103",
-      "kavlan-18": "10.35.213.103",
-      "kavlan-2": "192.168.209.103",
-      "kavlan-20": "10.43.213.103",
-      "kavlan-21": "10.47.213.103",
-      "kavlan-3": "192.168.225.103",
-      "kavlan-4": "10.16.1.103",
-      "kavlan-5": "10.16.65.103",
-      "kavlan-6": "10.16.129.103",
-      "kavlan-7": "10.16.193.103",
-      "kavlan-8": "10.17.1.103",
-      "kavlan-9": "10.17.65.103"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.103",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:c8",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-103.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/30",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:c9",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:ca",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d49",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.103",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:49",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-103-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d4a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:4a",
-      "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.64.103",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:cb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-103-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/19"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93a91",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-103"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
deleted file mode 100644
index 5e8d33f645ff9482d1500b5a79570284a8b71b2f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.104",
-      "kavlan-11": "10.7.213.104",
-      "kavlan-12": "10.11.213.104",
-      "kavlan-13": "10.15.213.104",
-      "kavlan-14": "10.19.213.104",
-      "kavlan-16": "10.27.213.104",
-      "kavlan-18": "10.35.213.104",
-      "kavlan-2": "192.168.209.104",
-      "kavlan-20": "10.43.213.104",
-      "kavlan-21": "10.47.213.104",
-      "kavlan-3": "192.168.225.104",
-      "kavlan-4": "10.16.1.104",
-      "kavlan-5": "10.16.65.104",
-      "kavlan-6": "10.16.129.104",
-      "kavlan-7": "10.16.193.104",
-      "kavlan-8": "10.17.1.104",
-      "kavlan-9": "10.17.65.104"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.104",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:64",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-104.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/29",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:65",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:66",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d15",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.104",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:15",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-104-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d16",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d: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.64.104",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:67",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-104-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/20"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69fb9",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-104"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
deleted file mode 100644
index 8b2b10f847d8e0008ba4d9a4860e47d25febc6dc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.105",
-      "kavlan-11": "10.7.213.105",
-      "kavlan-12": "10.11.213.105",
-      "kavlan-13": "10.15.213.105",
-      "kavlan-14": "10.19.213.105",
-      "kavlan-16": "10.27.213.105",
-      "kavlan-18": "10.35.213.105",
-      "kavlan-2": "192.168.209.105",
-      "kavlan-20": "10.43.213.105",
-      "kavlan-21": "10.47.213.105",
-      "kavlan-3": "192.168.225.105",
-      "kavlan-4": "10.16.1.105",
-      "kavlan-5": "10.16.65.105",
-      "kavlan-6": "10.16.129.105",
-      "kavlan-7": "10.16.193.105",
-      "kavlan-8": "10.17.1.105",
-      "kavlan-9": "10.17.65.105"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.105",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:bc",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-105.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/1",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:bd",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:be",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d19",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.105",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:19",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-105-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d1a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d: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.64.105",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:bf",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-105-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/25"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 1,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e70d39",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-105"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
deleted file mode 100644
index 009b716370fe34a5c8273d8ccffe47c3680ef557..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.106",
-      "kavlan-11": "10.7.213.106",
-      "kavlan-12": "10.11.213.106",
-      "kavlan-13": "10.15.213.106",
-      "kavlan-14": "10.19.213.106",
-      "kavlan-16": "10.27.213.106",
-      "kavlan-18": "10.35.213.106",
-      "kavlan-2": "192.168.209.106",
-      "kavlan-20": "10.43.213.106",
-      "kavlan-21": "10.47.213.106",
-      "kavlan-3": "192.168.225.106",
-      "kavlan-4": "10.16.1.106",
-      "kavlan-5": "10.16.65.106",
-      "kavlan-6": "10.16.129.106",
-      "kavlan-7": "10.16.193.106",
-      "kavlan-8": "10.17.1.106",
-      "kavlan-9": "10.17.65.106"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.106",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:f4",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-106.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/2",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:f5",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:f6",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5cad",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.106",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ad",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-106-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5cae",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c: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.64.106",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:f7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-106-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/26"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 2,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69f32",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-106"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
deleted file mode 100644
index 305cdbf06bd0154fad333f54fa0ed66461f8aecc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.107",
-      "kavlan-11": "10.7.213.107",
-      "kavlan-12": "10.11.213.107",
-      "kavlan-13": "10.15.213.107",
-      "kavlan-14": "10.19.213.107",
-      "kavlan-16": "10.27.213.107",
-      "kavlan-18": "10.35.213.107",
-      "kavlan-2": "192.168.209.107",
-      "kavlan-20": "10.43.213.107",
-      "kavlan-21": "10.47.213.107",
-      "kavlan-3": "192.168.225.107",
-      "kavlan-4": "10.16.1.107",
-      "kavlan-5": "10.16.65.107",
-      "kavlan-6": "10.16.129.107",
-      "kavlan-7": "10.16.193.107",
-      "kavlan-8": "10.17.1.107",
-      "kavlan-9": "10.17.65.107"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.107",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:c8",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-107.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/3",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:c9",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:ca",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d3d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.107",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:3d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-107-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d3e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:3e",
-      "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.64.107",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:cb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-107-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/27"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 3,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93b4b",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-107"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
deleted file mode 100644
index 696eac085a4b7002361669454c91eb45372dd848..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.108",
-      "kavlan-11": "10.7.213.108",
-      "kavlan-12": "10.11.213.108",
-      "kavlan-13": "10.15.213.108",
-      "kavlan-14": "10.19.213.108",
-      "kavlan-16": "10.27.213.108",
-      "kavlan-18": "10.35.213.108",
-      "kavlan-2": "192.168.209.108",
-      "kavlan-20": "10.43.213.108",
-      "kavlan-21": "10.47.213.108",
-      "kavlan-3": "192.168.225.108",
-      "kavlan-4": "10.16.1.108",
-      "kavlan-5": "10.16.65.108",
-      "kavlan-6": "10.16.129.108",
-      "kavlan-7": "10.16.193.108",
-      "kavlan-8": "10.17.1.108",
-      "kavlan-9": "10.17.65.108"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.108",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:14",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-108.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/4",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:15",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:16",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d21",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.108",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:21",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-108-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d22",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:22",
-      "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.64.108",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:17",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-108-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/28"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 4,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93b53",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-108"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
deleted file mode 100644
index 1c2f41fc734013ed21c06d67782e77513d246e74..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.109",
-      "kavlan-11": "10.7.213.109",
-      "kavlan-12": "10.11.213.109",
-      "kavlan-13": "10.15.213.109",
-      "kavlan-14": "10.19.213.109",
-      "kavlan-16": "10.27.213.109",
-      "kavlan-18": "10.35.213.109",
-      "kavlan-2": "192.168.209.109",
-      "kavlan-20": "10.43.213.109",
-      "kavlan-21": "10.47.213.109",
-      "kavlan-3": "192.168.225.109",
-      "kavlan-4": "10.16.1.109",
-      "kavlan-5": "10.16.65.109",
-      "kavlan-6": "10.16.129.109",
-      "kavlan-7": "10.16.193.109",
-      "kavlan-8": "10.17.1.109",
-      "kavlan-9": "10.17.65.109"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.109",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:30",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-109.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/5",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:31",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:32",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d25",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.109",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:25",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-109-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d26",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:26",
-      "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.64.109",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:33",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-109-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/29"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 5,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fc8e",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-109"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
deleted file mode 100644
index 187969eb12da5684a8a11e8db77453eb49385094..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.11",
-      "kavlan-11": "10.7.213.11",
-      "kavlan-12": "10.11.213.11",
-      "kavlan-13": "10.15.213.11",
-      "kavlan-14": "10.19.213.11",
-      "kavlan-16": "10.27.213.11",
-      "kavlan-18": "10.35.213.11",
-      "kavlan-2": "192.168.209.11",
-      "kavlan-20": "10.43.213.11",
-      "kavlan-21": "10.47.213.11",
-      "kavlan-3": "192.168.225.11",
-      "kavlan-4": "10.16.1.11",
-      "kavlan-5": "10.16.65.11",
-      "kavlan-6": "10.16.129.11",
-      "kavlan-7": "10.16.193.11",
-      "kavlan-8": "10.17.1.11",
-      "kavlan-9": "10.17.65.11"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.11",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:7c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-11.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/10",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:7d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:7e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9171",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.11",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:71",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-11-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9172",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:72",
-      "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.64.11",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:7f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-11-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/35"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e5f35c",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-11"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
deleted file mode 100644
index 17064e4bc859592985881c4ad6933a13821da5f6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.110",
-      "kavlan-11": "10.7.213.110",
-      "kavlan-12": "10.11.213.110",
-      "kavlan-13": "10.15.213.110",
-      "kavlan-14": "10.19.213.110",
-      "kavlan-16": "10.27.213.110",
-      "kavlan-18": "10.35.213.110",
-      "kavlan-2": "192.168.209.110",
-      "kavlan-20": "10.43.213.110",
-      "kavlan-21": "10.47.213.110",
-      "kavlan-3": "192.168.225.110",
-      "kavlan-4": "10.16.1.110",
-      "kavlan-5": "10.16.65.110",
-      "kavlan-6": "10.16.129.110",
-      "kavlan-7": "10.16.193.110",
-      "kavlan-8": "10.17.1.110",
-      "kavlan-9": "10.17.65.110"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.110",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:6c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-110.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/6",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:6d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:6e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5ca9",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.110",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:a9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-110-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5caa",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c: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.64.110",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:6f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-110-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/30"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 6,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93a8c",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-110"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
deleted file mode 100644
index 5b71e6d9144153745fcf7d832a2aec04ceb1cb8f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.111",
-      "kavlan-11": "10.7.213.111",
-      "kavlan-12": "10.11.213.111",
-      "kavlan-13": "10.15.213.111",
-      "kavlan-14": "10.19.213.111",
-      "kavlan-16": "10.27.213.111",
-      "kavlan-18": "10.35.213.111",
-      "kavlan-2": "192.168.209.111",
-      "kavlan-20": "10.43.213.111",
-      "kavlan-21": "10.47.213.111",
-      "kavlan-3": "192.168.225.111",
-      "kavlan-4": "10.16.1.111",
-      "kavlan-5": "10.16.65.111",
-      "kavlan-6": "10.16.129.111",
-      "kavlan-7": "10.16.193.111",
-      "kavlan-8": "10.17.1.111",
-      "kavlan-9": "10.17.65.111"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.111",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:58",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-111.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/7",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:59",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:5a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000c5591",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.111",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0c:55:91",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-111-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000c5592",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0c:55:92",
-      "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.64.111",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:5b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-111-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/31"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 7,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e901fe",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-111"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
deleted file mode 100644
index e10fb70575244efb8a7d4969363dac255bd246b4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.112",
-      "kavlan-11": "10.7.213.112",
-      "kavlan-12": "10.11.213.112",
-      "kavlan-13": "10.15.213.112",
-      "kavlan-14": "10.19.213.112",
-      "kavlan-16": "10.27.213.112",
-      "kavlan-18": "10.35.213.112",
-      "kavlan-2": "192.168.209.112",
-      "kavlan-20": "10.43.213.112",
-      "kavlan-21": "10.47.213.112",
-      "kavlan-3": "192.168.225.112",
-      "kavlan-4": "10.16.1.112",
-      "kavlan-5": "10.16.65.112",
-      "kavlan-6": "10.16.129.112",
-      "kavlan-7": "10.16.193.112",
-      "kavlan-8": "10.17.1.112",
-      "kavlan-9": "10.17.65.112"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.112",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:10",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-112.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/8",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:11",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:12",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b7e9d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.112",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:7e:9d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-112-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b7e9e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:7e:9e",
-      "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.64.112",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:13",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-112-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/32"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 8,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69ed3",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-112"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
deleted file mode 100644
index d5c5e15a615fd29d1c3bc98390ed1c6a35a9e8fd..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.113",
-      "kavlan-11": "10.7.213.113",
-      "kavlan-12": "10.11.213.113",
-      "kavlan-13": "10.15.213.113",
-      "kavlan-14": "10.19.213.113",
-      "kavlan-16": "10.27.213.113",
-      "kavlan-18": "10.35.213.113",
-      "kavlan-2": "192.168.209.113",
-      "kavlan-20": "10.43.213.113",
-      "kavlan-21": "10.47.213.113",
-      "kavlan-3": "192.168.225.113",
-      "kavlan-4": "10.16.1.113",
-      "kavlan-5": "10.16.65.113",
-      "kavlan-6": "10.16.129.113",
-      "kavlan-7": "10.16.193.113",
-      "kavlan-8": "10.17.1.113",
-      "kavlan-9": "10.17.65.113"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.113",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:bc",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-113.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/9",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:bd",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:be",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93b5",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.113",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-113-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93b6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.113",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:bf",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-113-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/33"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 11,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93ac0",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-113"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
deleted file mode 100644
index 6ebfc22e3a877e9d4e1711dfec5587adf8ad740b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.114",
-      "kavlan-11": "10.7.213.114",
-      "kavlan-12": "10.11.213.114",
-      "kavlan-13": "10.15.213.114",
-      "kavlan-14": "10.19.213.114",
-      "kavlan-16": "10.27.213.114",
-      "kavlan-18": "10.35.213.114",
-      "kavlan-2": "192.168.209.114",
-      "kavlan-20": "10.43.213.114",
-      "kavlan-21": "10.47.213.114",
-      "kavlan-3": "192.168.225.114",
-      "kavlan-4": "10.16.1.114",
-      "kavlan-5": "10.16.65.114",
-      "kavlan-6": "10.16.129.114",
-      "kavlan-7": "10.16.193.114",
-      "kavlan-8": "10.17.1.114",
-      "kavlan-9": "10.17.65.114"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.114",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:b0",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-114.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/10",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:b1",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:b2",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93c5",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.114",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-114-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93c6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c6",
-      "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.64.114",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:b3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-114-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/34"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 12,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69ece",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-114"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
deleted file mode 100644
index a3ef58f93c42a7efdba610ca884005759e2522b7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.115",
-      "kavlan-11": "10.7.213.115",
-      "kavlan-12": "10.11.213.115",
-      "kavlan-13": "10.15.213.115",
-      "kavlan-14": "10.19.213.115",
-      "kavlan-16": "10.27.213.115",
-      "kavlan-18": "10.35.213.115",
-      "kavlan-2": "192.168.209.115",
-      "kavlan-20": "10.43.213.115",
-      "kavlan-21": "10.47.213.115",
-      "kavlan-3": "192.168.225.115",
-      "kavlan-4": "10.16.1.115",
-      "kavlan-5": "10.16.65.115",
-      "kavlan-6": "10.16.129.115",
-      "kavlan-7": "10.16.193.115",
-      "kavlan-8": "10.17.1.115",
-      "kavlan-9": "10.17.65.115"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.115",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:04",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-115.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/11",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:05",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:06",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9305",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.115",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:05",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-115-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9306",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.115",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:07",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-115-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/35"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 13,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fcf0",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-115"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
deleted file mode 100644
index 854890d3cb3fe3fbfa06093d4a9d0979c872c5a4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.116",
-      "kavlan-11": "10.7.213.116",
-      "kavlan-12": "10.11.213.116",
-      "kavlan-13": "10.15.213.116",
-      "kavlan-14": "10.19.213.116",
-      "kavlan-16": "10.27.213.116",
-      "kavlan-18": "10.35.213.116",
-      "kavlan-2": "192.168.209.116",
-      "kavlan-20": "10.43.213.116",
-      "kavlan-21": "10.47.213.116",
-      "kavlan-3": "192.168.225.116",
-      "kavlan-4": "10.16.1.116",
-      "kavlan-5": "10.16.65.116",
-      "kavlan-6": "10.16.129.116",
-      "kavlan-7": "10.16.193.116",
-      "kavlan-8": "10.17.1.116",
-      "kavlan-9": "10.17.65.116"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.116",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:28",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-116.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/12",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:29",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:2a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b931d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.116",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-116-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b931e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1e",
-      "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.64.116",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:2b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-116-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/36"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 14,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93aa5",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-116"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
deleted file mode 100644
index 7d3c21739bb94ecc62473db624b0c64c9d3300af..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.117",
-      "kavlan-11": "10.7.213.117",
-      "kavlan-12": "10.11.213.117",
-      "kavlan-13": "10.15.213.117",
-      "kavlan-14": "10.19.213.117",
-      "kavlan-16": "10.27.213.117",
-      "kavlan-18": "10.35.213.117",
-      "kavlan-2": "192.168.209.117",
-      "kavlan-20": "10.43.213.117",
-      "kavlan-21": "10.47.213.117",
-      "kavlan-3": "192.168.225.117",
-      "kavlan-4": "10.16.1.117",
-      "kavlan-5": "10.16.65.117",
-      "kavlan-6": "10.16.129.117",
-      "kavlan-7": "10.16.193.117",
-      "kavlan-8": "10.17.1.117",
-      "kavlan-9": "10.17.65.117"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.117",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:e4",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-117.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/13",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:e5",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:e6",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9325",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.117",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:25",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-117-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9326",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:26",
-      "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.64.117",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:e7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-117-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/37"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 17,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93ac2",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-117"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
deleted file mode 100644
index d93812b7989b5553d8a98e72c8ff9450449eb988..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.118",
-      "kavlan-11": "10.7.213.118",
-      "kavlan-12": "10.11.213.118",
-      "kavlan-13": "10.15.213.118",
-      "kavlan-14": "10.19.213.118",
-      "kavlan-16": "10.27.213.118",
-      "kavlan-18": "10.35.213.118",
-      "kavlan-2": "192.168.209.118",
-      "kavlan-20": "10.43.213.118",
-      "kavlan-21": "10.47.213.118",
-      "kavlan-3": "192.168.225.118",
-      "kavlan-4": "10.16.1.118",
-      "kavlan-5": "10.16.65.118",
-      "kavlan-6": "10.16.129.118",
-      "kavlan-7": "10.16.193.118",
-      "kavlan-8": "10.17.1.118",
-      "kavlan-9": "10.17.65.118"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.118",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:b8",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-118.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/14",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:b9",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:ba",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92d9",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.118",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-118-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92da",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.118",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:bb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-118-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/38"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 18,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e98452",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-118"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
deleted file mode 100644
index 8760763be507bc56a7153292fcef1b1ecebceaa5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.119",
-      "kavlan-11": "10.7.213.119",
-      "kavlan-12": "10.11.213.119",
-      "kavlan-13": "10.15.213.119",
-      "kavlan-14": "10.19.213.119",
-      "kavlan-16": "10.27.213.119",
-      "kavlan-18": "10.35.213.119",
-      "kavlan-2": "192.168.209.119",
-      "kavlan-20": "10.43.213.119",
-      "kavlan-21": "10.47.213.119",
-      "kavlan-3": "192.168.225.119",
-      "kavlan-4": "10.16.1.119",
-      "kavlan-5": "10.16.65.119",
-      "kavlan-6": "10.16.129.119",
-      "kavlan-7": "10.16.193.119",
-      "kavlan-8": "10.17.1.119",
-      "kavlan-9": "10.17.65.119"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.119",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:f0",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-119.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/15",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:f1",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:f2",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9319",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.119",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:19",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-119-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b931a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.119",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:f3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-119-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/39"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 19,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93ac9",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-119"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
deleted file mode 100644
index 3f6c5fc5d7f30086d9b7d25e60949df37b49f30d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.12",
-      "kavlan-11": "10.7.213.12",
-      "kavlan-12": "10.11.213.12",
-      "kavlan-13": "10.15.213.12",
-      "kavlan-14": "10.19.213.12",
-      "kavlan-16": "10.27.213.12",
-      "kavlan-18": "10.35.213.12",
-      "kavlan-2": "192.168.209.12",
-      "kavlan-20": "10.43.213.12",
-      "kavlan-21": "10.47.213.12",
-      "kavlan-3": "192.168.225.12",
-      "kavlan-4": "10.16.1.12",
-      "kavlan-5": "10.16.65.12",
-      "kavlan-6": "10.16.129.12",
-      "kavlan-7": "10.16.193.12",
-      "kavlan-8": "10.17.1.12",
-      "kavlan-9": "10.17.65.12"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.12",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:8c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-12.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/9",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:8d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:8e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9381",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.12",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:81",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-12-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9382",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:82",
-      "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.64.12",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:8f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-12-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/36"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371df3bd5",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-12"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
deleted file mode 100644
index f513c8d1f421924e7608e773d1a506c4b74a89f1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.120",
-      "kavlan-11": "10.7.213.120",
-      "kavlan-12": "10.11.213.120",
-      "kavlan-13": "10.15.213.120",
-      "kavlan-14": "10.19.213.120",
-      "kavlan-16": "10.27.213.120",
-      "kavlan-18": "10.35.213.120",
-      "kavlan-2": "192.168.209.120",
-      "kavlan-20": "10.43.213.120",
-      "kavlan-21": "10.47.213.120",
-      "kavlan-3": "192.168.225.120",
-      "kavlan-4": "10.16.1.120",
-      "kavlan-5": "10.16.65.120",
-      "kavlan-6": "10.16.129.120",
-      "kavlan-7": "10.16.193.120",
-      "kavlan-8": "10.17.1.120",
-      "kavlan-9": "10.17.65.120"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.120",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:ac",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-120.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/16",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:ad",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:ae",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9329",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.120",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:29",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-120-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b932a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2a",
-      "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.64.120",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:af",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-120-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/40"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 20,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69f52",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-120"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
deleted file mode 100644
index 0267b38a3b77662c90e3f44bb297c663275058ff..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.121",
-      "kavlan-11": "10.7.213.121",
-      "kavlan-12": "10.11.213.121",
-      "kavlan-13": "10.15.213.121",
-      "kavlan-14": "10.19.213.121",
-      "kavlan-16": "10.27.213.121",
-      "kavlan-18": "10.35.213.121",
-      "kavlan-2": "192.168.209.121",
-      "kavlan-20": "10.43.213.121",
-      "kavlan-21": "10.47.213.121",
-      "kavlan-3": "192.168.225.121",
-      "kavlan-4": "10.16.1.121",
-      "kavlan-5": "10.16.65.121",
-      "kavlan-6": "10.16.129.121",
-      "kavlan-7": "10.16.193.121",
-      "kavlan-8": "10.17.1.121",
-      "kavlan-9": "10.17.65.121"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.121",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:38",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-121.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/17",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:39",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:3a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b932d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.121",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-121-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b932e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.121",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:3b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-121-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/41"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 21,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8cd7b",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-121"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
deleted file mode 100644
index 8391a7c7f7e144474c190c11fc17f7954947129f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.122",
-      "kavlan-11": "10.7.213.122",
-      "kavlan-12": "10.11.213.122",
-      "kavlan-13": "10.15.213.122",
-      "kavlan-14": "10.19.213.122",
-      "kavlan-16": "10.27.213.122",
-      "kavlan-18": "10.35.213.122",
-      "kavlan-2": "192.168.209.122",
-      "kavlan-20": "10.43.213.122",
-      "kavlan-21": "10.47.213.122",
-      "kavlan-3": "192.168.225.122",
-      "kavlan-4": "10.16.1.122",
-      "kavlan-5": "10.16.65.122",
-      "kavlan-6": "10.16.129.122",
-      "kavlan-7": "10.16.193.122",
-      "kavlan-8": "10.17.1.122",
-      "kavlan-9": "10.17.65.122"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.122",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:38",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-122.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/18",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:39",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:3a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d85",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.122",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:85",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-122-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d86",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:86",
-      "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.64.122",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:3b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-122-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/42"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 22,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60ba2",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-122"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
deleted file mode 100644
index 7ec977776ce59f5db69d6d20c7bb557bdfdb39aa..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.124",
-      "kavlan-11": "10.7.213.124",
-      "kavlan-12": "10.11.213.124",
-      "kavlan-13": "10.15.213.124",
-      "kavlan-14": "10.19.213.124",
-      "kavlan-16": "10.27.213.124",
-      "kavlan-18": "10.35.213.124",
-      "kavlan-2": "192.168.209.124",
-      "kavlan-20": "10.43.213.124",
-      "kavlan-21": "10.47.213.124",
-      "kavlan-3": "192.168.225.124",
-      "kavlan-4": "10.16.1.124",
-      "kavlan-5": "10.16.65.124",
-      "kavlan-6": "10.16.129.124",
-      "kavlan-7": "10.16.193.124",
-      "kavlan-8": "10.17.1.124",
-      "kavlan-9": "10.17.65.124"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.124",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:a4",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-124.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/20",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:a5",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:a6",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c90300027f61",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.124",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:61",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-124-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c90300027f62",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f: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.64.124",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:a7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-124-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/44"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 24,
-            "uid": "graphene-pdu7"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e669a0",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-124"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
deleted file mode 100644
index e1e6a757793ac3bae650e7cc68439ba63485adee..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.125",
-      "kavlan-11": "10.7.213.125",
-      "kavlan-12": "10.11.213.125",
-      "kavlan-13": "10.15.213.125",
-      "kavlan-14": "10.19.213.125",
-      "kavlan-16": "10.27.213.125",
-      "kavlan-18": "10.35.213.125",
-      "kavlan-2": "192.168.209.125",
-      "kavlan-20": "10.43.213.125",
-      "kavlan-21": "10.47.213.125",
-      "kavlan-3": "192.168.225.125",
-      "kavlan-4": "10.16.1.125",
-      "kavlan-5": "10.16.65.125",
-      "kavlan-6": "10.16.129.125",
-      "kavlan-7": "10.16.193.125",
-      "kavlan-8": "10.17.1.125",
-      "kavlan-9": "10.17.65.125"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.125",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:68",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-125.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/21",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:69",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:6a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9391",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.125",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:91",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-125-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9392",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:92",
-      "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.64.125",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:6b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-125-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/1"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 1,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fe1f",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-125"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json
deleted file mode 100644
index 53fc5cdc73ae60c0e43055827d7ceb0f14ca9fcb..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.126",
-      "kavlan-11": "10.7.213.126",
-      "kavlan-12": "10.11.213.126",
-      "kavlan-13": "10.15.213.126",
-      "kavlan-14": "10.19.213.126",
-      "kavlan-16": "10.27.213.126",
-      "kavlan-18": "10.35.213.126",
-      "kavlan-2": "192.168.209.126",
-      "kavlan-20": "10.43.213.126",
-      "kavlan-21": "10.47.213.126",
-      "kavlan-3": "192.168.225.126",
-      "kavlan-4": "10.16.1.126",
-      "kavlan-5": "10.16.65.126",
-      "kavlan-6": "10.16.129.126",
-      "kavlan-7": "10.16.193.126",
-      "kavlan-8": "10.17.1.126",
-      "kavlan-9": "10.17.65.126"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.126",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:d0",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-126.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/22",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:d1",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:d2",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9151",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.126",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:51",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-126-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9152",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:52",
-      "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.64.126",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:d3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-126-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/2"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 2,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6d627",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-126"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
deleted file mode 100644
index 8194670a878b3a21cb84167bccdd887d1ec0544c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.128",
-      "kavlan-11": "10.7.213.128",
-      "kavlan-12": "10.11.213.128",
-      "kavlan-13": "10.15.213.128",
-      "kavlan-14": "10.19.213.128",
-      "kavlan-16": "10.27.213.128",
-      "kavlan-18": "10.35.213.128",
-      "kavlan-2": "192.168.209.128",
-      "kavlan-20": "10.43.213.128",
-      "kavlan-21": "10.47.213.128",
-      "kavlan-3": "192.168.225.128",
-      "kavlan-4": "10.16.1.128",
-      "kavlan-5": "10.16.65.128",
-      "kavlan-6": "10.16.129.128",
-      "kavlan-7": "10.16.193.128",
-      "kavlan-8": "10.17.1.128",
-      "kavlan-9": "10.17.65.128"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.128",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:e4",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-128.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/24",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:e5",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:e6",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9215",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.128",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:15",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-128-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9216",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.128",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:e7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-128-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/4"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 4,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e901ec",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-128"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
deleted file mode 100644
index f6fd7da84e61ad1a530427c76641a0213849c5eb..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.129",
-      "kavlan-11": "10.7.213.129",
-      "kavlan-12": "10.11.213.129",
-      "kavlan-13": "10.15.213.129",
-      "kavlan-14": "10.19.213.129",
-      "kavlan-16": "10.27.213.129",
-      "kavlan-18": "10.35.213.129",
-      "kavlan-2": "192.168.209.129",
-      "kavlan-20": "10.43.213.129",
-      "kavlan-21": "10.47.213.129",
-      "kavlan-3": "192.168.225.129",
-      "kavlan-4": "10.16.1.129",
-      "kavlan-5": "10.16.65.129",
-      "kavlan-6": "10.16.129.129",
-      "kavlan-7": "10.16.193.129",
-      "kavlan-8": "10.17.1.129",
-      "kavlan-9": "10.17.65.129"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.129",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:1c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-129.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/25",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:1d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:1e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9205",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.129",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:05",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-129-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9206",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.129",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:1f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-129-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/5"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 5,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8cd7c",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-129"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
deleted file mode 100644
index b7a29e5acda5002c9b6ba097fe715309908963e5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.13",
-      "kavlan-11": "10.7.213.13",
-      "kavlan-12": "10.11.213.13",
-      "kavlan-13": "10.15.213.13",
-      "kavlan-14": "10.19.213.13",
-      "kavlan-16": "10.27.213.13",
-      "kavlan-18": "10.35.213.13",
-      "kavlan-2": "192.168.209.13",
-      "kavlan-20": "10.43.213.13",
-      "kavlan-21": "10.47.213.13",
-      "kavlan-3": "192.168.225.13",
-      "kavlan-4": "10.16.1.13",
-      "kavlan-5": "10.16.65.13",
-      "kavlan-6": "10.16.129.13",
-      "kavlan-7": "10.16.193.13",
-      "kavlan-8": "10.17.1.13",
-      "kavlan-9": "10.17.65.13"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.13",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:fc",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-13.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/14",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:fd",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:fe",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9385",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.13",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:85",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-13-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9386",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:86",
-      "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.64.13",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:ff",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-13-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/37"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e2ae6c",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-13"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
deleted file mode 100644
index 4906abe5c916ca68a06f926f3236d720adef2eee..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.130",
-      "kavlan-11": "10.7.213.130",
-      "kavlan-12": "10.11.213.130",
-      "kavlan-13": "10.15.213.130",
-      "kavlan-14": "10.19.213.130",
-      "kavlan-16": "10.27.213.130",
-      "kavlan-18": "10.35.213.130",
-      "kavlan-2": "192.168.209.130",
-      "kavlan-20": "10.43.213.130",
-      "kavlan-21": "10.47.213.130",
-      "kavlan-3": "192.168.225.130",
-      "kavlan-4": "10.16.1.130",
-      "kavlan-5": "10.16.65.130",
-      "kavlan-6": "10.16.129.130",
-      "kavlan-7": "10.16.193.130",
-      "kavlan-8": "10.17.1.130",
-      "kavlan-9": "10.17.65.130"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.130",
-      "kavlan": true,
-      "mac": "00:e0:81:d2:5a:34",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-130.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/26",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d2:5a:35",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d2:5a:36",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9209",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.130",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:09",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-130-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b920a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0a",
-      "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.64.130",
-      "kavlan": false,
-      "mac": "00:e0:81:d2:5a:37",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-130-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/6"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 6,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e901df",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-130"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
deleted file mode 100644
index bbb36f0e58d6ccfd1430b000b2d71519c1f005b3..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.131",
-      "kavlan-11": "10.7.213.131",
-      "kavlan-12": "10.11.213.131",
-      "kavlan-13": "10.15.213.131",
-      "kavlan-14": "10.19.213.131",
-      "kavlan-16": "10.27.213.131",
-      "kavlan-18": "10.35.213.131",
-      "kavlan-2": "192.168.209.131",
-      "kavlan-20": "10.43.213.131",
-      "kavlan-21": "10.47.213.131",
-      "kavlan-3": "192.168.225.131",
-      "kavlan-4": "10.16.1.131",
-      "kavlan-5": "10.16.65.131",
-      "kavlan-6": "10.16.129.131",
-      "kavlan-7": "10.16.193.131",
-      "kavlan-8": "10.17.1.131",
-      "kavlan-9": "10.17.65.131"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.131",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:f8",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-131.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/27",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:f9",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:fa",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b914d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.131",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-131-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b914e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4e",
-      "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.64.131",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:fb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-131-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/7"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 7,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e722b5",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-131"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
deleted file mode 100644
index e55a17c90807a00f002cca0f99579a127946e8a0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.132",
-      "kavlan-11": "10.7.213.132",
-      "kavlan-12": "10.11.213.132",
-      "kavlan-13": "10.15.213.132",
-      "kavlan-14": "10.19.213.132",
-      "kavlan-16": "10.27.213.132",
-      "kavlan-18": "10.35.213.132",
-      "kavlan-2": "192.168.209.132",
-      "kavlan-20": "10.43.213.132",
-      "kavlan-21": "10.47.213.132",
-      "kavlan-3": "192.168.225.132",
-      "kavlan-4": "10.16.1.132",
-      "kavlan-5": "10.16.65.132",
-      "kavlan-6": "10.16.129.132",
-      "kavlan-7": "10.16.193.132",
-      "kavlan-8": "10.17.1.132",
-      "kavlan-9": "10.17.65.132"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.132",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:8c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-132.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/28",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:8d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:8e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b920d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.132",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-132-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b920e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.132",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:8f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-132-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/8"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 8,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6a3a3",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-132"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
deleted file mode 100644
index 13f042d32ae94c1d8f2cb7910b3e409eca844694..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.133",
-      "kavlan-11": "10.7.213.133",
-      "kavlan-12": "10.11.213.133",
-      "kavlan-13": "10.15.213.133",
-      "kavlan-14": "10.19.213.133",
-      "kavlan-16": "10.27.213.133",
-      "kavlan-18": "10.35.213.133",
-      "kavlan-2": "192.168.209.133",
-      "kavlan-20": "10.43.213.133",
-      "kavlan-21": "10.47.213.133",
-      "kavlan-3": "192.168.225.133",
-      "kavlan-4": "10.16.1.133",
-      "kavlan-5": "10.16.65.133",
-      "kavlan-6": "10.16.129.133",
-      "kavlan-7": "10.16.193.133",
-      "kavlan-8": "10.17.1.133",
-      "kavlan-9": "10.17.65.133"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.133",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:e0",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-133.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/29",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:e1",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:e2",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f7b3",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.133",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:b3",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-133-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f7b4",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:b4",
-      "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.64.133",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:e3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-133-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/9"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 11,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60bd7",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-133"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
deleted file mode 100644
index 10d4fb8343c4ac8da12513074a6782cf7d803726..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.134",
-      "kavlan-11": "10.7.213.134",
-      "kavlan-12": "10.11.213.134",
-      "kavlan-13": "10.15.213.134",
-      "kavlan-14": "10.19.213.134",
-      "kavlan-16": "10.27.213.134",
-      "kavlan-18": "10.35.213.134",
-      "kavlan-2": "192.168.209.134",
-      "kavlan-20": "10.43.213.134",
-      "kavlan-21": "10.47.213.134",
-      "kavlan-3": "192.168.225.134",
-      "kavlan-4": "10.16.1.134",
-      "kavlan-5": "10.16.65.134",
-      "kavlan-6": "10.16.129.134",
-      "kavlan-7": "10.16.193.134",
-      "kavlan-8": "10.17.1.134",
-      "kavlan-9": "10.17.65.134"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.134",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:e8",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-134.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/30",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:e9",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:ea",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f44f",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.134",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:4f",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-134-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f450",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:50",
-      "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.64.134",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:eb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-134-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/10"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 12,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ffe9",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-134"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
deleted file mode 100644
index 375f5ce17d9ab8793fd59f6ace113711dd0e01ed..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.135",
-      "kavlan-11": "10.7.213.135",
-      "kavlan-12": "10.11.213.135",
-      "kavlan-13": "10.15.213.135",
-      "kavlan-14": "10.19.213.135",
-      "kavlan-16": "10.27.213.135",
-      "kavlan-18": "10.35.213.135",
-      "kavlan-2": "192.168.209.135",
-      "kavlan-20": "10.43.213.135",
-      "kavlan-21": "10.47.213.135",
-      "kavlan-3": "192.168.225.135",
-      "kavlan-4": "10.16.1.135",
-      "kavlan-5": "10.16.65.135",
-      "kavlan-6": "10.16.129.135",
-      "kavlan-7": "10.16.193.135",
-      "kavlan-8": "10.17.1.135",
-      "kavlan-9": "10.17.65.135"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.135",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:70",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-135.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/31",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:71",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:72",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f4c7",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.135",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c7",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-135-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f4c8",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c8",
-      "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.64.135",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:73",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-135-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/11"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 13,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e98413",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-135"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
deleted file mode 100644
index 7117303b8516188434284c94c90637f1f79769ad..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.136",
-      "kavlan-11": "10.7.213.136",
-      "kavlan-12": "10.11.213.136",
-      "kavlan-13": "10.15.213.136",
-      "kavlan-14": "10.19.213.136",
-      "kavlan-16": "10.27.213.136",
-      "kavlan-18": "10.35.213.136",
-      "kavlan-2": "192.168.209.136",
-      "kavlan-20": "10.43.213.136",
-      "kavlan-21": "10.47.213.136",
-      "kavlan-3": "192.168.225.136",
-      "kavlan-4": "10.16.1.136",
-      "kavlan-5": "10.16.65.136",
-      "kavlan-6": "10.16.129.136",
-      "kavlan-7": "10.16.193.136",
-      "kavlan-8": "10.17.1.136",
-      "kavlan-9": "10.17.65.136"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.136",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:7c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-136.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/32",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:7d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:7e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f847",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.136",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:47",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-136-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f848",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:48",
-      "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.64.136",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:7f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-136-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/12"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 14,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e90000",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-136"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
deleted file mode 100644
index 6e47fde8ac15b44663f8a24ce7bbc54db29ba9d5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.137",
-      "kavlan-11": "10.7.213.137",
-      "kavlan-12": "10.11.213.137",
-      "kavlan-13": "10.15.213.137",
-      "kavlan-14": "10.19.213.137",
-      "kavlan-16": "10.27.213.137",
-      "kavlan-18": "10.35.213.137",
-      "kavlan-2": "192.168.209.137",
-      "kavlan-20": "10.43.213.137",
-      "kavlan-21": "10.47.213.137",
-      "kavlan-3": "192.168.225.137",
-      "kavlan-4": "10.16.1.137",
-      "kavlan-5": "10.16.65.137",
-      "kavlan-6": "10.16.129.137",
-      "kavlan-7": "10.16.193.137",
-      "kavlan-8": "10.17.1.137",
-      "kavlan-9": "10.17.65.137"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.137",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:44",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-137.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/33",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:45",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:46",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f647",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.137",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f6:47",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-137-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f648",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f6:48",
-      "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.64.137",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:47",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-137-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/13"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 17,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e95045",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-137"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
deleted file mode 100644
index 09127936862cb825d351b27ad0d396de1f1b07ce..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.138",
-      "kavlan-11": "10.7.213.138",
-      "kavlan-12": "10.11.213.138",
-      "kavlan-13": "10.15.213.138",
-      "kavlan-14": "10.19.213.138",
-      "kavlan-16": "10.27.213.138",
-      "kavlan-18": "10.35.213.138",
-      "kavlan-2": "192.168.209.138",
-      "kavlan-20": "10.43.213.138",
-      "kavlan-21": "10.47.213.138",
-      "kavlan-3": "192.168.225.138",
-      "kavlan-4": "10.16.1.138",
-      "kavlan-5": "10.16.65.138",
-      "kavlan-6": "10.16.129.138",
-      "kavlan-7": "10.16.193.138",
-      "kavlan-8": "10.17.1.138",
-      "kavlan-9": "10.17.65.138"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.138",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:c4",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-138.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/34",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:c5",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:c6",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f4c3",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.138",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c3",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-138-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f4c4",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c4",
-      "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.64.138",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:c7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-138-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/14"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 18,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fdf6",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-138"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
deleted file mode 100644
index 21d344e7def3ff075b9064f7addb79c1ab4853d9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.139",
-      "kavlan-11": "10.7.213.139",
-      "kavlan-12": "10.11.213.139",
-      "kavlan-13": "10.15.213.139",
-      "kavlan-14": "10.19.213.139",
-      "kavlan-16": "10.27.213.139",
-      "kavlan-18": "10.35.213.139",
-      "kavlan-2": "192.168.209.139",
-      "kavlan-20": "10.43.213.139",
-      "kavlan-21": "10.47.213.139",
-      "kavlan-3": "192.168.225.139",
-      "kavlan-4": "10.16.1.139",
-      "kavlan-5": "10.16.65.139",
-      "kavlan-6": "10.16.129.139",
-      "kavlan-7": "10.16.193.139",
-      "kavlan-8": "10.17.1.139",
-      "kavlan-9": "10.17.65.139"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.139",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:80",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-139.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/35",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:81",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:82",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f7ff",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.139",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:ff",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-139-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f800",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:00",
-      "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.64.139",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:83",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-139-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/15"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 19,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fe04",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-139"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
deleted file mode 100644
index ade9672ed64ddac6904192fc38e1a70704831ab3..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.14",
-      "kavlan-11": "10.7.213.14",
-      "kavlan-12": "10.11.213.14",
-      "kavlan-13": "10.15.213.14",
-      "kavlan-14": "10.19.213.14",
-      "kavlan-16": "10.27.213.14",
-      "kavlan-18": "10.35.213.14",
-      "kavlan-2": "192.168.209.14",
-      "kavlan-20": "10.43.213.14",
-      "kavlan-21": "10.47.213.14",
-      "kavlan-3": "192.168.225.14",
-      "kavlan-4": "10.16.1.14",
-      "kavlan-5": "10.16.65.14",
-      "kavlan-6": "10.16.129.14",
-      "kavlan-7": "10.16.193.14",
-      "kavlan-8": "10.17.1.14",
-      "kavlan-9": "10.17.65.14"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.14",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:d4",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-14.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/13",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:d5",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:d6",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93e1",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.14",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e1",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-14-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93e2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.14",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:d7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-14-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/38"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371dfa661",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-14"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
deleted file mode 100644
index 5560874ad3a6fa59f44ac65474de47acd30e7080..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.140",
-      "kavlan-11": "10.7.213.140",
-      "kavlan-12": "10.11.213.140",
-      "kavlan-13": "10.15.213.140",
-      "kavlan-14": "10.19.213.140",
-      "kavlan-16": "10.27.213.140",
-      "kavlan-18": "10.35.213.140",
-      "kavlan-2": "192.168.209.140",
-      "kavlan-20": "10.43.213.140",
-      "kavlan-21": "10.47.213.140",
-      "kavlan-3": "192.168.225.140",
-      "kavlan-4": "10.16.1.140",
-      "kavlan-5": "10.16.65.140",
-      "kavlan-6": "10.16.129.140",
-      "kavlan-7": "10.16.193.140",
-      "kavlan-8": "10.17.1.140",
-      "kavlan-9": "10.17.65.140"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.140",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:78",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-140.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/36",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:79",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:7a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f79f",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.140",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:9f",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-140-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f7a0",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a0",
-      "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.64.140",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:7b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-140-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/16"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 20,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8cdbb",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-140"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json
deleted file mode 100644
index 4b66e8c33d93ffd2a6e9bf3c1251d1b5eed5c575..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.141",
-      "kavlan-11": "10.7.213.141",
-      "kavlan-12": "10.11.213.141",
-      "kavlan-13": "10.15.213.141",
-      "kavlan-14": "10.19.213.141",
-      "kavlan-16": "10.27.213.141",
-      "kavlan-18": "10.35.213.141",
-      "kavlan-2": "192.168.209.141",
-      "kavlan-20": "10.43.213.141",
-      "kavlan-21": "10.47.213.141",
-      "kavlan-3": "192.168.225.141",
-      "kavlan-4": "10.16.1.141",
-      "kavlan-5": "10.16.65.141",
-      "kavlan-6": "10.16.129.141",
-      "kavlan-7": "10.16.193.141",
-      "kavlan-8": "10.17.1.141",
-      "kavlan-9": "10.17.65.141"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.141",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:74",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-141.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/37",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:75",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:76",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f793",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.141",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:93",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-141-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f794",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:94",
-      "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.64.141",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:77",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-141-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/17"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 21,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e66c69",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-141"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
deleted file mode 100644
index d57d4e7e2e3b8fe7911760628bd06fd55e4a90b5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.142",
-      "kavlan-11": "10.7.213.142",
-      "kavlan-12": "10.11.213.142",
-      "kavlan-13": "10.15.213.142",
-      "kavlan-14": "10.19.213.142",
-      "kavlan-16": "10.27.213.142",
-      "kavlan-18": "10.35.213.142",
-      "kavlan-2": "192.168.209.142",
-      "kavlan-20": "10.43.213.142",
-      "kavlan-21": "10.47.213.142",
-      "kavlan-3": "192.168.225.142",
-      "kavlan-4": "10.16.1.142",
-      "kavlan-5": "10.16.65.142",
-      "kavlan-6": "10.16.129.142",
-      "kavlan-7": "10.16.193.142",
-      "kavlan-8": "10.17.1.142",
-      "kavlan-9": "10.17.65.142"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.142",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:8c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-142.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/38",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:8d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:8e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f7a7",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.142",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a7",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-142-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f7a8",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a8",
-      "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.64.142",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:8f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-142-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/18"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 22,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60c3a",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-142"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
deleted file mode 100644
index d9d11c6eb897e4225ebcb248b0c0539da23e205d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.143",
-      "kavlan-11": "10.7.213.143",
-      "kavlan-12": "10.11.213.143",
-      "kavlan-13": "10.15.213.143",
-      "kavlan-14": "10.19.213.143",
-      "kavlan-16": "10.27.213.143",
-      "kavlan-18": "10.35.213.143",
-      "kavlan-2": "192.168.209.143",
-      "kavlan-20": "10.43.213.143",
-      "kavlan-21": "10.47.213.143",
-      "kavlan-3": "192.168.225.143",
-      "kavlan-4": "10.16.1.143",
-      "kavlan-5": "10.16.65.143",
-      "kavlan-6": "10.16.129.143",
-      "kavlan-7": "10.16.193.143",
-      "kavlan-8": "10.17.1.143",
-      "kavlan-9": "10.17.65.143"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "true"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.143",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:94",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-143.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene4",
-      "switch_port": "GigabitEthernet1/0/39",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:95",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:96",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f497",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.143",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:97",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-143-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030005f498",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:98",
-      "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.64.143",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:97",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-143-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene4-ipmi",
-      "switch_port": "1/0/19"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "port": 23,
-            "uid": "graphene-pdu8"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fcbd",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-143"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
deleted file mode 100644
index 62ae31544d75ec649407503a3834edb222b40858..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.15",
-      "kavlan-11": "10.7.213.15",
-      "kavlan-12": "10.11.213.15",
-      "kavlan-13": "10.15.213.15",
-      "kavlan-14": "10.19.213.15",
-      "kavlan-16": "10.27.213.15",
-      "kavlan-18": "10.35.213.15",
-      "kavlan-2": "192.168.209.15",
-      "kavlan-20": "10.43.213.15",
-      "kavlan-21": "10.47.213.15",
-      "kavlan-3": "192.168.225.15",
-      "kavlan-4": "10.16.1.15",
-      "kavlan-5": "10.16.65.15",
-      "kavlan-6": "10.16.129.15",
-      "kavlan-7": "10.16.193.15",
-      "kavlan-8": "10.17.1.15",
-      "kavlan-9": "10.17.65.15"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.15",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:e8",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-15.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/16",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:e9",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:ea",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93c9",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.15",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-15-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93ca",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.15",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:eb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-15-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/39"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e68f5e",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-15"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
deleted file mode 100644
index eea22745b1ada5a2893f3e65d233d5ad6773e624..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.16",
-      "kavlan-11": "10.7.213.16",
-      "kavlan-12": "10.11.213.16",
-      "kavlan-13": "10.15.213.16",
-      "kavlan-14": "10.19.213.16",
-      "kavlan-16": "10.27.213.16",
-      "kavlan-18": "10.35.213.16",
-      "kavlan-2": "192.168.209.16",
-      "kavlan-20": "10.43.213.16",
-      "kavlan-21": "10.47.213.16",
-      "kavlan-3": "192.168.225.16",
-      "kavlan-4": "10.16.1.16",
-      "kavlan-5": "10.16.65.16",
-      "kavlan-6": "10.16.129.16",
-      "kavlan-7": "10.16.193.16",
-      "kavlan-8": "10.17.1.16",
-      "kavlan-9": "10.17.65.16"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.16",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:c0",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-16.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/15",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:c1",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:c2",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9375",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.16",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:75",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-16-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9376",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:76",
-      "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.64.16",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:c3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-16-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/40"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e75540",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-16"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
deleted file mode 100644
index f091c742ed55561ee940297bf16bdcfc1500ac5b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.17",
-      "kavlan-11": "10.7.213.17",
-      "kavlan-12": "10.11.213.17",
-      "kavlan-13": "10.15.213.17",
-      "kavlan-14": "10.19.213.17",
-      "kavlan-16": "10.27.213.17",
-      "kavlan-18": "10.35.213.17",
-      "kavlan-2": "192.168.209.17",
-      "kavlan-20": "10.43.213.17",
-      "kavlan-21": "10.47.213.17",
-      "kavlan-3": "192.168.225.17",
-      "kavlan-4": "10.16.1.17",
-      "kavlan-5": "10.16.65.17",
-      "kavlan-6": "10.16.129.17",
-      "kavlan-7": "10.16.193.17",
-      "kavlan-8": "10.17.1.17",
-      "kavlan-9": "10.17.65.17"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.17",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:a8",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-17.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/18",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:a9",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:aa",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9371",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.17",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:71",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-17-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9372",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:72",
-      "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.64.17",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:ab",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-17-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/41"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371df3aa3",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-17"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
deleted file mode 100644
index 30f6b3ace4fc1960e432889abe838513e046ee3e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.18",
-      "kavlan-11": "10.7.213.18",
-      "kavlan-12": "10.11.213.18",
-      "kavlan-13": "10.15.213.18",
-      "kavlan-14": "10.19.213.18",
-      "kavlan-16": "10.27.213.18",
-      "kavlan-18": "10.35.213.18",
-      "kavlan-2": "192.168.209.18",
-      "kavlan-20": "10.43.213.18",
-      "kavlan-21": "10.47.213.18",
-      "kavlan-3": "192.168.225.18",
-      "kavlan-4": "10.16.1.18",
-      "kavlan-5": "10.16.65.18",
-      "kavlan-6": "10.16.129.18",
-      "kavlan-7": "10.16.193.18",
-      "kavlan-8": "10.17.1.18",
-      "kavlan-9": "10.17.65.18"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.18",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:3c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-18.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/17",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:3d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:3e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b937d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.18",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-18-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b937e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7e",
-      "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.64.18",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:3f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-18-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/42"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e70ca5",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-18"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
deleted file mode 100644
index 6352d54953277bf2b38670dbe786638dc0275f43..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.19",
-      "kavlan-11": "10.7.213.19",
-      "kavlan-12": "10.11.213.19",
-      "kavlan-13": "10.15.213.19",
-      "kavlan-14": "10.19.213.19",
-      "kavlan-16": "10.27.213.19",
-      "kavlan-18": "10.35.213.19",
-      "kavlan-2": "192.168.209.19",
-      "kavlan-20": "10.43.213.19",
-      "kavlan-21": "10.47.213.19",
-      "kavlan-3": "192.168.225.19",
-      "kavlan-4": "10.16.1.19",
-      "kavlan-5": "10.16.65.19",
-      "kavlan-6": "10.16.129.19",
-      "kavlan-7": "10.16.193.19",
-      "kavlan-8": "10.17.1.19",
-      "kavlan-9": "10.17.65.19"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.19",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:b4",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-19.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/20",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:b5",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:b6",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9155",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.19",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:55",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-19-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9156",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:56",
-      "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.64.19",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:b7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-19-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/43"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371dfa662",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-19"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
deleted file mode 100644
index 61c884e1b52eeb75dd3a41450d5e0a400871ad9f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.2",
-      "kavlan-11": "10.7.213.2",
-      "kavlan-12": "10.11.213.2",
-      "kavlan-13": "10.15.213.2",
-      "kavlan-14": "10.19.213.2",
-      "kavlan-16": "10.27.213.2",
-      "kavlan-18": "10.35.213.2",
-      "kavlan-2": "192.168.209.2",
-      "kavlan-20": "10.43.213.2",
-      "kavlan-21": "10.47.213.2",
-      "kavlan-3": "192.168.225.2",
-      "kavlan-4": "10.16.1.2",
-      "kavlan-5": "10.16.65.2",
-      "kavlan-6": "10.16.129.2",
-      "kavlan-7": "10.16.193.2",
-      "kavlan-8": "10.17.1.2",
-      "kavlan-9": "10.17.65.2"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.2",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:70",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-2.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/1",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:71",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:72",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b915d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.2",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-2-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b915e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91: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.64.2",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:73",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-2-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/26"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6fd31",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
deleted file mode 100644
index d965ab1b62cdfbdcf2dfa4cb8deb8118b5b7cdc6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.20",
-      "kavlan-11": "10.7.213.20",
-      "kavlan-12": "10.11.213.20",
-      "kavlan-13": "10.15.213.20",
-      "kavlan-14": "10.19.213.20",
-      "kavlan-16": "10.27.213.20",
-      "kavlan-18": "10.35.213.20",
-      "kavlan-2": "192.168.209.20",
-      "kavlan-20": "10.43.213.20",
-      "kavlan-21": "10.47.213.20",
-      "kavlan-3": "192.168.225.20",
-      "kavlan-4": "10.16.1.20",
-      "kavlan-5": "10.16.65.20",
-      "kavlan-6": "10.16.129.20",
-      "kavlan-7": "10.16.193.20",
-      "kavlan-8": "10.17.1.20",
-      "kavlan-9": "10.17.65.20"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.20",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:68",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-20.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/19",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:69",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:6a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9145",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.20",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:45",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-20-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9146",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:46",
-      "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.64.20",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:6b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-20-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/44"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e73c2d",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-20"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
deleted file mode 100644
index dba77e01e7afe128e24e932410a632f4a8a7204d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.21",
-      "kavlan-11": "10.7.213.21",
-      "kavlan-12": "10.11.213.21",
-      "kavlan-13": "10.15.213.21",
-      "kavlan-14": "10.19.213.21",
-      "kavlan-16": "10.27.213.21",
-      "kavlan-18": "10.35.213.21",
-      "kavlan-2": "192.168.209.21",
-      "kavlan-20": "10.43.213.21",
-      "kavlan-21": "10.47.213.21",
-      "kavlan-3": "192.168.225.21",
-      "kavlan-4": "10.16.1.21",
-      "kavlan-5": "10.16.65.21",
-      "kavlan-6": "10.16.129.21",
-      "kavlan-7": "10.16.193.21",
-      "kavlan-8": "10.17.1.21",
-      "kavlan-9": "10.17.65.21"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.21",
-      "kavlan": true,
-      "mac": "00:e0:81:d2:59:f8",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-21.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/22",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d2:59:f9",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d2:59:fa",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030004536d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.21",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-21-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030004536e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6e",
-      "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.64.21",
-      "kavlan": false,
-      "mac": "00:e0:81:d2:59:fb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-21-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/1"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fe4f",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-21"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
deleted file mode 100644
index b8041cdff3a5b6b28dc7df11a145bf3e51c35bc3..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.22",
-      "kavlan-11": "10.7.213.22",
-      "kavlan-12": "10.11.213.22",
-      "kavlan-13": "10.15.213.22",
-      "kavlan-14": "10.19.213.22",
-      "kavlan-16": "10.27.213.22",
-      "kavlan-18": "10.35.213.22",
-      "kavlan-2": "192.168.209.22",
-      "kavlan-20": "10.43.213.22",
-      "kavlan-21": "10.47.213.22",
-      "kavlan-3": "192.168.225.22",
-      "kavlan-4": "10.16.1.22",
-      "kavlan-5": "10.16.65.22",
-      "kavlan-6": "10.16.129.22",
-      "kavlan-7": "10.16.193.22",
-      "kavlan-8": "10.17.1.22",
-      "kavlan-9": "10.17.65.22"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.22",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:d8",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-22.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/21",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:d9",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:da",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9379",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.22",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:79",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-22-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b937a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7a",
-      "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.64.22",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:db",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-22-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/2"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69ef4",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-22"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
deleted file mode 100644
index 5e50b6024d57acbdca88eb536ee78b32d6256a00..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.23",
-      "kavlan-11": "10.7.213.23",
-      "kavlan-12": "10.11.213.23",
-      "kavlan-13": "10.15.213.23",
-      "kavlan-14": "10.19.213.23",
-      "kavlan-16": "10.27.213.23",
-      "kavlan-18": "10.35.213.23",
-      "kavlan-2": "192.168.209.23",
-      "kavlan-20": "10.43.213.23",
-      "kavlan-21": "10.47.213.23",
-      "kavlan-3": "192.168.225.23",
-      "kavlan-4": "10.16.1.23",
-      "kavlan-5": "10.16.65.23",
-      "kavlan-6": "10.16.129.23",
-      "kavlan-7": "10.16.193.23",
-      "kavlan-8": "10.17.1.23",
-      "kavlan-9": "10.17.65.23"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.23",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:c4",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-23.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/24",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:c5",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:c6",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9365",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.23",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:65",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-23-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9366",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.23",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:c7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-23-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/3"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e901f8",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-23"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
deleted file mode 100644
index 79e3595f4e7845fdcb1ea6a53c51ae273dcde9a1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.24",
-      "kavlan-11": "10.7.213.24",
-      "kavlan-12": "10.11.213.24",
-      "kavlan-13": "10.15.213.24",
-      "kavlan-14": "10.19.213.24",
-      "kavlan-16": "10.27.213.24",
-      "kavlan-18": "10.35.213.24",
-      "kavlan-2": "192.168.209.24",
-      "kavlan-20": "10.43.213.24",
-      "kavlan-21": "10.47.213.24",
-      "kavlan-3": "192.168.225.24",
-      "kavlan-4": "10.16.1.24",
-      "kavlan-5": "10.16.65.24",
-      "kavlan-6": "10.16.129.24",
-      "kavlan-7": "10.16.193.24",
-      "kavlan-8": "10.17.1.24",
-      "kavlan-9": "10.17.65.24"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.24",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:10",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-24.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/23",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:11",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:12",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92cd",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.24",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:cd",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-24-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92ce",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.24",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:13",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-24-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/4"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6a448",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-24"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
deleted file mode 100644
index 9a3258e2caa4ec875f1ced8c1624bb719ced8f77..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.25",
-      "kavlan-11": "10.7.213.25",
-      "kavlan-12": "10.11.213.25",
-      "kavlan-13": "10.15.213.25",
-      "kavlan-14": "10.19.213.25",
-      "kavlan-16": "10.27.213.25",
-      "kavlan-18": "10.35.213.25",
-      "kavlan-2": "192.168.209.25",
-      "kavlan-20": "10.43.213.25",
-      "kavlan-21": "10.47.213.25",
-      "kavlan-3": "192.168.225.25",
-      "kavlan-4": "10.16.1.25",
-      "kavlan-5": "10.16.65.25",
-      "kavlan-6": "10.16.129.25",
-      "kavlan-7": "10.16.193.25",
-      "kavlan-8": "10.17.1.25",
-      "kavlan-9": "10.17.65.25"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.25",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:50",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-25.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/26",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:51",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:52",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92a5",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.25",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-25-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92a6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.25",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:53",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-25-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/5"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69f03",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-25"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json
deleted file mode 100644
index 71753052693800b8e6b7cce49b56cf05900958f5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.26",
-      "kavlan-11": "10.7.213.26",
-      "kavlan-12": "10.11.213.26",
-      "kavlan-13": "10.15.213.26",
-      "kavlan-14": "10.19.213.26",
-      "kavlan-16": "10.27.213.26",
-      "kavlan-18": "10.35.213.26",
-      "kavlan-2": "192.168.209.26",
-      "kavlan-20": "10.43.213.26",
-      "kavlan-21": "10.47.213.26",
-      "kavlan-3": "192.168.225.26",
-      "kavlan-4": "10.16.1.26",
-      "kavlan-5": "10.16.65.26",
-      "kavlan-6": "10.16.129.26",
-      "kavlan-7": "10.16.193.26",
-      "kavlan-8": "10.17.1.26",
-      "kavlan-9": "10.17.65.26"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.26",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:6c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-26.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/25",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:6d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:6e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b929d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.26",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-26-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b929e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9e",
-      "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.64.26",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:6f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-26-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/6"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69f33",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-26"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
deleted file mode 100644
index 77c806cc8fd1321a4be6991cff27a6e8a17134fa..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.27",
-      "kavlan-11": "10.7.213.27",
-      "kavlan-12": "10.11.213.27",
-      "kavlan-13": "10.15.213.27",
-      "kavlan-14": "10.19.213.27",
-      "kavlan-16": "10.27.213.27",
-      "kavlan-18": "10.35.213.27",
-      "kavlan-2": "192.168.209.27",
-      "kavlan-20": "10.43.213.27",
-      "kavlan-21": "10.47.213.27",
-      "kavlan-3": "192.168.225.27",
-      "kavlan-4": "10.16.1.27",
-      "kavlan-5": "10.16.65.27",
-      "kavlan-6": "10.16.129.27",
-      "kavlan-7": "10.16.193.27",
-      "kavlan-8": "10.17.1.27",
-      "kavlan-9": "10.17.65.27"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.27",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:5c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-27.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/28",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:5d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:5e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9289",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.27",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:89",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-27-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b928a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8a",
-      "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.64.27",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:5f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-27-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/7"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce39",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-27"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
deleted file mode 100644
index 92b96e98b80300997ff82274266525423be6bb67..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.29",
-      "kavlan-11": "10.7.213.29",
-      "kavlan-12": "10.11.213.29",
-      "kavlan-13": "10.15.213.29",
-      "kavlan-14": "10.19.213.29",
-      "kavlan-16": "10.27.213.29",
-      "kavlan-18": "10.35.213.29",
-      "kavlan-2": "192.168.209.29",
-      "kavlan-20": "10.43.213.29",
-      "kavlan-21": "10.47.213.29",
-      "kavlan-3": "192.168.225.29",
-      "kavlan-4": "10.16.1.29",
-      "kavlan-5": "10.16.65.29",
-      "kavlan-6": "10.16.129.29",
-      "kavlan-7": "10.16.193.29",
-      "kavlan-8": "10.17.1.29",
-      "kavlan-9": "10.17.65.29"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.29",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:54",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-29.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/30",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:55",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:56",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b90dd",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.29",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:dd",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-29-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b90de",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:de",
-      "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.64.29",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:57",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-29-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/9"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce23",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-29"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
deleted file mode 100644
index 09268c7dba553985720b3308be6eac2b06ac6e0a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.30",
-      "kavlan-11": "10.7.213.30",
-      "kavlan-12": "10.11.213.30",
-      "kavlan-13": "10.15.213.30",
-      "kavlan-14": "10.19.213.30",
-      "kavlan-16": "10.27.213.30",
-      "kavlan-18": "10.35.213.30",
-      "kavlan-2": "192.168.209.30",
-      "kavlan-20": "10.43.213.30",
-      "kavlan-21": "10.47.213.30",
-      "kavlan-3": "192.168.225.30",
-      "kavlan-4": "10.16.1.30",
-      "kavlan-5": "10.16.65.30",
-      "kavlan-6": "10.16.129.30",
-      "kavlan-7": "10.16.193.30",
-      "kavlan-8": "10.17.1.30",
-      "kavlan-9": "10.17.65.30"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.30",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:ec",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-30.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/29",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:ed",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:ee",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9279",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.30",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:79",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-30-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b927a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7a",
-      "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.64.30",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:ef",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-30-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/10"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce27",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-30"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
deleted file mode 100644
index 35c729342b2dda489aa2d47b30645c0c30dc9220..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.31",
-      "kavlan-11": "10.7.213.31",
-      "kavlan-12": "10.11.213.31",
-      "kavlan-13": "10.15.213.31",
-      "kavlan-14": "10.19.213.31",
-      "kavlan-16": "10.27.213.31",
-      "kavlan-18": "10.35.213.31",
-      "kavlan-2": "192.168.209.31",
-      "kavlan-20": "10.43.213.31",
-      "kavlan-21": "10.47.213.31",
-      "kavlan-3": "192.168.225.31",
-      "kavlan-4": "10.16.1.31",
-      "kavlan-5": "10.16.65.31",
-      "kavlan-6": "10.16.129.31",
-      "kavlan-7": "10.16.193.31",
-      "kavlan-8": "10.17.1.31",
-      "kavlan-9": "10.17.65.31"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.31",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:60",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-31.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/32",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:61",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:62",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b921d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.31",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-31-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b921e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1e",
-      "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.64.31",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:63",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-31-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/11"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69ee5",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-31"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
deleted file mode 100644
index c2129566055f74a67736e60e56a0c67a48bbe623..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.32",
-      "kavlan-11": "10.7.213.32",
-      "kavlan-12": "10.11.213.32",
-      "kavlan-13": "10.15.213.32",
-      "kavlan-14": "10.19.213.32",
-      "kavlan-16": "10.27.213.32",
-      "kavlan-18": "10.35.213.32",
-      "kavlan-2": "192.168.209.32",
-      "kavlan-20": "10.43.213.32",
-      "kavlan-21": "10.47.213.32",
-      "kavlan-3": "192.168.225.32",
-      "kavlan-4": "10.16.1.32",
-      "kavlan-5": "10.16.65.32",
-      "kavlan-6": "10.16.129.32",
-      "kavlan-7": "10.16.193.32",
-      "kavlan-8": "10.17.1.32",
-      "kavlan-9": "10.17.65.32"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.32",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:c8",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-32.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/31",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:c9",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:ca",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b927d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.32",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-32-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b927e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7e",
-      "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.64.32",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:cb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-32-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/12"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69efc",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-32"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
deleted file mode 100644
index bce18b3ca746ed92ec5d2dc4ffebc75aafa2eaf4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.33",
-      "kavlan-11": "10.7.213.33",
-      "kavlan-12": "10.11.213.33",
-      "kavlan-13": "10.15.213.33",
-      "kavlan-14": "10.19.213.33",
-      "kavlan-16": "10.27.213.33",
-      "kavlan-18": "10.35.213.33",
-      "kavlan-2": "192.168.209.33",
-      "kavlan-20": "10.43.213.33",
-      "kavlan-21": "10.47.213.33",
-      "kavlan-3": "192.168.225.33",
-      "kavlan-4": "10.16.1.33",
-      "kavlan-5": "10.16.65.33",
-      "kavlan-6": "10.16.129.33",
-      "kavlan-7": "10.16.193.33",
-      "kavlan-8": "10.17.1.33",
-      "kavlan-9": "10.17.65.33"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.33",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:6c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-33.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/34",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:6d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:6e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b90d9",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.33",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:d9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-33-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b90da",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90: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.64.33",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:6f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-33-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/13"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e69ecf",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-33"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
deleted file mode 100644
index 1288fed40eb6d576056d37116e2a82b9e11f8f66..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.34",
-      "kavlan-11": "10.7.213.34",
-      "kavlan-12": "10.11.213.34",
-      "kavlan-13": "10.15.213.34",
-      "kavlan-14": "10.19.213.34",
-      "kavlan-16": "10.27.213.34",
-      "kavlan-18": "10.35.213.34",
-      "kavlan-2": "192.168.209.34",
-      "kavlan-20": "10.43.213.34",
-      "kavlan-21": "10.47.213.34",
-      "kavlan-3": "192.168.225.34",
-      "kavlan-4": "10.16.1.34",
-      "kavlan-5": "10.16.65.34",
-      "kavlan-6": "10.16.129.34",
-      "kavlan-7": "10.16.193.34",
-      "kavlan-8": "10.17.1.34",
-      "kavlan-9": "10.17.65.34"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.34",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:9c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-34.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/33",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:9d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:9e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9165",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.34",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:65",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-34-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9166",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91: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.64.34",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:9f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-34-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/14"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e902da",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-34"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
deleted file mode 100644
index 9cd6a3f9e9f95694fcfbaa09d05c85b82f2c66cc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.35",
-      "kavlan-11": "10.7.213.35",
-      "kavlan-12": "10.11.213.35",
-      "kavlan-13": "10.15.213.35",
-      "kavlan-14": "10.19.213.35",
-      "kavlan-16": "10.27.213.35",
-      "kavlan-18": "10.35.213.35",
-      "kavlan-2": "192.168.209.35",
-      "kavlan-20": "10.43.213.35",
-      "kavlan-21": "10.47.213.35",
-      "kavlan-3": "192.168.225.35",
-      "kavlan-4": "10.16.1.35",
-      "kavlan-5": "10.16.65.35",
-      "kavlan-6": "10.16.129.35",
-      "kavlan-7": "10.16.193.35",
-      "kavlan-8": "10.17.1.35",
-      "kavlan-9": "10.17.65.35"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.35",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:1c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-35.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/36",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:1d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:1e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030001d5ef",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.35",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:d5:ef",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-35-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c9030001d5f0",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:d5:f0",
-      "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.64.35",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:1f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-35-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/15"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e90217",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-35"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
deleted file mode 100644
index e6549228af72756f5ca095c6a4f2cc9dec03b620..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.37",
-      "kavlan-11": "10.7.213.37",
-      "kavlan-12": "10.11.213.37",
-      "kavlan-13": "10.15.213.37",
-      "kavlan-14": "10.19.213.37",
-      "kavlan-16": "10.27.213.37",
-      "kavlan-18": "10.35.213.37",
-      "kavlan-2": "192.168.209.37",
-      "kavlan-20": "10.43.213.37",
-      "kavlan-21": "10.47.213.37",
-      "kavlan-3": "192.168.225.37",
-      "kavlan-4": "10.16.1.37",
-      "kavlan-5": "10.16.65.37",
-      "kavlan-6": "10.16.129.37",
-      "kavlan-7": "10.16.193.37",
-      "kavlan-8": "10.17.1.37",
-      "kavlan-9": "10.17.65.37"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.37",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:a4",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-37.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/38",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:a5",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:a6",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92c5",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.37",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-37-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92c6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c6",
-      "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.64.37",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:a7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-37-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/17"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e901e5",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-37"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
deleted file mode 100644
index 1fda3562ac8aea4dfe7b0c39f6e4013e57317b9c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.38",
-      "kavlan-11": "10.7.213.38",
-      "kavlan-12": "10.11.213.38",
-      "kavlan-13": "10.15.213.38",
-      "kavlan-14": "10.19.213.38",
-      "kavlan-16": "10.27.213.38",
-      "kavlan-18": "10.35.213.38",
-      "kavlan-2": "192.168.209.38",
-      "kavlan-20": "10.43.213.38",
-      "kavlan-21": "10.47.213.38",
-      "kavlan-3": "192.168.225.38",
-      "kavlan-4": "10.16.1.38",
-      "kavlan-5": "10.16.65.38",
-      "kavlan-6": "10.16.129.38",
-      "kavlan-7": "10.16.193.38",
-      "kavlan-8": "10.17.1.38",
-      "kavlan-9": "10.17.65.38"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.38",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:30",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-38.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/37",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:31",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:32",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92b1",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.38",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b1",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-38-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92b2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b2",
-      "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.64.38",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:33",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-38-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/18"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e901e9",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-38"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
deleted file mode 100644
index cf42be9c425ebc3951a09034ac1cf01fe2b2f6b0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.4",
-      "kavlan-11": "10.7.213.4",
-      "kavlan-12": "10.11.213.4",
-      "kavlan-13": "10.15.213.4",
-      "kavlan-14": "10.19.213.4",
-      "kavlan-16": "10.27.213.4",
-      "kavlan-18": "10.35.213.4",
-      "kavlan-2": "192.168.209.4",
-      "kavlan-20": "10.43.213.4",
-      "kavlan-21": "10.47.213.4",
-      "kavlan-3": "192.168.225.4",
-      "kavlan-4": "10.16.1.4",
-      "kavlan-5": "10.16.65.4",
-      "kavlan-6": "10.16.129.4",
-      "kavlan-7": "10.16.193.4",
-      "kavlan-8": "10.17.1.4",
-      "kavlan-9": "10.17.65.4"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.4",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:54",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-4.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/3",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:55",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:56",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92bd",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.4",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:bd",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-4-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92be",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.4",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:57",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-4-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/28"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu1"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60b9b",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
deleted file mode 100644
index 4aa1da0b121f7ed08f89f3d909b449e02701c04d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.41",
-      "kavlan-11": "10.7.213.41",
-      "kavlan-12": "10.11.213.41",
-      "kavlan-13": "10.15.213.41",
-      "kavlan-14": "10.19.213.41",
-      "kavlan-16": "10.27.213.41",
-      "kavlan-18": "10.35.213.41",
-      "kavlan-2": "192.168.209.41",
-      "kavlan-20": "10.43.213.41",
-      "kavlan-21": "10.47.213.41",
-      "kavlan-3": "192.168.225.41",
-      "kavlan-4": "10.16.1.41",
-      "kavlan-5": "10.16.65.41",
-      "kavlan-6": "10.16.129.41",
-      "kavlan-7": "10.16.193.41",
-      "kavlan-8": "10.17.1.41",
-      "kavlan-9": "10.17.65.41"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.41",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:ac",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-41.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/2",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:ad",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:ae",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9299",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.41",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:99",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-41-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b929a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9a",
-      "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.64.41",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:af",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-41-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/26"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fe3b",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-41"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
deleted file mode 100644
index b3f4b9110c72f0671e9e2b5d89eb0b03135876f0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.42",
-      "kavlan-11": "10.7.213.42",
-      "kavlan-12": "10.11.213.42",
-      "kavlan-13": "10.15.213.42",
-      "kavlan-14": "10.19.213.42",
-      "kavlan-16": "10.27.213.42",
-      "kavlan-18": "10.35.213.42",
-      "kavlan-2": "192.168.209.42",
-      "kavlan-20": "10.43.213.42",
-      "kavlan-21": "10.47.213.42",
-      "kavlan-3": "192.168.225.42",
-      "kavlan-4": "10.16.1.42",
-      "kavlan-5": "10.16.65.42",
-      "kavlan-6": "10.16.129.42",
-      "kavlan-7": "10.16.193.42",
-      "kavlan-8": "10.17.1.42",
-      "kavlan-9": "10.17.65.42"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.42",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:88",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-42.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/3",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:89",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:8a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92a9",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.42",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-42-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92aa",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.42",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:8b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-42-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/27"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6d13d",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-42"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
deleted file mode 100644
index caa5a3be7641a989f0082c90feddbc146b2cd03f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.43",
-      "kavlan-11": "10.7.213.43",
-      "kavlan-12": "10.11.213.43",
-      "kavlan-13": "10.15.213.43",
-      "kavlan-14": "10.19.213.43",
-      "kavlan-16": "10.27.213.43",
-      "kavlan-18": "10.35.213.43",
-      "kavlan-2": "192.168.209.43",
-      "kavlan-20": "10.43.213.43",
-      "kavlan-21": "10.47.213.43",
-      "kavlan-3": "192.168.225.43",
-      "kavlan-4": "10.16.1.43",
-      "kavlan-5": "10.16.65.43",
-      "kavlan-6": "10.16.129.43",
-      "kavlan-7": "10.16.193.43",
-      "kavlan-8": "10.17.1.43",
-      "kavlan-9": "10.17.65.43"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.43",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:24",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-43.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/4",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:25",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:26",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92ad",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.43",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ad",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-43-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92ae",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.43",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:27",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-43-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/28"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e93c32",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-43"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
deleted file mode 100644
index 07bae0b3f2281a2413d2b00a91da99b0739b4d75..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "01/06/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.02"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.45",
-      "kavlan-11": "10.7.213.45",
-      "kavlan-12": "10.11.213.45",
-      "kavlan-13": "10.15.213.45",
-      "kavlan-14": "10.19.213.45",
-      "kavlan-16": "10.27.213.45",
-      "kavlan-18": "10.35.213.45",
-      "kavlan-2": "192.168.209.45",
-      "kavlan-20": "10.43.213.45",
-      "kavlan-21": "10.47.213.45",
-      "kavlan-3": "192.168.225.45",
-      "kavlan-4": "10.16.1.45",
-      "kavlan-5": "10.16.65.45",
-      "kavlan-6": "10.16.129.45",
-      "kavlan-7": "10.16.193.45",
-      "kavlan-8": "10.17.1.45",
-      "kavlan-9": "10.17.65.45"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.45",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:5c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-45.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/6",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:5d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:5e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9321",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.45",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:21",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-45-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9322",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:22",
-      "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.64.45",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:5f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-45-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/30"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca34de8f88e",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "GM3OA5CA",
-      "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-45"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
deleted file mode 100644
index 6659b68864800aff1e0635ebff04bd3533f48911..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.46",
-      "kavlan-11": "10.7.213.46",
-      "kavlan-12": "10.11.213.46",
-      "kavlan-13": "10.15.213.46",
-      "kavlan-14": "10.19.213.46",
-      "kavlan-16": "10.27.213.46",
-      "kavlan-18": "10.35.213.46",
-      "kavlan-2": "192.168.209.46",
-      "kavlan-20": "10.43.213.46",
-      "kavlan-21": "10.47.213.46",
-      "kavlan-3": "192.168.225.46",
-      "kavlan-4": "10.16.1.46",
-      "kavlan-5": "10.16.65.46",
-      "kavlan-6": "10.16.129.46",
-      "kavlan-7": "10.16.193.46",
-      "kavlan-8": "10.17.1.46",
-      "kavlan-9": "10.17.65.46"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.46",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:94",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-46.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/7",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:95",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:96",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93d5",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.46",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-46-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93d6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.46",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:97",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-46-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/31"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e90220",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-46"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
deleted file mode 100644
index f31daf594d67320f075f955987b59c6593fd1d90..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.47",
-      "kavlan-11": "10.7.213.47",
-      "kavlan-12": "10.11.213.47",
-      "kavlan-13": "10.15.213.47",
-      "kavlan-14": "10.19.213.47",
-      "kavlan-16": "10.27.213.47",
-      "kavlan-18": "10.35.213.47",
-      "kavlan-2": "192.168.209.47",
-      "kavlan-20": "10.43.213.47",
-      "kavlan-21": "10.47.213.47",
-      "kavlan-3": "192.168.225.47",
-      "kavlan-4": "10.16.1.47",
-      "kavlan-5": "10.16.65.47",
-      "kavlan-6": "10.16.129.47",
-      "kavlan-7": "10.16.193.47",
-      "kavlan-8": "10.17.1.47",
-      "kavlan-9": "10.17.65.47"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.47",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:94",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-47.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/8",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:95",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:96",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93e5",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.47",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-47-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93e6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.47",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:97",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-47-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/32"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fe33",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-47"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
deleted file mode 100644
index 88fa6d0e960c75f967b94a5faef1ce629c273e20..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.48",
-      "kavlan-11": "10.7.213.48",
-      "kavlan-12": "10.11.213.48",
-      "kavlan-13": "10.15.213.48",
-      "kavlan-14": "10.19.213.48",
-      "kavlan-16": "10.27.213.48",
-      "kavlan-18": "10.35.213.48",
-      "kavlan-2": "192.168.209.48",
-      "kavlan-20": "10.43.213.48",
-      "kavlan-21": "10.47.213.48",
-      "kavlan-3": "192.168.225.48",
-      "kavlan-4": "10.16.1.48",
-      "kavlan-5": "10.16.65.48",
-      "kavlan-6": "10.16.129.48",
-      "kavlan-7": "10.16.193.48",
-      "kavlan-8": "10.17.1.48",
-      "kavlan-9": "10.17.65.48"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.48",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:e8",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-48.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/9",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:e9",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:ea",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93dd",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.48",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:dd",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-48-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93de",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:de",
-      "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.64.48",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:eb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-48-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/33"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8cee9",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-48"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
deleted file mode 100644
index cfd3bb0ca832ac7db5ff74ea8c7703520a8ac770..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.49",
-      "kavlan-11": "10.7.213.49",
-      "kavlan-12": "10.11.213.49",
-      "kavlan-13": "10.15.213.49",
-      "kavlan-14": "10.19.213.49",
-      "kavlan-16": "10.27.213.49",
-      "kavlan-18": "10.35.213.49",
-      "kavlan-2": "192.168.209.49",
-      "kavlan-20": "10.43.213.49",
-      "kavlan-21": "10.47.213.49",
-      "kavlan-3": "192.168.225.49",
-      "kavlan-4": "10.16.1.49",
-      "kavlan-5": "10.16.65.49",
-      "kavlan-6": "10.16.129.49",
-      "kavlan-7": "10.16.193.49",
-      "kavlan-8": "10.17.1.49",
-      "kavlan-9": "10.17.65.49"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.49",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:5c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-49.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/10",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:5d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:5e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93d1",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.49",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d1",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-49-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93d2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.49",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:5f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-49-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/34"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6d249",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-49"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
deleted file mode 100644
index 13c10e54a0b2c181dbf4b2d60084366cc62e52dc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.5",
-      "kavlan-11": "10.7.213.5",
-      "kavlan-12": "10.11.213.5",
-      "kavlan-13": "10.15.213.5",
-      "kavlan-14": "10.19.213.5",
-      "kavlan-16": "10.27.213.5",
-      "kavlan-18": "10.35.213.5",
-      "kavlan-2": "192.168.209.5",
-      "kavlan-20": "10.43.213.5",
-      "kavlan-21": "10.47.213.5",
-      "kavlan-3": "192.168.225.5",
-      "kavlan-4": "10.16.1.5",
-      "kavlan-5": "10.16.65.5",
-      "kavlan-6": "10.16.129.5",
-      "kavlan-7": "10.16.193.5",
-      "kavlan-8": "10.17.1.5",
-      "kavlan-9": "10.17.65.5"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.5",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:b8",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-5.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/6",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:b9",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:ba",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9179",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.5",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:79",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-5-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b917a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7a",
-      "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.64.5",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:bb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-5-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/29"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e7027a",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-5"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json
deleted file mode 100644
index 8b6963cba702709d90a9b3f3e073e57f423fcf72..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.50",
-      "kavlan-11": "10.7.213.50",
-      "kavlan-12": "10.11.213.50",
-      "kavlan-13": "10.15.213.50",
-      "kavlan-14": "10.19.213.50",
-      "kavlan-16": "10.27.213.50",
-      "kavlan-18": "10.35.213.50",
-      "kavlan-2": "192.168.209.50",
-      "kavlan-20": "10.43.213.50",
-      "kavlan-21": "10.47.213.50",
-      "kavlan-3": "192.168.225.50",
-      "kavlan-4": "10.16.1.50",
-      "kavlan-5": "10.16.65.50",
-      "kavlan-6": "10.16.129.50",
-      "kavlan-7": "10.16.193.50",
-      "kavlan-8": "10.17.1.50",
-      "kavlan-9": "10.17.65.50"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.50",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:74",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-50.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/11",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:75",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:76",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92f1",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.50",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f1",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-50-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92f2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f2",
-      "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.64.50",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:77",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-50-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/35"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6a744",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-50"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
deleted file mode 100644
index 4a6f733a3b121c161586bf29b37f03c9e5c4174b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.51",
-      "kavlan-11": "10.7.213.51",
-      "kavlan-12": "10.11.213.51",
-      "kavlan-13": "10.15.213.51",
-      "kavlan-14": "10.19.213.51",
-      "kavlan-16": "10.27.213.51",
-      "kavlan-18": "10.35.213.51",
-      "kavlan-2": "192.168.209.51",
-      "kavlan-20": "10.43.213.51",
-      "kavlan-21": "10.47.213.51",
-      "kavlan-3": "192.168.225.51",
-      "kavlan-4": "10.16.1.51",
-      "kavlan-5": "10.16.65.51",
-      "kavlan-6": "10.16.129.51",
-      "kavlan-7": "10.16.193.51",
-      "kavlan-8": "10.17.1.51",
-      "kavlan-9": "10.17.65.51"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.51",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:60",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-51.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/12",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:61",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:62",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92e9",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.51",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-51-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92ea",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.51",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:63",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-51-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/36"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e66eb9",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-51"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
deleted file mode 100644
index 27227b118f362c1348a0b6d50bd904ce02bc2dbe..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.52",
-      "kavlan-11": "10.7.213.52",
-      "kavlan-12": "10.11.213.52",
-      "kavlan-13": "10.15.213.52",
-      "kavlan-14": "10.19.213.52",
-      "kavlan-16": "10.27.213.52",
-      "kavlan-18": "10.35.213.52",
-      "kavlan-2": "192.168.209.52",
-      "kavlan-20": "10.43.213.52",
-      "kavlan-21": "10.47.213.52",
-      "kavlan-3": "192.168.225.52",
-      "kavlan-4": "10.16.1.52",
-      "kavlan-5": "10.16.65.52",
-      "kavlan-6": "10.16.129.52",
-      "kavlan-7": "10.16.193.52",
-      "kavlan-8": "10.17.1.52",
-      "kavlan-9": "10.17.65.52"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.52",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:0c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-52.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/13",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:0d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:0e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92f9",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.52",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-52-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92fa",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fa",
-      "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.64.52",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:0f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-52-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/37"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6d1e4",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-52"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
deleted file mode 100644
index a57c591a6e926379fb174aa4300655c3a0f5e566..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.53",
-      "kavlan-11": "10.7.213.53",
-      "kavlan-12": "10.11.213.53",
-      "kavlan-13": "10.15.213.53",
-      "kavlan-14": "10.19.213.53",
-      "kavlan-16": "10.27.213.53",
-      "kavlan-18": "10.35.213.53",
-      "kavlan-2": "192.168.209.53",
-      "kavlan-20": "10.43.213.53",
-      "kavlan-21": "10.47.213.53",
-      "kavlan-3": "192.168.225.53",
-      "kavlan-4": "10.16.1.53",
-      "kavlan-5": "10.16.65.53",
-      "kavlan-6": "10.16.129.53",
-      "kavlan-7": "10.16.193.53",
-      "kavlan-8": "10.17.1.53",
-      "kavlan-9": "10.17.65.53"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.53",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:f8",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-53.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/14",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:f9",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:fa",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9309",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.53",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:09",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-53-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b930a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0a",
-      "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.64.53",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:fb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-53-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/38"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fe1a",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-53"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
deleted file mode 100644
index 515ddfab2a0bdb30b4ee8b87447fd982466db99b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.55",
-      "kavlan-11": "10.7.213.55",
-      "kavlan-12": "10.11.213.55",
-      "kavlan-13": "10.15.213.55",
-      "kavlan-14": "10.19.213.55",
-      "kavlan-16": "10.27.213.55",
-      "kavlan-18": "10.35.213.55",
-      "kavlan-2": "192.168.209.55",
-      "kavlan-20": "10.43.213.55",
-      "kavlan-21": "10.47.213.55",
-      "kavlan-3": "192.168.225.55",
-      "kavlan-4": "10.16.1.55",
-      "kavlan-5": "10.16.65.55",
-      "kavlan-6": "10.16.129.55",
-      "kavlan-7": "10.16.193.55",
-      "kavlan-8": "10.17.1.55",
-      "kavlan-9": "10.17.65.55"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.55",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:90",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-55.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/16",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:91",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:92",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b930d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.55",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-55-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b930e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.55",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:93",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-55-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/40"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e90212",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-55"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
deleted file mode 100644
index 8c3aa1c02a0b100488b42bb3c2f40297aa1498f0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.57",
-      "kavlan-11": "10.7.213.57",
-      "kavlan-12": "10.11.213.57",
-      "kavlan-13": "10.15.213.57",
-      "kavlan-14": "10.19.213.57",
-      "kavlan-16": "10.27.213.57",
-      "kavlan-18": "10.35.213.57",
-      "kavlan-2": "192.168.209.57",
-      "kavlan-20": "10.43.213.57",
-      "kavlan-21": "10.47.213.57",
-      "kavlan-3": "192.168.225.57",
-      "kavlan-4": "10.16.1.57",
-      "kavlan-5": "10.16.65.57",
-      "kavlan-6": "10.16.129.57",
-      "kavlan-7": "10.16.193.57",
-      "kavlan-8": "10.17.1.57",
-      "kavlan-9": "10.17.65.57"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.57",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:a0",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-57.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/18",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:a1",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:a2",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b918d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.57",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-57-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b918e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8e",
-      "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.64.57",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:a3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-57-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/2"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e677a1",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-57"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
deleted file mode 100644
index 500fa0db23b88adf8e59d97525d08456976ca6e7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.58",
-      "kavlan-11": "10.7.213.58",
-      "kavlan-12": "10.11.213.58",
-      "kavlan-13": "10.15.213.58",
-      "kavlan-14": "10.19.213.58",
-      "kavlan-16": "10.27.213.58",
-      "kavlan-18": "10.35.213.58",
-      "kavlan-2": "192.168.209.58",
-      "kavlan-20": "10.43.213.58",
-      "kavlan-21": "10.47.213.58",
-      "kavlan-3": "192.168.225.58",
-      "kavlan-4": "10.16.1.58",
-      "kavlan-5": "10.16.65.58",
-      "kavlan-6": "10.16.129.58",
-      "kavlan-7": "10.16.193.58",
-      "kavlan-8": "10.17.1.58",
-      "kavlan-9": "10.17.65.58"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.58",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:34",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-58.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/19",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:35",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:36",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b919d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.58",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-58-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b919e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9e",
-      "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.64.58",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:37",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-58-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/3"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca32bd48345",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "GM3OA52A",
-      "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-58"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
deleted file mode 100644
index 7c6061f93babf3aee79c35612b03afb31ce78600..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.59",
-      "kavlan-11": "10.7.213.59",
-      "kavlan-12": "10.11.213.59",
-      "kavlan-13": "10.15.213.59",
-      "kavlan-14": "10.19.213.59",
-      "kavlan-16": "10.27.213.59",
-      "kavlan-18": "10.35.213.59",
-      "kavlan-2": "192.168.209.59",
-      "kavlan-20": "10.43.213.59",
-      "kavlan-21": "10.47.213.59",
-      "kavlan-3": "192.168.225.59",
-      "kavlan-4": "10.16.1.59",
-      "kavlan-5": "10.16.65.59",
-      "kavlan-6": "10.16.129.59",
-      "kavlan-7": "10.16.193.59",
-      "kavlan-8": "10.17.1.59",
-      "kavlan-9": "10.17.65.59"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.59",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:2c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-59.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/20",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:2d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:2e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9195",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.59",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:95",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-59-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9196",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:96",
-      "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.64.59",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:2f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-59-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/4"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6d228",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-59"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
deleted file mode 100644
index a5c9f687fa7ebefc7faa4c992886de7b7286ed3f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.6",
-      "kavlan-11": "10.7.213.6",
-      "kavlan-12": "10.11.213.6",
-      "kavlan-13": "10.15.213.6",
-      "kavlan-14": "10.19.213.6",
-      "kavlan-16": "10.27.213.6",
-      "kavlan-18": "10.35.213.6",
-      "kavlan-2": "192.168.209.6",
-      "kavlan-20": "10.43.213.6",
-      "kavlan-21": "10.47.213.6",
-      "kavlan-3": "192.168.225.6",
-      "kavlan-4": "10.16.1.6",
-      "kavlan-5": "10.16.65.6",
-      "kavlan-6": "10.16.129.6",
-      "kavlan-7": "10.16.193.6",
-      "kavlan-8": "10.17.1.6",
-      "kavlan-9": "10.17.65.6"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.6",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:ec",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-6.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/5",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:ed",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:ee",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b917d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.6",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-6-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b917e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7e",
-      "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.64.6",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:ef",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-6-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/30"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371de258a",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-6"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
deleted file mode 100644
index 68daed8f7a369c42546aaeb19072fdafe2420815..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.60",
-      "kavlan-11": "10.7.213.60",
-      "kavlan-12": "10.11.213.60",
-      "kavlan-13": "10.15.213.60",
-      "kavlan-14": "10.19.213.60",
-      "kavlan-16": "10.27.213.60",
-      "kavlan-18": "10.35.213.60",
-      "kavlan-2": "192.168.209.60",
-      "kavlan-20": "10.43.213.60",
-      "kavlan-21": "10.47.213.60",
-      "kavlan-3": "192.168.225.60",
-      "kavlan-4": "10.16.1.60",
-      "kavlan-5": "10.16.65.60",
-      "kavlan-6": "10.16.129.60",
-      "kavlan-7": "10.16.193.60",
-      "kavlan-8": "10.17.1.60",
-      "kavlan-9": "10.17.65.60"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.60",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:4c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-60.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/21",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:4d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:4e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9185",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.60",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:85",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-60-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9186",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:86",
-      "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.64.60",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:4f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-60-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/5"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fdf9",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-60"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
deleted file mode 100644
index ba1d2f3567ed8b22e30a43f6e2495d09b221ae2f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.62",
-      "kavlan-11": "10.7.213.62",
-      "kavlan-12": "10.11.213.62",
-      "kavlan-13": "10.15.213.62",
-      "kavlan-14": "10.19.213.62",
-      "kavlan-16": "10.27.213.62",
-      "kavlan-18": "10.35.213.62",
-      "kavlan-2": "192.168.209.62",
-      "kavlan-20": "10.43.213.62",
-      "kavlan-21": "10.47.213.62",
-      "kavlan-3": "192.168.225.62",
-      "kavlan-4": "10.16.1.62",
-      "kavlan-5": "10.16.65.62",
-      "kavlan-6": "10.16.129.62",
-      "kavlan-7": "10.16.193.62",
-      "kavlan-8": "10.17.1.62",
-      "kavlan-9": "10.17.65.62"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.62",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:c4",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-62.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/23",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:c5",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:c6",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9199",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.62",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:99",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-62-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b919a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9a",
-      "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.64.62",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:c7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-62-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/7"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce37",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-62"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
deleted file mode 100644
index 2637782ab1e173eaa2a5a4f45e9eb8c8342e1b2c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.63",
-      "kavlan-11": "10.7.213.63",
-      "kavlan-12": "10.11.213.63",
-      "kavlan-13": "10.15.213.63",
-      "kavlan-14": "10.19.213.63",
-      "kavlan-16": "10.27.213.63",
-      "kavlan-18": "10.35.213.63",
-      "kavlan-2": "192.168.209.63",
-      "kavlan-20": "10.43.213.63",
-      "kavlan-21": "10.47.213.63",
-      "kavlan-3": "192.168.225.63",
-      "kavlan-4": "10.16.1.63",
-      "kavlan-5": "10.16.65.63",
-      "kavlan-6": "10.16.129.63",
-      "kavlan-7": "10.16.193.63",
-      "kavlan-8": "10.17.1.63",
-      "kavlan-9": "10.17.65.63"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.63",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:68",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-63.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/24",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:69",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:6a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9181",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.63",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:81",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-63-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9182",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:82",
-      "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.64.63",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:6b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-63-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/8"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60b9a",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-63"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
deleted file mode 100644
index cec1eebd1b0d3d0c9cc432cec34a4c10e4b62032..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.64",
-      "kavlan-11": "10.7.213.64",
-      "kavlan-12": "10.11.213.64",
-      "kavlan-13": "10.15.213.64",
-      "kavlan-14": "10.19.213.64",
-      "kavlan-16": "10.27.213.64",
-      "kavlan-18": "10.35.213.64",
-      "kavlan-2": "192.168.209.64",
-      "kavlan-20": "10.43.213.64",
-      "kavlan-21": "10.47.213.64",
-      "kavlan-3": "192.168.225.64",
-      "kavlan-4": "10.16.1.64",
-      "kavlan-5": "10.16.65.64",
-      "kavlan-6": "10.16.129.64",
-      "kavlan-7": "10.16.193.64",
-      "kavlan-8": "10.17.1.64",
-      "kavlan-9": "10.17.65.64"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.64",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:88",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-64.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/25",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:89",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:8a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92a1",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.64",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a1",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-64-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92a2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.64",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:8b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-64-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/9"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce47",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-64"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
deleted file mode 100644
index 98ed7e7baf55e948ee913c911868ea0f0d6e799d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.65",
-      "kavlan-11": "10.7.213.65",
-      "kavlan-12": "10.11.213.65",
-      "kavlan-13": "10.15.213.65",
-      "kavlan-14": "10.19.213.65",
-      "kavlan-16": "10.27.213.65",
-      "kavlan-18": "10.35.213.65",
-      "kavlan-2": "192.168.209.65",
-      "kavlan-20": "10.43.213.65",
-      "kavlan-21": "10.47.213.65",
-      "kavlan-3": "192.168.225.65",
-      "kavlan-4": "10.16.1.65",
-      "kavlan-5": "10.16.65.65",
-      "kavlan-6": "10.16.129.65",
-      "kavlan-7": "10.16.193.65",
-      "kavlan-8": "10.17.1.65",
-      "kavlan-9": "10.17.65.65"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.65",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:44",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-65.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/26",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:45",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:46",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93d9",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.65",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-65-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93da",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.65",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:47",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-65-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/10"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce3f",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-65"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
deleted file mode 100644
index 8694440bad8d104825fa3f0622b5b9fd34158d36..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.66",
-      "kavlan-11": "10.7.213.66",
-      "kavlan-12": "10.11.213.66",
-      "kavlan-13": "10.15.213.66",
-      "kavlan-14": "10.19.213.66",
-      "kavlan-16": "10.27.213.66",
-      "kavlan-18": "10.35.213.66",
-      "kavlan-2": "192.168.209.66",
-      "kavlan-20": "10.43.213.66",
-      "kavlan-21": "10.47.213.66",
-      "kavlan-3": "192.168.225.66",
-      "kavlan-4": "10.16.1.66",
-      "kavlan-5": "10.16.65.66",
-      "kavlan-6": "10.16.129.66",
-      "kavlan-7": "10.16.193.66",
-      "kavlan-8": "10.17.1.66",
-      "kavlan-9": "10.17.65.66"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.66",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:14",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-66.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/27",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:15",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:16",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9149",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.66",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:49",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-66-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b914a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4a",
-      "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.64.66",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:17",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-66-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/11"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce44",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-66"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
deleted file mode 100644
index ea55d3b05c07b344b98fc6cf7ddce287c719c3b2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.67",
-      "kavlan-11": "10.7.213.67",
-      "kavlan-12": "10.11.213.67",
-      "kavlan-13": "10.15.213.67",
-      "kavlan-14": "10.19.213.67",
-      "kavlan-16": "10.27.213.67",
-      "kavlan-18": "10.35.213.67",
-      "kavlan-2": "192.168.209.67",
-      "kavlan-20": "10.43.213.67",
-      "kavlan-21": "10.47.213.67",
-      "kavlan-3": "192.168.225.67",
-      "kavlan-4": "10.16.1.67",
-      "kavlan-5": "10.16.65.67",
-      "kavlan-6": "10.16.129.67",
-      "kavlan-7": "10.16.193.67",
-      "kavlan-8": "10.17.1.67",
-      "kavlan-9": "10.17.65.67"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.67",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:b0",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-67.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/28",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:b1",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:b2",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93b9",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.67",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-67-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93ba",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.67",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:b3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-67-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/12"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu3"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce3c",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-67"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
deleted file mode 100644
index a70ca2102c65678b67349d77ac1e780076016b4c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.68",
-      "kavlan-11": "10.7.213.68",
-      "kavlan-12": "10.11.213.68",
-      "kavlan-13": "10.15.213.68",
-      "kavlan-14": "10.19.213.68",
-      "kavlan-16": "10.27.213.68",
-      "kavlan-18": "10.35.213.68",
-      "kavlan-2": "192.168.209.68",
-      "kavlan-20": "10.43.213.68",
-      "kavlan-21": "10.47.213.68",
-      "kavlan-3": "192.168.225.68",
-      "kavlan-4": "10.16.1.68",
-      "kavlan-5": "10.16.65.68",
-      "kavlan-6": "10.16.129.68",
-      "kavlan-7": "10.16.193.68",
-      "kavlan-8": "10.17.1.68",
-      "kavlan-9": "10.17.65.68"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.68",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:50",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-68.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/29",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:51",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:52",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9291",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.68",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:91",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-68-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9292",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:92",
-      "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.64.68",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:53",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-68-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/13"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60b25",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-68"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
deleted file mode 100644
index 281cf9263eed761cb4571597410e472c41867a6f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.69",
-      "kavlan-11": "10.7.213.69",
-      "kavlan-12": "10.11.213.69",
-      "kavlan-13": "10.15.213.69",
-      "kavlan-14": "10.19.213.69",
-      "kavlan-16": "10.27.213.69",
-      "kavlan-18": "10.35.213.69",
-      "kavlan-2": "192.168.209.69",
-      "kavlan-20": "10.43.213.69",
-      "kavlan-21": "10.47.213.69",
-      "kavlan-3": "192.168.225.69",
-      "kavlan-4": "10.16.1.69",
-      "kavlan-5": "10.16.65.69",
-      "kavlan-6": "10.16.129.69",
-      "kavlan-7": "10.16.193.69",
-      "kavlan-8": "10.17.1.69",
-      "kavlan-9": "10.17.65.69"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.69",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:98",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-69.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/30",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:99",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:9a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93c1",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.69",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c1",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-69-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93c2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.69",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:9b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-69-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/14"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce33",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-69"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
deleted file mode 100644
index d8458fc788640343ed05bf41db12fd602d364a36..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.7",
-      "kavlan-11": "10.7.213.7",
-      "kavlan-12": "10.11.213.7",
-      "kavlan-13": "10.15.213.7",
-      "kavlan-14": "10.19.213.7",
-      "kavlan-16": "10.27.213.7",
-      "kavlan-18": "10.35.213.7",
-      "kavlan-2": "192.168.209.7",
-      "kavlan-20": "10.43.213.7",
-      "kavlan-21": "10.47.213.7",
-      "kavlan-3": "192.168.225.7",
-      "kavlan-4": "10.16.1.7",
-      "kavlan-5": "10.16.65.7",
-      "kavlan-6": "10.16.129.7",
-      "kavlan-7": "10.16.193.7",
-      "kavlan-8": "10.17.1.7",
-      "kavlan-9": "10.17.65.7"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.7",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:3c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-7.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/8",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:3d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:3e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9161",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.7",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:61",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-7-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9162",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91: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.64.7",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:3f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-7-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/31"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e73c3e",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-7"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
deleted file mode 100644
index 2cde326981b74450a852633748273e2327329d21..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.70",
-      "kavlan-11": "10.7.213.70",
-      "kavlan-12": "10.11.213.70",
-      "kavlan-13": "10.15.213.70",
-      "kavlan-14": "10.19.213.70",
-      "kavlan-16": "10.27.213.70",
-      "kavlan-18": "10.35.213.70",
-      "kavlan-2": "192.168.209.70",
-      "kavlan-20": "10.43.213.70",
-      "kavlan-21": "10.47.213.70",
-      "kavlan-3": "192.168.225.70",
-      "kavlan-4": "10.16.1.70",
-      "kavlan-5": "10.16.65.70",
-      "kavlan-6": "10.16.129.70",
-      "kavlan-7": "10.16.193.70",
-      "kavlan-8": "10.17.1.70",
-      "kavlan-9": "10.17.65.70"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.70",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:4c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-70.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/31",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:4d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:4e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9311",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.70",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:11",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-70-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9312",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:12",
-      "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.64.70",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:4f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-70-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/15"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e66a94",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-70"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
deleted file mode 100644
index ecda39f0800f29991a19a7a27a4eba3a2483140f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.71",
-      "kavlan-11": "10.7.213.71",
-      "kavlan-12": "10.11.213.71",
-      "kavlan-13": "10.15.213.71",
-      "kavlan-14": "10.19.213.71",
-      "kavlan-16": "10.27.213.71",
-      "kavlan-18": "10.35.213.71",
-      "kavlan-2": "192.168.209.71",
-      "kavlan-20": "10.43.213.71",
-      "kavlan-21": "10.47.213.71",
-      "kavlan-3": "192.168.225.71",
-      "kavlan-4": "10.16.1.71",
-      "kavlan-5": "10.16.65.71",
-      "kavlan-6": "10.16.129.71",
-      "kavlan-7": "10.16.193.71",
-      "kavlan-8": "10.17.1.71",
-      "kavlan-9": "10.17.65.71"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.71",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:28",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-71.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/32",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:29",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:2a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92ed",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.71",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ed",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-71-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92ee",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.71",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:2b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-71-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/16"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce2a",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-71"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
deleted file mode 100644
index 08250c4b2f7a6e8e001af3f5ca7c5e5b8bfbcf41..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.72",
-      "kavlan-11": "10.7.213.72",
-      "kavlan-12": "10.11.213.72",
-      "kavlan-13": "10.15.213.72",
-      "kavlan-14": "10.19.213.72",
-      "kavlan-16": "10.27.213.72",
-      "kavlan-18": "10.35.213.72",
-      "kavlan-2": "192.168.209.72",
-      "kavlan-20": "10.43.213.72",
-      "kavlan-21": "10.47.213.72",
-      "kavlan-3": "192.168.225.72",
-      "kavlan-4": "10.16.1.72",
-      "kavlan-5": "10.16.65.72",
-      "kavlan-6": "10.16.129.72",
-      "kavlan-7": "10.16.193.72",
-      "kavlan-8": "10.17.1.72",
-      "kavlan-9": "10.17.65.72"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.72",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:e4",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-72.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/33",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:e5",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:e6",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9295",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.72",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:95",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-72-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9296",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:96",
-      "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.64.72",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:e7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-72-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/17"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60bc4",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-72"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
deleted file mode 100644
index 6459fc300547da3fa3338889b7a8f8da878e8524..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.73",
-      "kavlan-11": "10.7.213.73",
-      "kavlan-12": "10.11.213.73",
-      "kavlan-13": "10.15.213.73",
-      "kavlan-14": "10.19.213.73",
-      "kavlan-16": "10.27.213.73",
-      "kavlan-18": "10.35.213.73",
-      "kavlan-2": "192.168.209.73",
-      "kavlan-20": "10.43.213.73",
-      "kavlan-21": "10.47.213.73",
-      "kavlan-3": "192.168.225.73",
-      "kavlan-4": "10.16.1.73",
-      "kavlan-5": "10.16.65.73",
-      "kavlan-6": "10.16.129.73",
-      "kavlan-7": "10.16.193.73",
-      "kavlan-8": "10.17.1.73",
-      "kavlan-9": "10.17.65.73"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.73",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:40",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-73.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/34",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:41",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:42",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92fd",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.73",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fd",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-73-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92fe",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.73",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:43",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-73-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/18"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce29",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-73"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
deleted file mode 100644
index 2b72c0214ec7c21ca69a3c8406f8ba43222b4716..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.74",
-      "kavlan-11": "10.7.213.74",
-      "kavlan-12": "10.11.213.74",
-      "kavlan-13": "10.15.213.74",
-      "kavlan-14": "10.19.213.74",
-      "kavlan-16": "10.27.213.74",
-      "kavlan-18": "10.35.213.74",
-      "kavlan-2": "192.168.209.74",
-      "kavlan-20": "10.43.213.74",
-      "kavlan-21": "10.47.213.74",
-      "kavlan-3": "192.168.225.74",
-      "kavlan-4": "10.16.1.74",
-      "kavlan-5": "10.16.65.74",
-      "kavlan-6": "10.16.129.74",
-      "kavlan-7": "10.16.193.74",
-      "kavlan-8": "10.17.1.74",
-      "kavlan-9": "10.17.65.74"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.74",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:80",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-74.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene2",
-      "switch_port": "GigabitEthernet1/0/35",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:81",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:82",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92dd",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.74",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:dd",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-74-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92de",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:de",
-      "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.64.74",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:83",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-74-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene2-ipmi",
-      "switch_port": "1/0/19"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu4"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce87",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-74"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
deleted file mode 100644
index ab42473eaa83da5ea7456bd5788882f061ad5cf1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.75",
-      "kavlan-11": "10.7.213.75",
-      "kavlan-12": "10.11.213.75",
-      "kavlan-13": "10.15.213.75",
-      "kavlan-14": "10.19.213.75",
-      "kavlan-16": "10.27.213.75",
-      "kavlan-18": "10.35.213.75",
-      "kavlan-2": "192.168.209.75",
-      "kavlan-20": "10.43.213.75",
-      "kavlan-21": "10.47.213.75",
-      "kavlan-3": "192.168.225.75",
-      "kavlan-4": "10.16.1.75",
-      "kavlan-5": "10.16.65.75",
-      "kavlan-6": "10.16.129.75",
-      "kavlan-7": "10.16.193.75",
-      "kavlan-8": "10.17.1.75",
-      "kavlan-9": "10.17.65.75"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.75",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:04",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-75.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/2",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:05",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:06",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92e5",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.75",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-75-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92e6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.75",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:07",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-75-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/25"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce35",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-75"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
deleted file mode 100644
index 00b7b9dd7ed25c0a99e0434771455f8907ce649d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.76",
-      "kavlan-11": "10.7.213.76",
-      "kavlan-12": "10.11.213.76",
-      "kavlan-13": "10.15.213.76",
-      "kavlan-14": "10.19.213.76",
-      "kavlan-16": "10.27.213.76",
-      "kavlan-18": "10.35.213.76",
-      "kavlan-2": "192.168.209.76",
-      "kavlan-20": "10.43.213.76",
-      "kavlan-21": "10.47.213.76",
-      "kavlan-3": "192.168.225.76",
-      "kavlan-4": "10.16.1.76",
-      "kavlan-5": "10.16.65.76",
-      "kavlan-6": "10.16.129.76",
-      "kavlan-7": "10.16.193.76",
-      "kavlan-8": "10.17.1.76",
-      "kavlan-9": "10.17.65.76"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.76",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:20",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-76.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/1",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:21",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:22",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92d5",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.76",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-76-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92d6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.76",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:23",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-76-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/26"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce34",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-76"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
deleted file mode 100644
index 3c5b6b5bf9236a126d15daf5abe3ae02bd136599..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.77",
-      "kavlan-11": "10.7.213.77",
-      "kavlan-12": "10.11.213.77",
-      "kavlan-13": "10.15.213.77",
-      "kavlan-14": "10.19.213.77",
-      "kavlan-16": "10.27.213.77",
-      "kavlan-18": "10.35.213.77",
-      "kavlan-2": "192.168.209.77",
-      "kavlan-20": "10.43.213.77",
-      "kavlan-21": "10.47.213.77",
-      "kavlan-3": "192.168.225.77",
-      "kavlan-4": "10.16.1.77",
-      "kavlan-5": "10.16.65.77",
-      "kavlan-6": "10.16.129.77",
-      "kavlan-7": "10.16.193.77",
-      "kavlan-8": "10.17.1.77",
-      "kavlan-9": "10.17.65.77"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.77",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:a0",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-77.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/4",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:a1",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:a2",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92e1",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.77",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e1",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-77-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92e2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.77",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:a3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-77-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/27"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu5"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce28",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-77"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
deleted file mode 100644
index d61c5e9a561922c066450d30507caa072468354f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.78",
-      "kavlan-11": "10.7.213.78",
-      "kavlan-12": "10.11.213.78",
-      "kavlan-13": "10.15.213.78",
-      "kavlan-14": "10.19.213.78",
-      "kavlan-16": "10.27.213.78",
-      "kavlan-18": "10.35.213.78",
-      "kavlan-2": "192.168.209.78",
-      "kavlan-20": "10.43.213.78",
-      "kavlan-21": "10.47.213.78",
-      "kavlan-3": "192.168.225.78",
-      "kavlan-4": "10.16.1.78",
-      "kavlan-5": "10.16.65.78",
-      "kavlan-6": "10.16.129.78",
-      "kavlan-7": "10.16.193.78",
-      "kavlan-8": "10.17.1.78",
-      "kavlan-9": "10.17.65.78"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.78",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:50",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-78.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/3",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:51",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:52",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9301",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.78",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:01",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-78-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9302",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.78",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:53",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-78-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/28"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu5"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60bc8",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-78"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
deleted file mode 100644
index 4378b037527db67cfceb1d9d5c54ca21660dd4d5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.79",
-      "kavlan-11": "10.7.213.79",
-      "kavlan-12": "10.11.213.79",
-      "kavlan-13": "10.15.213.79",
-      "kavlan-14": "10.19.213.79",
-      "kavlan-16": "10.27.213.79",
-      "kavlan-18": "10.35.213.79",
-      "kavlan-2": "192.168.209.79",
-      "kavlan-20": "10.43.213.79",
-      "kavlan-21": "10.47.213.79",
-      "kavlan-3": "192.168.225.79",
-      "kavlan-4": "10.16.1.79",
-      "kavlan-5": "10.16.65.79",
-      "kavlan-6": "10.16.129.79",
-      "kavlan-7": "10.16.193.79",
-      "kavlan-8": "10.17.1.79",
-      "kavlan-9": "10.17.65.79"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.79",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:78",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-79.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/6",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:79",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:7a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92f5",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.79",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-79-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92f6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f6",
-      "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.64.79",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:7b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-79-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/29"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu5"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e901f3",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-79"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
deleted file mode 100644
index dff8d5975e1a1848c0380ca25394c685c7ff948d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.8",
-      "kavlan-11": "10.7.213.8",
-      "kavlan-12": "10.11.213.8",
-      "kavlan-13": "10.15.213.8",
-      "kavlan-14": "10.19.213.8",
-      "kavlan-16": "10.27.213.8",
-      "kavlan-18": "10.35.213.8",
-      "kavlan-2": "192.168.209.8",
-      "kavlan-20": "10.43.213.8",
-      "kavlan-21": "10.47.213.8",
-      "kavlan-3": "192.168.225.8",
-      "kavlan-4": "10.16.1.8",
-      "kavlan-5": "10.16.65.8",
-      "kavlan-6": "10.16.129.8",
-      "kavlan-7": "10.16.193.8",
-      "kavlan-8": "10.17.1.8",
-      "kavlan-9": "10.17.65.8"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.8",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:08",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-8.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/12",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:09",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:0a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9175",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.8",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:75",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-8-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9176",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:76",
-      "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.64.8",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:0b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-8-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/32"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e70e50",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-8"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
deleted file mode 100644
index 4d240a975f41ed3d6a1bca0482d2163a00ca8a31..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.80",
-      "kavlan-11": "10.7.213.80",
-      "kavlan-12": "10.11.213.80",
-      "kavlan-13": "10.15.213.80",
-      "kavlan-14": "10.19.213.80",
-      "kavlan-16": "10.27.213.80",
-      "kavlan-18": "10.35.213.80",
-      "kavlan-2": "192.168.209.80",
-      "kavlan-20": "10.43.213.80",
-      "kavlan-21": "10.47.213.80",
-      "kavlan-3": "192.168.225.80",
-      "kavlan-4": "10.16.1.80",
-      "kavlan-5": "10.16.65.80",
-      "kavlan-6": "10.16.129.80",
-      "kavlan-7": "10.16.193.80",
-      "kavlan-8": "10.17.1.80",
-      "kavlan-9": "10.17.65.80"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.80",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:d8",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-80.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/5",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:d9",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:da",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92d1",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.80",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d1",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-80-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b92d2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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.64.80",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:db",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-80-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/30"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu5"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60b2a",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-80"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
deleted file mode 100644
index c48dc3b8cb3115e61f3e570645cd01583c5ded49..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.81",
-      "kavlan-11": "10.7.213.81",
-      "kavlan-12": "10.11.213.81",
-      "kavlan-13": "10.15.213.81",
-      "kavlan-14": "10.19.213.81",
-      "kavlan-16": "10.27.213.81",
-      "kavlan-18": "10.35.213.81",
-      "kavlan-2": "192.168.209.81",
-      "kavlan-20": "10.43.213.81",
-      "kavlan-21": "10.47.213.81",
-      "kavlan-3": "192.168.225.81",
-      "kavlan-4": "10.16.1.81",
-      "kavlan-5": "10.16.65.81",
-      "kavlan-6": "10.16.129.81",
-      "kavlan-7": "10.16.193.81",
-      "kavlan-8": "10.17.1.81",
-      "kavlan-9": "10.17.65.81"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.81",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:24",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-81.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/8",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:25",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:26",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93a9",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.81",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a9",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-81-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93aa",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.81",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:27",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-81-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/31"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu5"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce88",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-81"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
deleted file mode 100644
index 0ed75fdd19a4bbc2c20f6db6895589a8ee4583d5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.82",
-      "kavlan-11": "10.7.213.82",
-      "kavlan-12": "10.11.213.82",
-      "kavlan-13": "10.15.213.82",
-      "kavlan-14": "10.19.213.82",
-      "kavlan-16": "10.27.213.82",
-      "kavlan-18": "10.35.213.82",
-      "kavlan-2": "192.168.209.82",
-      "kavlan-20": "10.43.213.82",
-      "kavlan-21": "10.47.213.82",
-      "kavlan-3": "192.168.225.82",
-      "kavlan-4": "10.16.1.82",
-      "kavlan-5": "10.16.65.82",
-      "kavlan-6": "10.16.129.82",
-      "kavlan-7": "10.16.193.82",
-      "kavlan-8": "10.17.1.82",
-      "kavlan-9": "10.17.65.82"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.82",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:b4",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-82.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/7",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:b5",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:b6",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9395",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.82",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:95",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-82-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9396",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:96",
-      "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.64.82",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:b7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-82-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/32"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu5"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce18",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-82"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
deleted file mode 100644
index d971fe2c1c9664803cae8732e93a4fecf0eb7407..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.84",
-      "kavlan-11": "10.7.213.84",
-      "kavlan-12": "10.11.213.84",
-      "kavlan-13": "10.15.213.84",
-      "kavlan-14": "10.19.213.84",
-      "kavlan-16": "10.27.213.84",
-      "kavlan-18": "10.35.213.84",
-      "kavlan-2": "192.168.209.84",
-      "kavlan-20": "10.43.213.84",
-      "kavlan-21": "10.47.213.84",
-      "kavlan-3": "192.168.225.84",
-      "kavlan-4": "10.16.1.84",
-      "kavlan-5": "10.16.65.84",
-      "kavlan-6": "10.16.129.84",
-      "kavlan-7": "10.16.193.84",
-      "kavlan-8": "10.17.1.84",
-      "kavlan-9": "10.17.65.84"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.84",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:18",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-84.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/9",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:19",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:1a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b939d",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.84",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9d",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-84-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b939e",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9e",
-      "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.64.84",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:1b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-84-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/34"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e9021d",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-84"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
deleted file mode 100644
index 9ad32328ccf49ce3b3f6978960630ee7201c538d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.85",
-      "kavlan-11": "10.7.213.85",
-      "kavlan-12": "10.11.213.85",
-      "kavlan-13": "10.15.213.85",
-      "kavlan-14": "10.19.213.85",
-      "kavlan-16": "10.27.213.85",
-      "kavlan-18": "10.35.213.85",
-      "kavlan-2": "192.168.209.85",
-      "kavlan-20": "10.43.213.85",
-      "kavlan-21": "10.47.213.85",
-      "kavlan-3": "192.168.225.85",
-      "kavlan-4": "10.16.1.85",
-      "kavlan-5": "10.16.65.85",
-      "kavlan-6": "10.16.129.85",
-      "kavlan-7": "10.16.193.85",
-      "kavlan-8": "10.17.1.85",
-      "kavlan-9": "10.17.65.85"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.85",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:ec",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-85.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/12",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:ed",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:ee",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9399",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.85",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:99",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-85-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b939a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9a",
-      "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.64.85",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:ef",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-85-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/1"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60b13",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-85"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
deleted file mode 100644
index aa25ad9952c66d431b12a71a51b8997be3c73463..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.87",
-      "kavlan-11": "10.7.213.87",
-      "kavlan-12": "10.11.213.87",
-      "kavlan-13": "10.15.213.87",
-      "kavlan-14": "10.19.213.87",
-      "kavlan-16": "10.27.213.87",
-      "kavlan-18": "10.35.213.87",
-      "kavlan-2": "192.168.209.87",
-      "kavlan-20": "10.43.213.87",
-      "kavlan-21": "10.47.213.87",
-      "kavlan-3": "192.168.225.87",
-      "kavlan-4": "10.16.1.87",
-      "kavlan-5": "10.16.65.87",
-      "kavlan-6": "10.16.129.87",
-      "kavlan-7": "10.16.193.87",
-      "kavlan-8": "10.17.1.87",
-      "kavlan-9": "10.17.65.87"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.87",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:58",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-87.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/14",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:59",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:5a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93ad",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.87",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ad",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-87-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93ae",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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.64.87",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:5b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-87-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/3"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce12",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-87"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
deleted file mode 100644
index b0047dce34b168b10d7ed02fbd8f6945e42f7cd5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.88",
-      "kavlan-11": "10.7.213.88",
-      "kavlan-12": "10.11.213.88",
-      "kavlan-13": "10.15.213.88",
-      "kavlan-14": "10.19.213.88",
-      "kavlan-16": "10.27.213.88",
-      "kavlan-18": "10.35.213.88",
-      "kavlan-2": "192.168.209.88",
-      "kavlan-20": "10.43.213.88",
-      "kavlan-21": "10.47.213.88",
-      "kavlan-3": "192.168.225.88",
-      "kavlan-4": "10.16.1.88",
-      "kavlan-5": "10.16.65.88",
-      "kavlan-6": "10.16.129.88",
-      "kavlan-7": "10.16.193.88",
-      "kavlan-8": "10.17.1.88",
-      "kavlan-9": "10.17.65.88"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.88",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:60",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-88.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/13",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:61",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:62",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93b1",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.88",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b1",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-88-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b93b2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b2",
-      "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.64.88",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:63",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-88-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/4"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8cdfd",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-88"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
deleted file mode 100644
index c73058dd25625c68eb47378a78a619fcfad34bf4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.89",
-      "kavlan-11": "10.7.213.89",
-      "kavlan-12": "10.11.213.89",
-      "kavlan-13": "10.15.213.89",
-      "kavlan-14": "10.19.213.89",
-      "kavlan-16": "10.27.213.89",
-      "kavlan-18": "10.35.213.89",
-      "kavlan-2": "192.168.209.89",
-      "kavlan-20": "10.43.213.89",
-      "kavlan-21": "10.47.213.89",
-      "kavlan-3": "192.168.225.89",
-      "kavlan-4": "10.16.1.89",
-      "kavlan-5": "10.16.65.89",
-      "kavlan-6": "10.16.129.89",
-      "kavlan-7": "10.16.193.89",
-      "kavlan-8": "10.17.1.89",
-      "kavlan-9": "10.17.65.89"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.89",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:98",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-89.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/16",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:99",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:9a",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5ced",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.89",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ed",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-89-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5cee",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c: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.64.89",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:9b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-89-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/5"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8cdcf",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-89"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
deleted file mode 100644
index f874665b79f5f67d1295b53b960d8bbdaefd74f0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.9",
-      "kavlan-11": "10.7.213.9",
-      "kavlan-12": "10.11.213.9",
-      "kavlan-13": "10.15.213.9",
-      "kavlan-14": "10.19.213.9",
-      "kavlan-16": "10.27.213.9",
-      "kavlan-18": "10.35.213.9",
-      "kavlan-2": "192.168.209.9",
-      "kavlan-20": "10.43.213.9",
-      "kavlan-21": "10.47.213.9",
-      "kavlan-3": "192.168.225.9",
-      "kavlan-4": "10.16.1.9",
-      "kavlan-5": "10.16.65.9",
-      "kavlan-6": "10.16.129.9",
-      "kavlan-7": "10.16.193.9",
-      "kavlan-8": "10.17.1.9",
-      "kavlan-9": "10.17.65.9"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.9",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:84",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-9.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene1",
-      "switch_port": "GigabitEthernet1/0/11",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:85",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:86",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b9169",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.9",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:69",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-9-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b916a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6a",
-      "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.64.9",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:87",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-9-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene1-ipmi",
-      "switch_port": "1/0/33"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6bf36",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-9"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
deleted file mode 100644
index f7cdf1e60093a33acd218c738358b66df433cb50..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.90",
-      "kavlan-11": "10.7.213.90",
-      "kavlan-12": "10.11.213.90",
-      "kavlan-13": "10.15.213.90",
-      "kavlan-14": "10.19.213.90",
-      "kavlan-16": "10.27.213.90",
-      "kavlan-18": "10.35.213.90",
-      "kavlan-2": "192.168.209.90",
-      "kavlan-20": "10.43.213.90",
-      "kavlan-21": "10.47.213.90",
-      "kavlan-3": "192.168.225.90",
-      "kavlan-4": "10.16.1.90",
-      "kavlan-5": "10.16.65.90",
-      "kavlan-6": "10.16.129.90",
-      "kavlan-7": "10.16.193.90",
-      "kavlan-8": "10.17.1.90",
-      "kavlan-9": "10.17.65.90"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.90",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:64",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-90.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/15",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:65",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:66",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d09",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.90",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:09",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-90-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5d0a",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0a",
-      "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.64.90",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:67",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-90-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/6"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce40",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-90"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
deleted file mode 100644
index 9f06b18527dc8377663efcf805f463889554c29c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.92",
-      "kavlan-11": "10.7.213.92",
-      "kavlan-12": "10.11.213.92",
-      "kavlan-13": "10.15.213.92",
-      "kavlan-14": "10.19.213.92",
-      "kavlan-16": "10.27.213.92",
-      "kavlan-18": "10.35.213.92",
-      "kavlan-2": "192.168.209.92",
-      "kavlan-20": "10.43.213.92",
-      "kavlan-21": "10.47.213.92",
-      "kavlan-3": "192.168.225.92",
-      "kavlan-4": "10.16.1.92",
-      "kavlan-5": "10.16.65.92",
-      "kavlan-6": "10.16.129.92",
-      "kavlan-7": "10.16.193.92",
-      "kavlan-8": "10.17.1.92",
-      "kavlan-9": "10.17.65.92"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.92",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:07:a4",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-92.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/17",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:a5",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:a6",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5ce5",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.92",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:e5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-92-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5ce6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c: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.64.92",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:07:a7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-92-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/8"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu5"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e60b32",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-92"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
deleted file mode 100644
index 11cd5a369314db35f13eab69678d145c6315b84e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.93",
-      "kavlan-11": "10.7.213.93",
-      "kavlan-12": "10.11.213.93",
-      "kavlan-13": "10.15.213.93",
-      "kavlan-14": "10.19.213.93",
-      "kavlan-16": "10.27.213.93",
-      "kavlan-18": "10.35.213.93",
-      "kavlan-2": "192.168.209.93",
-      "kavlan-20": "10.43.213.93",
-      "kavlan-21": "10.47.213.93",
-      "kavlan-3": "192.168.225.93",
-      "kavlan-4": "10.16.1.93",
-      "kavlan-5": "10.16.65.93",
-      "kavlan-6": "10.16.129.93",
-      "kavlan-7": "10.16.193.93",
-      "kavlan-8": "10.17.1.93",
-      "kavlan-9": "10.17.65.93"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.93",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:4c",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-93.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/20",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:4d",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:4e",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5ead",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.93",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:ad",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-93-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5eae",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e: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.64.93",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:4f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-93-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/9"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu5"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fffd",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-93"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
deleted file mode 100644
index 72856d10a9026c7f1f7a720178a92ec0d4a8d8da..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.95",
-      "kavlan-11": "10.7.213.95",
-      "kavlan-12": "10.11.213.95",
-      "kavlan-13": "10.15.213.95",
-      "kavlan-14": "10.19.213.95",
-      "kavlan-16": "10.27.213.95",
-      "kavlan-18": "10.35.213.95",
-      "kavlan-2": "192.168.209.95",
-      "kavlan-20": "10.43.213.95",
-      "kavlan-21": "10.47.213.95",
-      "kavlan-3": "192.168.225.95",
-      "kavlan-4": "10.16.1.95",
-      "kavlan-5": "10.16.65.95",
-      "kavlan-6": "10.16.129.95",
-      "kavlan-7": "10.16.193.95",
-      "kavlan-8": "10.17.1.95",
-      "kavlan-9": "10.17.65.95"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.95",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:06:c0",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-95.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/22",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:c1",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:c2",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5e95",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.95",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:95",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-95-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5e96",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:96",
-      "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.64.95",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:06:c3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-95-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/11"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu5"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e6855b",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-95"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
deleted file mode 100644
index c0f9a4f52782afdb4e7fd38b946509a3d33ed0e4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.97",
-      "kavlan-11": "10.7.213.97",
-      "kavlan-12": "10.11.213.97",
-      "kavlan-13": "10.15.213.97",
-      "kavlan-14": "10.19.213.97",
-      "kavlan-16": "10.27.213.97",
-      "kavlan-18": "10.35.213.97",
-      "kavlan-2": "192.168.209.97",
-      "kavlan-20": "10.43.213.97",
-      "kavlan-21": "10.47.213.97",
-      "kavlan-3": "192.168.225.97",
-      "kavlan-4": "10.16.1.97",
-      "kavlan-5": "10.16.65.97",
-      "kavlan-6": "10.16.129.97",
-      "kavlan-7": "10.16.193.97",
-      "kavlan-8": "10.17.1.97",
-      "kavlan-9": "10.17.65.97"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.97",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:00",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-97.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/24",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:01",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:02",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5ed5",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.97",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:d5",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-97-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5ed6",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e: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.64.97",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:03",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-97-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/13"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu5"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8fc48",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-97"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
deleted file mode 100644
index 5914b837b1d1aa77f6514f40ce6e85cfa53a143e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "architecture": {
-    "nb_cores": 4,
-    "nb_procs": 1,
-    "nb_threads": 4,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "02/18/2011",
-    "vendor": "American Megatrends Inc.",
-    "version": "V7.01e"
-  },
-  "chassis": {
-    "manufacturer": "TYAN",
-    "name": "S5501"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.99",
-      "kavlan-11": "10.7.213.99",
-      "kavlan-12": "10.11.213.99",
-      "kavlan-13": "10.15.213.99",
-      "kavlan-14": "10.19.213.99",
-      "kavlan-16": "10.27.213.99",
-      "kavlan-18": "10.35.213.99",
-      "kavlan-2": "192.168.209.99",
-      "kavlan-20": "10.43.213.99",
-      "kavlan-21": "10.47.213.99",
-      "kavlan-3": "192.168.225.99",
-      "kavlan-4": "10.16.1.99",
-      "kavlan-5": "10.16.65.99",
-      "kavlan-6": "10.16.129.99",
-      "kavlan-7": "10.16.193.99",
-      "kavlan-8": "10.17.1.99",
-      "kavlan-9": "10.17.65.99"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "shared"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "ip": "172.16.64.99",
-      "kavlan": true,
-      "mac": "00:e0:81:d5:08:d4",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp3s0",
-      "network_address": "graphene-99.nancy.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "sgraphene3",
-      "switch_port": "GigabitEthernet1/0/26",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "e1000e",
-      "enabled": true,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:d5",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp4s0",
-      "rate": 100000000,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "e1000e",
-      "enabled": false,
-      "firmware_version": "1.8-0",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:d6",
-      "management": false,
-      "model": "82574L Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp5s0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "ib0",
-      "driver": "mlx4_core",
-      "enabled": true,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5eb1",
-      "interface": "InfiniBand",
-      "ip": "172.18.64.99",
-      "kavlan": false,
-      "mac": "80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:b1",
-      "management": false,
-      "model": "MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]",
-      "mountable": true,
-      "mounted": true,
-      "name": "ib0",
-      "netmask": "255.255.255.0",
-      "network_address": "graphene-99-ib0.nancy.grid5000.fr",
-      "rate": 20000000000,
-      "switch": "sgrapheneib",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "ib1",
-      "driver": "mlx4_core",
-      "enabled": false,
-      "firmware_version": "2.9.1000",
-      "guid": "0x0002c903000b5eb2",
-      "interface": "InfiniBand",
-      "kavlan": false,
-      "mac": "80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:b2",
-      "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.64.99",
-      "kavlan": false,
-      "mac": "00:e0:81:d5:08:d7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "graphene-99-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/15"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "acpi-cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "performance": {
-    "core_flops": 8024000000.0,
-    "node_flops": 31010000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 8388608,
-    "clock_speed": 2550000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Lynnfield",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz",
-    "vendor": "Intel",
-    "version": "X3440"
-  },
-  "sensors": {
-    "power": {
-      "available": true,
-      "via": {
-        "api": {
-          "metric": "power"
-        },
-        "pdu": [
-          {
-            "uid": "graphene-pdu6"
-          }
-        ]
-      }
-    }
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000cca371e8ce36",
-      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
-      "device": "sda",
-      "driver": "ahci",
-      "firmware_version": "JPFOA3EA",
-      "interface": "SATA II",
-      "model": "Hitachi HDS72103",
-      "size": 320072933376,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "graphene-99"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
index 09ccb61d25b62e11b215f703ea04d18c2872fdb2..823c230747c2e0ec90cdf59048a2a40f86839c49 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
@@ -165,8 +165,6 @@
       "mountable": false,
       "mounted": false,
       "network_address": "graphite-1-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/41",
       "vendor": "DELL"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
index 1f2f981bc2eba07d0382add7039b026f1451e078..7a7ba9d06df3a1ff077431853e38f42028065e3d 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
@@ -165,8 +165,6 @@
       "mountable": false,
       "mounted": false,
       "network_address": "graphite-2-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/43",
       "vendor": "DELL"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
index 536b19e0bf87a309a18d72b251c2e13d27357af8..9ea68ad0ee39f3bf405b82ca770f58c97f158e60 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
@@ -165,8 +165,6 @@
       "mountable": false,
       "mounted": false,
       "network_address": "graphite-3-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/45",
       "vendor": "DELL"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
index 66e84ad713f1d32c94c9942c5bf7bef7c8300c34..ca0533300d7f7bdf7f6ef30aaae9ceca2258ea84 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
@@ -165,8 +165,6 @@
       "mountable": false,
       "mounted": false,
       "network_address": "graphite-4-bmc.nancy.grid5000.fr",
-      "switch": "sgraphene3-ipmi",
-      "switch_port": "1/0/47",
       "vendor": "DELL"
     }
   ],
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json b/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
deleted file mode 100644
index ecb8949658f3d80077b4c268965a13e633d288ae..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
-  "backplane_bps": 176000000000,
-  "kind": "switch",
-  "linecards": [
-    {
-      "kavlan_pattern": "%PORT%",
-      "kind": "node",
-      "port": "eth0",
-      "ports": [
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-2"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-4"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-6"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-5"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-10"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-7"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-12"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-11"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-9"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-8"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-14"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-13"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-16"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-15"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-18"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-17"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-20"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-19"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-22"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-21"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-24"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-23"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-26"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-25"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-27"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-30"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-29"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-32"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-31"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-34"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-33"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-35"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-38"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-37"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet1/%LINECARD%/%PORT%"
-    },
-    {
-      "kind": "switch",
-      "ports": [
-        {
-        },
-        {
-          "kind": "switch",
-          "uid": "sgravillon1"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-    }
-  ],
-  "model": "3com 4510G",
-  "monitoring": {
-    "metric": "power",
-    "wattmeter": "multiple"
-  },
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    },
-    "power": {
-      "available": true,
-      "resolution": 1,
-      "via": {
-        "pdu": [
-          {
-            "port": 6,
-            "uid": "graphene-pdu1"
-          },
-          {
-            "port": 7,
-            "uid": "graphene-pdu2"
-          }
-        ]
-      }
-    }
-  },
-  "site": "nancy",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "sgraphene1",
-  "vlans": {
-    "vlan1": {
-      "addresses": [
-        "172.16.79.201"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "2014-10-01",
-  "weathermap": {
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene2.json b/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
deleted file mode 100644
index d2e5869e134ed70bab4d79b30ec5710575915069..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
-  "backplane_bps": 176000000000,
-  "kind": "switch",
-  "linecards": [
-    {
-      "kavlan_pattern": "%PORT%",
-      "kind": "node",
-      "port": "eth0",
-      "ports": [
-        {
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-41"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-42"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-43"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-45"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-46"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-47"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-48"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-49"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-50"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-51"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-52"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-53"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-55"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-57"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-58"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-59"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-60"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-62"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-63"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-64"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-65"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-66"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-67"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-68"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-69"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-70"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-71"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-72"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-73"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-74"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet1/%LINECARD%/%PORT%"
-    },
-    {
-      "kind": "switch",
-      "ports": [
-        {
-        },
-        {
-          "kind": "switch",
-          "uid": "sgravillon1"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-    }
-  ],
-  "model": "3com 4510G",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
-  "site": "nancy",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "sgraphene2",
-  "vlans": {
-    "vlan1": {
-      "addresses": [
-        "172.16.79.202"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "2014-10-01",
-  "weathermap": {
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json b/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
deleted file mode 100644
index 47bfcba526aeafb0002ac1e4930ebfcc5aca0b94..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
+++ /dev/null
@@ -1,184 +0,0 @@
-{
-  "backplane_bps": 176000000000,
-  "kind": "switch",
-  "linecards": [
-    {
-      "kavlan_pattern": "%PORT%",
-      "kind": "node",
-      "port": "eth0",
-      "ports": [
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-76"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-75"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-78"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-77"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-80"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-79"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-82"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-81"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-84"
-        },
-        {
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-85"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-88"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-87"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-90"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-89"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-92"
-        },
-        {
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-93"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-95"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-97"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-100"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-99"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-102"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-101"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-104"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-103"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet1/%LINECARD%/%PORT%"
-    },
-    {
-      "kind": "switch",
-      "ports": [
-        {
-        },
-        {
-          "kind": "switch",
-          "uid": "sgravillon1"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-    }
-  ],
-  "model": "3com 4510G",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
-  "site": "nancy",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "sgraphene3",
-  "vlans": {
-    "vlan1": {
-      "addresses": [
-        "172.16.79.203"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "2014-10-01",
-  "weathermap": {
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene4.json b/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
deleted file mode 100644
index ec1afeaa057627fad7c1feb73ea4ad91a8da8083..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
+++ /dev/null
@@ -1,241 +0,0 @@
-{
-  "backplane_bps": 176000000000,
-  "kind": "switch",
-  "linecards": [
-    {
-      "kavlan_pattern": "%PORT%",
-      "kind": "node",
-      "port": "eth0",
-      "ports": [
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-105"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-106"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-107"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-108"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-109"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-110"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-111"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-112"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-113"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-114"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-115"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-116"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-117"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-118"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-119"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-120"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-121"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-122"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-124"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-125"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-126"
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-128"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-129"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-130"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-131"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-132"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-133"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-134"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-135"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-136"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-137"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-138"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-139"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-140"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-141"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-142"
-        },
-        {
-          "kind": "node",
-          "port": "eth0",
-          "uid": "graphene-143"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet1/%LINECARD%/%PORT%"
-    },
-    {
-      "kind": "switch",
-      "ports": [
-        {
-        },
-        {
-          "kind": "switch",
-          "uid": "sgravillon1"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-    }
-  ],
-  "model": "3com 4510G",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
-  "site": "nancy",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "sgraphene4",
-  "vlans": {
-    "vlan1": {
-      "addresses": [
-        "172.16.79.204"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "2014-10-01",
-  "weathermap": {
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrapheneib.json b/data/grid5000/sites/nancy/network_equipments/sgrapheneib.json
deleted file mode 100644
index b3d45de278b209f875be9231e77d8db9ac339d2e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/network_equipments/sgrapheneib.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-  "kind": "switch",
-  "linecards": [
-    {
-    },
-    {
-    },
-    {
-    },
-    {
-    },
-    {
-    },
-    {
-    },
-    {
-    },
-    {
-    },
-    {
-    },
-    {
-    },
-    {
-    },
-    {
-    },
-    {
-      "kavlan_pattern": "%LINECARD%/%PORT%",
-      "kind": "switch",
-      "ports": [
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-          "kind": "node",
-          "uid": "node-mapping-undocumented-for-this-ib-switch"
-        }
-      ],
-      "rate": 20000000000,
-      "snmp_pattern": "%LINECARD%/%PORT%"
-    }
-  ],
-  "model": "Infiniband",
-  "sensors": {
-    "network": {
-      "available": false
-    }
-  },
-  "site": "nancy",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "sgrapheneib",
-  "vlans": {
-  },
-  "warranty": "2015-11-01",
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgravillon1.json b/data/grid5000/sites/nancy/network_equipments/sgravillon1.json
index 90f9dbca792a87be1066a080565f9c5660c7cd04..e05cde3583d57d1565949affdb643970e1aa5db5 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgravillon1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgravillon1.json
@@ -93,30 +93,6 @@
       "snmp_pattern": "B%PORT%"
     },
     {
-      "backplane_bps": 14400000000,
-      "kavlan_pattern": "C%PORT%",
-      "kind": "switch",
-      "model": "J8708A",
-      "ports": [
-        {
-        },
-        {
-          "kind": "switch",
-          "uid": "sgraphene1"
-        },
-        {
-          "kind": "switch",
-          "uid": "sgraphene2"
-        },
-        {
-        },
-        {
-          "kind": "switch",
-          "uid": "sgraphene4"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "C%PORT%"
     },
     {
       "backplane_bps": 14400000000,
@@ -135,12 +111,6 @@
           "kind": "other",
           "port": "eth2",
           "uid": "fgriffon2"
-        },
-        {
-        },
-        {
-          "kind": "switch",
-          "uid": "sgraphene3"
         }
       ],
       "rate": 10000000000,
diff --git a/data/grid5000/sites/nancy/pdus/graphene-pdu1.json b/data/grid5000/sites/nancy/pdus/graphene-pdu1.json
deleted file mode 100644
index 30f157d3fa96b57b8872639c041c57cc0f421fcc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/graphene-pdu1.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "ip": "172.17.79.208",
-  "mac": "00:C0:B7:4D:A4:B0",
-  "model": "AP7953",
-  "ports": {
-    "10": "graphene-13",
-    "11": "graphene-14",
-    "12": "graphene-15",
-    "13": "graphene-16",
-    "14": "graphene-17",
-    "15": "graphene-18",
-    "17": "graphene-26",
-    "18": "graphene-27",
-    "19": "graphene-28",
-    "2": "graphene-1",
-    "20": "graphene-29",
-    "21": "graphene-30",
-    "22": "graphene-31",
-    "23": "graphene-32",
-    "3": "graphene-2",
-    "4": "graphene-3",
-    "5": "graphene-4",
-    "9": "graphene-12"
-  },
-  "sensors": [
-    {
-      "power": {
-        "per_outlets": false,
-        "resolution": 1,
-        "snmp": {
-          "available": true,
-          "total_oids": [
-            "iso.3.6.1.4.1.318.1.1.12.1.16.0"
-          ],
-          "unit": "W"
-        }
-      }
-    }
-  ],
-  "type": "pdu",
-  "uid": "graphene-pdu1",
-  "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/graphene-pdu2.json b/data/grid5000/sites/nancy/pdus/graphene-pdu2.json
deleted file mode 100644
index 8c6be0fd0a1b669af511fa2205809f509d6c2cab..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/graphene-pdu2.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "ip": "172.17.79.209",
-  "mac": "00:C0:B7:4D:A4:A3",
-  "model": "AP7953",
-  "ports": {
-    "1": "graphene-5",
-    "10": "graphene-20",
-    "11": "graphene-21",
-    "12": "graphene-22",
-    "13": "graphene-23",
-    "14": "graphene-24",
-    "15": "graphene-25",
-    "17": "graphene-33",
-    "18": "graphene-34",
-    "19": "graphene-35",
-    "2": "graphene-6",
-    "20": "graphene-36",
-    "21": "graphene-37",
-    "22": "graphene-38",
-    "23": "graphene-39",
-    "3": "graphene-7",
-    "4": "graphene-8",
-    "5": "graphene-9",
-    "6": "graphene-10",
-    "7": "graphene-11",
-    "9": "graphene-19"
-  },
-  "sensors": [
-    {
-      "power": {
-        "per_outlets": false,
-        "resolution": 1,
-        "snmp": {
-          "available": true,
-          "total_oids": [
-            "iso.3.6.1.4.1.318.1.1.12.1.16.0"
-          ],
-          "unit": "W"
-        }
-      }
-    }
-  ],
-  "type": "pdu",
-  "uid": "graphene-pdu2",
-  "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/graphene-pdu3.json b/data/grid5000/sites/nancy/pdus/graphene-pdu3.json
deleted file mode 100644
index 6748b3bc9d1e566531a8cdd13b5ff599ceaa462f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/graphene-pdu3.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "ip": "172.17.79.210",
-  "mac": "00:C0:B7:4D:A4:AA",
-  "model": "AP7953",
-  "ports": {
-    "10": "graphene-48",
-    "11": "graphene-49",
-    "12": "graphene-50",
-    "13": "graphene-51",
-    "14": "graphene-52",
-    "15": "graphene-53",
-    "17": "graphene-61",
-    "18": "graphene-62",
-    "19": "graphene-63",
-    "20": "graphene-64",
-    "21": "graphene-65",
-    "22": "graphene-66",
-    "23": "graphene-67",
-    "3": "graphene-40",
-    "4": "graphene-41",
-    "5": "graphene-42",
-    "9": "graphene-47"
-  },
-  "sensors": [
-    {
-      "power": {
-        "per_outlets": false,
-        "resolution": 1,
-        "snmp": {
-          "available": true,
-          "total_oids": [
-            "iso.3.6.1.4.1.318.1.1.12.1.16.0"
-          ],
-          "unit": "W"
-        }
-      }
-    }
-  ],
-  "type": "pdu",
-  "uid": "graphene-pdu3",
-  "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/graphene-pdu4.json b/data/grid5000/sites/nancy/pdus/graphene-pdu4.json
deleted file mode 100644
index f7e8f8aa08114e072c876a9a82b8dd1c78d27246..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/graphene-pdu4.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "ip": "172.17.79.211",
-  "mac": "00:C0:B7:4D:A4:BC",
-  "model": "AP7953",
-  "ports": {
-    "1": "graphene-43",
-    "11": "graphene-56",
-    "12": "graphene-57",
-    "13": "graphene-58",
-    "14": "graphene-59",
-    "15": "graphene-60",
-    "17": "graphene-68",
-    "18": "graphene-69",
-    "19": "graphene-70",
-    "2": "graphene-44",
-    "20": "graphene-71",
-    "21": "graphene-72",
-    "22": "graphene-73",
-    "23": "graphene-74",
-    "3": "graphene-45",
-    "4": "graphene-46",
-    "6": "graphene-54",
-    "7": "graphene-55"
-  },
-  "sensors": [
-    {
-      "power": {
-        "per_outlets": false,
-        "resolution": 1,
-        "snmp": {
-          "available": true,
-          "total_oids": [
-            "iso.3.6.1.4.1.318.1.1.12.1.16.0"
-          ],
-          "unit": "W"
-        }
-      }
-    }
-  ],
-  "type": "pdu",
-  "uid": "graphene-pdu4",
-  "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/graphene-pdu5.json b/data/grid5000/sites/nancy/pdus/graphene-pdu5.json
deleted file mode 100644
index 97b4a131c54aca4682a33ca630b3c3aa0ce3cace..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/graphene-pdu5.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "ip": "172.17.79.212",
-  "mac": "00:C0:B7:4D:A4:AC",
-  "model": "AP7953",
-  "ports": {
-    "10": "graphene-78",
-    "11": "graphene-79",
-    "12": "graphene-80",
-    "13": "graphene-81",
-    "14": "graphene-82",
-    "15": "graphene-83",
-    "17": "graphene-91",
-    "18": "graphene-92",
-    "19": "graphene-93",
-    "20": "graphene-94",
-    "21": "graphene-95",
-    "22": "graphene-96",
-    "23": "graphene-97",
-    "9": "graphene-77"
-  },
-  "sensors": [
-    {
-      "power": {
-        "per_outlets": false,
-        "resolution": 1,
-        "snmp": {
-          "available": true,
-          "total_oids": [
-            "iso.3.6.1.4.1.318.1.1.12.1.16.0"
-          ],
-          "unit": "W"
-        }
-      }
-    }
-  ],
-  "type": "pdu",
-  "uid": "graphene-pdu5",
-  "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/graphene-pdu6.json b/data/grid5000/sites/nancy/pdus/graphene-pdu6.json
deleted file mode 100644
index ec2e88df2fe81ac604db27cab3c2a02247ab4cf7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/graphene-pdu6.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "ip": "172.17.79.213",
-  "mac": "00:C0:B7:4D:A1:87",
-  "model": "AP7953",
-  "ports": {
-    "10": "graphene-85",
-    "11": "graphene-86",
-    "12": "graphene-87",
-    "13": "graphene-88",
-    "14": "graphene-89",
-    "15": "graphene-90",
-    "17": "graphene-98",
-    "18": "graphene-99",
-    "19": "graphene-100",
-    "20": "graphene-101",
-    "21": "graphene-102",
-    "22": "graphene-103",
-    "23": "graphene-104",
-    "6": "graphene-75",
-    "7": "graphene-76",
-    "9": "graphene-84"
-  },
-  "sensors": [
-    {
-      "power": {
-        "per_outlets": false,
-        "resolution": 1,
-        "snmp": {
-          "available": true,
-          "total_oids": [
-            "iso.3.6.1.4.1.318.1.1.12.1.16.0"
-          ],
-          "unit": "W"
-        }
-      }
-    }
-  ],
-  "type": "pdu",
-  "uid": "graphene-pdu6",
-  "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/graphene-pdu7.json b/data/grid5000/sites/nancy/pdus/graphene-pdu7.json
deleted file mode 100644
index c78acb269f5684d625bc24f855a6f3f99a7b9c25..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/graphene-pdu7.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "ip": "172.17.79.214",
-  "mac": "00:C0:B7:4D:D7:87",
-  "model": "",
-  "ports": {
-    "1": "graphene-105",
-    "11": "graphene-113",
-    "12": "graphene-114",
-    "13": "graphene-115",
-    "14": "graphene-116",
-    "17": "graphene-117",
-    "18": "graphene-118",
-    "19": "graphene-119",
-    "2": "graphene-106",
-    "20": "graphene-120",
-    "21": "graphene-121",
-    "22": "graphene-122",
-    "23": "graphene-123",
-    "24": "graphene-124",
-    "3": "graphene-107",
-    "4": "graphene-108",
-    "5": "graphene-109",
-    "6": "graphene-110",
-    "7": "graphene-111",
-    "8": "graphene-112"
-  },
-  "sensors": [
-    {
-      "power": {
-        "per_outlets": true,
-        "resolution": 60,
-        "snmp": {
-          "available": true,
-          "outlet_prefix_oid": "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0",
-          "total_oids": [
-            "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1",
-            "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
-          ],
-          "unit": "W"
-        }
-      }
-    }
-  ],
-  "type": "pdu",
-  "uid": "graphene-pdu7",
-  "vendor": "Eaton Corporation"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/graphene-pdu8.json b/data/grid5000/sites/nancy/pdus/graphene-pdu8.json
deleted file mode 100644
index 67971686cf21b4266971f338b3b3b15579631ea4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/graphene-pdu8.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "ip": "172.17.79.215",
-  "mac": "00:C0:B7:4D:A1:87",
-  "model": "",
-  "ports": {
-    "1": "graphene-125",
-    "11": "graphene-133",
-    "12": "graphene-134",
-    "13": "graphene-135",
-    "14": "graphene-136",
-    "17": "graphene-137",
-    "18": "graphene-138",
-    "19": "graphene-139",
-    "2": "graphene-126",
-    "20": "graphene-140",
-    "21": "graphene-141",
-    "22": "graphene-142",
-    "23": "graphene-143",
-    "24": "graphene-144",
-    "3": "graphene-127",
-    "4": "graphene-128",
-    "5": "graphene-129",
-    "6": "graphene-130",
-    "7": "graphene-131",
-    "8": "graphene-132"
-  },
-  "sensors": [
-    {
-      "power": {
-        "per_outlets": true,
-        "resolution": 60,
-        "snmp": {
-          "available": true,
-          "outlet_prefix_oid": "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0",
-          "total_oids": [
-            "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1",
-            "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
-          ],
-          "unit": "W"
-        }
-      }
-    }
-  ],
-  "type": "pdu",
-  "uid": "graphene-pdu8",
-  "vendor": "Eaton Corporation"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml b/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml
deleted file mode 100644
index 1bb6bfa341c74eeab7dec6edad458ab98bf21ff6..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/graphene.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-# Cluster description
-model: Carri System 5393
-created_at: 2011-01-20
-kavlan: true
-#production: true
-queues:
-  - default
-  - admin
-
-# Retired nodes
-nodes:
-
-# Global node properties
-  graphene-[1-144]:
-    processor:
-      microarchitecture: Lynnfield
-    performance:
-      core_flops: 8.024e+9
-      node_flops: 31.01e+9
-    supported_job_types:
-     deploy: true
-     besteffort: true
-     max_walltime: 0
-     queues: 
-       - default
-       - admin
-    storage_devices:
-      sda:
-        interface: SATA II
-        driver: ahci
-        storage: HDD
-    network_adapters:
-      eth0:
-        enabled: true
-        mountable: true
-        bridged: true
-        mounted: true
-      eth1:
-        enabled: true
-        mountable: false
-        bridged: false
-        mounted: false
-      eth2:
-        enabled: false
-        mountable: false
-        mounted: false
-        bridged: false
-      ib0:
-        enabled: true
-        mountable: true
-        mounted: true
-        netmask: 255.255.255.0
-      ib1:
-        enabled: false
-        mountable: false
-        mounted: false
-      bmc:
-        interface: Ethernet
-        enabled: true
-        mounted: false
-        mountable: false
-    gpu:
-     gpu: false
-    sensors:
-      power:
-        available: true
diff --git a/input/grid5000/sites/nancy/clusters/graphene/graphene_extra.yaml b/input/grid5000/sites/nancy/clusters/graphene/graphene_extra.yaml
deleted file mode 100644
index b00ec018af247200f82f9ce838e8214bb594cfa3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/graphene_extra.yaml
+++ /dev/null
@@ -1,1601 +0,0 @@
----
-nodes:
-  graphene-[1-104]:
-    monitoring:
-      wattmeter: shared
-      metric: power
-
-  graphene-[105-144]:
-    monitoring:
-      wattmeter: true
-      metric: power
-
-  graphene-[1-144]:
-    network_adapters:
-      ib0:
-        switch: sgrapheneib
-
-  graphene-1:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/2
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/25
-    pdu:
-      - uid: graphene-pdu1
-        port: 2
-  graphene-2:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/1
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/26
-    pdu:
-      - uid: graphene-pdu1
-        port: 3
-  graphene-3:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/4
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/27
-    pdu:
-      - uid: graphene-pdu1
-        port: 4
-  graphene-4:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/3
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/28
-    pdu:
-      - uid: graphene-pdu1
-        port: 5
-  graphene-5:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/6
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/29
-    pdu:
-      - uid: graphene-pdu2
-        port: 1
-  graphene-6:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/5
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/30
-    pdu:
-      - uid: graphene-pdu2
-        port: 2
-  graphene-7:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/8
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/31
-    pdu:
-      - uid: graphene-pdu2
-        port: 3
-  graphene-8:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/12
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/32
-    pdu:
-      - uid: graphene-pdu2
-        port: 4
-  graphene-9:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/11
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/33
-    pdu:
-      - uid: graphene-pdu2
-        port: 5
-  graphene-10:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/7
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/34
-    pdu:
-      - uid: graphene-pdu2
-        port: 6
-  graphene-11:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/10
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/35
-    pdu:
-      - uid: graphene-pdu2
-        port: 7
-  graphene-12:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/9
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/36
-    pdu:
-      - uid: graphene-pdu1
-        port: 9
-  graphene-13:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/14
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/37
-    pdu:
-      - uid: graphene-pdu1
-        port: 10
-  graphene-14:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/13
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/38
-    pdu:
-      - uid: graphene-pdu1
-        port: 11
-  graphene-15:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/16
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/39
-    pdu:
-      - uid: graphene-pdu1
-        port: 12
-  graphene-16:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/15
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/40
-    pdu:
-      - uid: graphene-pdu1
-        port: 13
-  graphene-17:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/18
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/41
-    pdu:
-      - uid: graphene-pdu1
-        port: 14
-  graphene-18:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/17
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/42
-    pdu:
-      - uid: graphene-pdu1
-        port: 15
-  graphene-19:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/20
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/43
-    pdu:
-      - uid: graphene-pdu2
-        port: 9
-  graphene-20:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/19
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/44
-    pdu:
-      - uid: graphene-pdu2
-        port: 10
-  graphene-21:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/22
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/1
-    pdu:
-      - uid: graphene-pdu2
-        port: 11
-  graphene-22:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/21
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/2
-    pdu:
-      - uid: graphene-pdu2
-        port: 12
-  graphene-23:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/24
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/3
-    pdu:
-      - uid: graphene-pdu2
-        port: 13
-  graphene-24:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/23
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/4
-    pdu:
-      - uid: graphene-pdu2
-        port: 14
-  graphene-25:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/26
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/5
-    pdu:
-      - uid: graphene-pdu2
-        port: 15
-  graphene-26:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/25
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/6
-    pdu:
-      - uid: graphene-pdu1
-        port: 17
-  graphene-27:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/28
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/7
-    pdu:
-      - uid: graphene-pdu1
-        port: 18
-  graphene-28:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/27
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/8
-    pdu:
-      - uid: graphene-pdu1
-        port: 19
-  graphene-29:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/30
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/9
-    pdu:
-      - uid: graphene-pdu1
-        port: 20
-  graphene-30:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/29
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/10
-    pdu:
-      - uid: graphene-pdu1
-        port: 21
-  graphene-31:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/32
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/11
-    pdu:
-      - uid: graphene-pdu1
-        port: 22
-  graphene-32:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/31
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/12
-    pdu:
-      - uid: graphene-pdu1
-        port: 23
-  graphene-33:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/34
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/13
-    pdu:
-      - uid: graphene-pdu2
-        port: 17
-  graphene-34:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/33
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/14
-    pdu:
-      - uid: graphene-pdu2
-        port: 18
-  graphene-35:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/36
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/15
-    pdu:
-      - uid: graphene-pdu2
-        port: 19
-  graphene-36:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/35
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/16
-    pdu:
-      - uid: graphene-pdu2
-        port: 20
-  graphene-37:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/38
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/17
-    pdu:
-      - uid: graphene-pdu2
-        port: 21
-  graphene-38:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/37
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/18
-    pdu:
-      - uid: graphene-pdu2
-        port: 22
-  graphene-39:
-    network_adapters:
-      eth0:
-        switch: sgraphene1
-        switch_port: Gi1/0/40
-      bmc:
-        switch: sgraphene1-ipmi
-        switch_port: 1/0/19
-    pdu:
-      - uid: graphene-pdu2
-        port: 23
-  graphene-40:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/1
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/25
-    pdu:
-      - uid: graphene-pdu3
-        port: 3
-  graphene-41:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/2
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/26
-    pdu:
-      - uid: graphene-pdu3
-        port: 4
-  graphene-42:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/3
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/27
-    pdu:
-      - uid: graphene-pdu3
-        port: 5
-  graphene-43:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/4
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/28
-    pdu:
-      - uid: graphene-pdu4
-        port: 1
-  graphene-44:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/5
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/29
-    pdu:
-      - uid: graphene-pdu4
-        port: 2
-  graphene-45:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/6
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/30
-    pdu:
-      - uid: graphene-pdu4
-        port: 3
-  graphene-46:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/7
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/31
-    pdu:
-      - uid: graphene-pdu4
-        port: 4
-  graphene-47:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/8
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/32
-    pdu:
-      - uid: graphene-pdu3
-        port: 9
-  graphene-48:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/9
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/33
-    pdu:
-      - uid: graphene-pdu3
-        port: 10
-  graphene-49:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/10
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/34
-    pdu:
-      - uid: graphene-pdu3
-        port: 11
-  graphene-50:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/11
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/35
-    pdu:
-      - uid: graphene-pdu3
-        port: 12
-  graphene-51:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/12
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/36
-    pdu:
-      - uid: graphene-pdu3
-        port: 13
-  graphene-52:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/13
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/37
-    pdu:
-      - uid: graphene-pdu3
-        port: 14
-  graphene-53:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/14
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/38
-    pdu:
-      - uid: graphene-pdu3
-        port: 15
-  graphene-54:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/15
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/39
-    pdu:
-      - uid: graphene-pdu4
-        port: 6
-  graphene-55:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/16
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/40
-    pdu:
-      - uid: graphene-pdu4
-        port: 7
-  graphene-56:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/17
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/1
-    pdu:
-      - uid: graphene-pdu4
-        port: 11
-  graphene-57:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/18
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/2
-    pdu:
-      - uid: graphene-pdu4
-        port: 12
-  graphene-58:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/19
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/3
-    pdu:
-      - uid: graphene-pdu4
-        port: 13
-  graphene-59:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/20
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/4
-    pdu:
-      - uid: graphene-pdu4
-        port: 14
-  graphene-60:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/21
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/5
-    pdu:
-      - uid: graphene-pdu4
-        port: 15
-  graphene-61:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/22
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/6
-    pdu:
-      - uid: graphene-pdu3
-        port: 17
-  graphene-62:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/23
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/7
-    pdu:
-      - uid: graphene-pdu3
-        port: 18
-  graphene-63:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/24
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/8
-    pdu:
-      - uid: graphene-pdu3
-        port: 19
-  graphene-64:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/25
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/9
-    pdu:
-      - uid: graphene-pdu3
-        port: 20
-  graphene-65:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/26
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/10
-    pdu:
-      - uid: graphene-pdu3
-        port: 21
-  graphene-66:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/27
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/11
-    pdu:
-      - uid: graphene-pdu3
-        port: 22
-  graphene-67:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/28
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/12
-    pdu:
-      - uid: graphene-pdu3
-        port: 23
-  graphene-68:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/29
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/13
-    pdu:
-      - uid: graphene-pdu4
-        port: 17
-  graphene-69:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/30
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/14
-    pdu:
-      - uid: graphene-pdu4
-        port: 18
-  graphene-70:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/31
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/15
-    pdu:
-      - uid: graphene-pdu4
-        port: 19
-  graphene-71:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/32
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/16
-    pdu:
-      - uid: graphene-pdu4
-        port: 20
-  graphene-72:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/33
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/17
-    pdu:
-      - uid: graphene-pdu4
-        port: 21
-  graphene-73:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/34
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/18
-    pdu:
-      - uid: graphene-pdu4
-        port:  22
-  graphene-74:
-    network_adapters:
-      eth0:
-        switch: sgraphene2
-        switch_port: Gi1/0/35
-      bmc:
-        switch: sgraphene2-ipmi
-        switch_port: 1/0/19
-    pdu:
-      - uid: graphene-pdu4
-        port: 23
-  graphene-75:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/2
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/25
-    pdu:
-      - uid: graphene-pdu6
-        port: 6
-  graphene-76:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/1
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/26
-    pdu:
-      - uid: graphene-pdu6
-        port: 7
-  graphene-77:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/4
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/27
-    pdu:
-      - uid: graphene-pdu5
-        port: 9
-  graphene-78:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/3
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/28
-    pdu:
-      - uid: graphene-pdu5
-        port: 10
-  graphene-79:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/6
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/29
-    pdu:
-      - uid: graphene-pdu5
-        port: 11
-  graphene-80:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/5
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/30
-    pdu:
-      - uid: graphene-pdu5
-        port: 12
-  graphene-81:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/8
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/31
-    pdu:
-      - uid: graphene-pdu5
-        port: 13
-  graphene-82:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/7
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/32
-    pdu:
-      - uid: graphene-pdu5
-        port: 14
-  graphene-83:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/10
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/33
-    pdu:
-      - uid: graphene-pdu5
-        port: 15
-  graphene-84:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/9
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/34
-    pdu:
-      - uid: graphene-pdu6
-        port: 9
-  graphene-85:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/12
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/1
-    pdu:
-      - uid: graphene-pdu6
-        port: 10
-  graphene-86:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/11
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/2
-    pdu:
-      - uid: graphene-pdu6
-        port: 11
-  graphene-87:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/14
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/3
-    pdu:
-      - uid: graphene-pdu6
-        port: 12
-  graphene-88:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/13
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/4
-    pdu:
-      - uid: graphene-pdu6
-        port: 13
-  graphene-89:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/16
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/5
-    pdu:
-      - uid: graphene-pdu6
-        port: 14
-  graphene-90:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/15
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/6
-    pdu:
-      - uid: graphene-pdu6
-        port: 15
-  graphene-91:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/18
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/7
-    pdu:
-      - uid: graphene-pdu5
-        port: 17
-  graphene-92:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/17
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/8
-    pdu:
-      - uid: graphene-pdu5
-        port: 18
-  graphene-93:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/20
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/9
-    pdu:
-      - uid: graphene-pdu5
-        port: 19
-  graphene-94:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/19
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/10
-    pdu:
-      - uid: graphene-pdu5
-        port: 20
-  graphene-95:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/22
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/11
-    pdu:
-      - uid: graphene-pdu5
-        port: 21
-  graphene-96:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/21
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/12
-    pdu:
-      - uid: graphene-pdu5
-        port: 22
-  graphene-97:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/24
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/13
-    pdu:
-      - uid: graphene-pdu5
-        port: 23
-  graphene-98:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/23
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/14
-    pdu:
-      - uid: graphene-pdu6
-        port: 17
-  graphene-99:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/26
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/15
-    pdu:
-      - uid: graphene-pdu6
-        port: 18
-  graphene-100:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/25
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/16
-    pdu:
-      - uid: graphene-pdu6
-        port: 19
-  graphene-101:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/28
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/17
-    pdu:
-      - uid: graphene-pdu6
-        port: 20
-  graphene-102:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/27
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/18
-    pdu:
-      - uid: graphene-pdu6
-        port: 21
-  graphene-103:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/30
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/19
-    pdu:
-      - uid: graphene-pdu6
-        port: 22
-  graphene-104:
-    network_adapters:
-      eth0:
-        switch: sgraphene3
-        switch_port: Gi1/0/29
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/20
-    pdu:
-      - uid: graphene-pdu6
-        port: 23
-  graphene-105:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/1
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/25
-    pdu:
-      - uid: graphene-pdu7
-        port: 1
-  graphene-106:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/2
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/26
-    pdu:
-      - uid: graphene-pdu7
-        port: 2
-  graphene-107:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/3
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/27
-    pdu:
-      - uid: graphene-pdu7
-        port: 3
-  graphene-108:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/4
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/28
-    pdu:
-      - uid: graphene-pdu7
-        port: 4
-  graphene-109:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/5
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/29
-    pdu:
-      - uid: graphene-pdu7
-        port: 5
-  graphene-110:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/6
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/30
-    pdu:
-      - uid: graphene-pdu7
-        port: 6
-  graphene-111:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/7
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/31
-    pdu:
-      - uid: graphene-pdu7
-        port: 7
-  graphene-112:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/8
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/32
-    pdu:
-      - uid: graphene-pdu7
-        port: 8
-  graphene-113:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/9
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/33
-    pdu:
-      - uid: graphene-pdu7
-        port: 11
-  graphene-114:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/10
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/34
-    pdu:
-      - uid: graphene-pdu7
-        port: 12
-  graphene-115:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/11
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/35
-    pdu:
-      - uid: graphene-pdu7
-        port: 13
-  graphene-116:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/12
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/36
-    pdu:
-      - uid: graphene-pdu7
-        port: 14
-  graphene-117:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/13
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/37
-    pdu:
-      - uid: graphene-pdu7
-        port: 17
-  graphene-118:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/14
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/38
-    pdu:
-      - uid: graphene-pdu7
-        port: 18
-  graphene-119:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/15
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/39
-    pdu:
-      - uid: graphene-pdu7
-        port: 19
-  graphene-120:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/16
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/40
-    pdu:
-      - uid: graphene-pdu7
-        port: 20
-  graphene-121:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/17
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/41
-    pdu:
-      - uid: graphene-pdu7
-        port: 21
-  graphene-122:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/18
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/42
-    pdu:
-      - uid: graphene-pdu7
-        port: 22
-  graphene-123:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/19
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/43
-    pdu:
-      - uid: graphene-pdu7
-        port: 23
-  graphene-124:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/20
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/44
-    pdu:
-      - uid: graphene-pdu7
-        port: 24
-  graphene-125:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/21
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/1
-    pdu:
-      - uid: graphene-pdu8
-        port: 1
-  graphene-126:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/22
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/2
-    pdu:
-      - uid: graphene-pdu8
-        port: 2
-  graphene-127:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/23
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/3
-    pdu:
-      - uid: graphene-pdu8
-        port: 3
-  graphene-128:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/24
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/4
-    pdu:
-      - uid: graphene-pdu8
-        port: 4
-  graphene-129:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/25
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/5
-    pdu:
-      - uid: graphene-pdu8
-        port: 5
-  graphene-130:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/26
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/6
-    pdu:
-      - uid: graphene-pdu8
-        port: 6
-  graphene-131:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/27
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/7
-    pdu:
-      - uid: graphene-pdu8
-        port: 7
-  graphene-132:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/28
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/8
-    pdu:
-      - uid: graphene-pdu8
-        port: 8
-  graphene-133:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/29
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/9
-    pdu:
-      - uid: graphene-pdu8
-        port: 11
-  graphene-134:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/30
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/10
-    pdu:
-      - uid: graphene-pdu8
-        port: 12
-  graphene-135:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/31
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/11
-    pdu:
-      - uid: graphene-pdu8
-        port: 13 
-  graphene-136:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/32
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/12
-    pdu:
-      - uid: graphene-pdu8
-        port: 14 
-  graphene-137:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/33
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/13
-    pdu:
-      - uid: graphene-pdu8
-        port: 17
-  graphene-138:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/34
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/14
-    pdu:
-      - uid: graphene-pdu8
-        port: 18
-  graphene-139:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/35
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/15
-    pdu:
-      - uid: graphene-pdu8
-        port: 19
-  graphene-140:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/36
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/16
-    pdu:
-      - uid: graphene-pdu8
-        port: 20
-  graphene-141:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/37
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/17
-    pdu:
-      - uid: graphene-pdu8
-        port: 21
-  graphene-142:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/38
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/18
-    pdu:
-      - uid: graphene-pdu8
-        port: 22
-  graphene-143:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/39
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/19
-    pdu:
-      - uid: graphene-pdu8
-        port: 23
-  graphene-144:
-    network_adapters:
-      eth0:
-        switch: sgraphene4
-        switch_port: Gi1/0/40
-      bmc:
-        switch: sgraphene4-ipmi
-        switch_port: 1/0/20
-    pdu:
-      - uid: graphene-pdu8
-        port: 24
diff --git a/input/grid5000/sites/nancy/clusters/graphene/graphene_ip.yaml.erb b/input/grid5000/sites/nancy/clusters/graphene/graphene_ip.yaml.erb
deleted file mode 100644
index 74c3d8bce4f495f2e4799b3a7f06046766e0c139..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/graphene_ip.yaml.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-nodes:
-<% (1..144).each { |i| %>
-  graphene-<%= i %>:
-    network_adapters:
-      ib0:
-        ip: 172.18.64.<%= i %>
-      eth0:
-        ip: 172.16.64.<%= i %>
-        mounted: true
-<% } %>
diff --git a/input/grid5000/sites/nancy/clusters/graphene/graphene_retired.yaml.erb b/input/grid5000/sites/nancy/clusters/graphene/graphene_retired.yaml.erb
deleted file mode 100644
index 031109556088cb76b6dbc56af59ac70b0ba34a47..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/graphene_retired.yaml.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-nodes:
-<% [ 127, 39, 54, 61, 91, 123, 144, 1, 28, 36, 3, 40, 56, 83, 86, 94, 96, 98, 44].each { |i| %>
-  graphene-<%= i %>:
-    status: retired
-<% } %>
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml
deleted file mode 100644
index f49eff5440b9a9cedbac30f22543de66e4d2b537..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-1:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.1
-      mac: 00:e0:81:d5:06:83
-      management: true
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.64.1
-      mac: 00:e0:81:d5:06:80
-      management: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:81
-      management: false
-      rate: 100000000
-    eth2:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:82
-      management: false
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9281'
-      interface: InfiniBand
-      ip: 172.18.64.1
-      ip6: fe80::202:c903:b:9281
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:81
-      management: false
-      name: ib0
-      rate: 20000000000
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9282'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:82
-      management: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: Hitachi HDS72103
-      rev: JPFOA3EA
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
deleted file mode 100644
index e34e128486cc56221aacc4c53d0a1b7df0678c5b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-10:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.10
-      mac: 00:e0:81:d5:06:d3
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.10
-      mac: 00:e0:81:d5:06:d0
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:d1
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:d2
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b916d'
-      interface: InfiniBand
-      ip: 172.18.64.10
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b916e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6e
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e2a7ff"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
deleted file mode 100644
index 7bb4712b49f2b3314092d025e3cb45649a12fadd..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-100:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.100
-      mac: 00:e0:81:d5:07:cf
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.100
-      mac: 00:e0:81:d5:07:cc
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:cd
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:ce
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d0d'
-      interface: InfiniBand
-      ip: 172.18.64.100
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d0e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cd4d"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
deleted file mode 100644
index d0b9427ba9555597937a2679dcd7e93e82a51056..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-101:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.101
-      mac: 00:e0:81:d5:06:a3
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.101
-      mac: 00:e0:81:d5:06:a0
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:a1
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:a2
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5cd9'
-      interface: InfiniBand
-      ip: 172.18.64.101
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5cda'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e93b81"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml
deleted file mode 100644
index 8dcf95b2878907a46832f40436571940b4bc2e46..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-102:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.102
-      mac: 00:e0:81:d5:08:bf
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.102
-      mac: 00:e0:81:d5:08:bc
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:bd
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:be
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5e71'
-      interface: InfiniBand
-      ip: 172.18.64.102
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:71
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5e72'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:72
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e6a16b"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
deleted file mode 100644
index 8b6906064f5517a7fb4bbb4cd55c63bb6ff75832..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-103:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.103
-      mac: 00:e0:81:d5:08:cb
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.103
-      mac: 00:e0:81:d5:08:c8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:c9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:ca
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d49'
-      interface: InfiniBand
-      ip: 172.18.64.103
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:49
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d4a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:4a
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e93a91"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
deleted file mode 100644
index d805427ff15fd1bdaa1e02124932f2b76b1e1733..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-104:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.104
-      mac: 00:e0:81:d5:07:67
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.104
-      mac: 00:e0:81:d5:07:64
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:65
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:66
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d15'
-      interface: InfiniBand
-      ip: 172.18.64.104
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:15
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d16'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e69fb9"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
deleted file mode 100644
index ef8badc721b9276368e9f2a600db4797b9db7dab..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-105:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.105
-      mac: 00:e0:81:d5:06:bf
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.105
-      mac: 00:e0:81:d5:06:bc
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:bd
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:be
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d19'
-      interface: InfiniBand
-      ip: 172.18.64.105
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:19
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d1a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e70d39"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
deleted file mode 100644
index 878fef3fc29af84eec921efb03fc0781afc20535..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-106:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.106
-      mac: 00:e0:81:d5:07:f7
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.106
-      mac: 00:e0:81:d5:07:f4
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:f5
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:f6
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5cad'
-      interface: InfiniBand
-      ip: 172.18.64.106
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ad
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5cae'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e69f32"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
deleted file mode 100644
index 2b9e4dee59a0d8ed165b7b98902b2124a4483d8c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-107:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.107
-      mac: 00:e0:81:d5:07:cb
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.107
-      mac: 00:e0:81:d5:07:c8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:c9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:ca
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d3d'
-      interface: InfiniBand
-      ip: 172.18.64.107
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:3d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d3e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:3e
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e93b4b"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
deleted file mode 100644
index 1ff647191150379c9615d071d2727c36f7b6d306..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-108:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.108
-      mac: 00:e0:81:d5:07:17
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.108
-      mac: 00:e0:81:d5:07:14
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:15
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:16
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d21'
-      interface: InfiniBand
-      ip: 172.18.64.108
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:21
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d22'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:22
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e93b53"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
deleted file mode 100644
index 43ead331f49789f62d72414db7863a26e6e71557..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-109:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.109
-      mac: 00:e0:81:d5:08:33
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.109
-      mac: 00:e0:81:d5:08:30
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:31
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:32
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d25'
-      interface: InfiniBand
-      ip: 172.18.64.109
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:25
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d26'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:26
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fc8e"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
deleted file mode 100644
index 28c557fb2f3a7138894078de4f98a99bf67ea6d0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-11:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.11
-      mac: 00:e0:81:d5:08:7f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.11
-      mac: 00:e0:81:d5:08:7c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:7d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:7e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9171'
-      interface: InfiniBand
-      ip: 172.18.64.11
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:71
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9172'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:72
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e5f35c"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
deleted file mode 100644
index 260a312898388c44efda33453658618958a792db..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-110:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.110
-      mac: 00:e0:81:d5:07:6f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.110
-      mac: 00:e0:81:d5:07:6c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:6d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:6e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5ca9'
-      interface: InfiniBand
-      ip: 172.18.64.110
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:a9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5caa'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e93a8c"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
deleted file mode 100644
index 0f2ade0dfd786b1e9d3135ff0b8c1a47e0ef39bd..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-111:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.111
-      mac: 00:e0:81:d5:08:5b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.111
-      mac: 00:e0:81:d5:08:58
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:59
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:5a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000c5591'
-      interface: InfiniBand
-      ip: 172.18.64.111
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0c:55:91
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000c5592'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0c:55:92
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e901fe"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
deleted file mode 100644
index b70852153154c549aba62d36c73070e0bf3d208c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-112:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.112
-      mac: 00:e0:81:d5:08:13
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.112
-      mac: 00:e0:81:d5:08:10
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:11
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:12
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b7e9d'
-      interface: InfiniBand
-      ip: 172.18.64.112
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:7e:9d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b7e9e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:7e:9e
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e69ed3"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
deleted file mode 100644
index 3c05aa9dcdea41259938b30269e3e4df3ba5f468..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-113:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.113
-      mac: 00:e0:81:d5:07:bf
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.113
-      mac: 00:e0:81:d5:07:bc
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:bd
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:be
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93b5'
-      interface: InfiniBand
-      ip: 172.18.64.113
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93b6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e93ac0"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
deleted file mode 100644
index 6da59c5ff6f9b0d67b97dec33ae7e9d0e60840c3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-114:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.114
-      mac: 00:e0:81:d5:06:b3
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.114
-      mac: 00:e0:81:d5:06:b0
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:b1
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:b2
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93c5'
-      interface: InfiniBand
-      ip: 172.18.64.114
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93c6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c6
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e69ece"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
deleted file mode 100644
index ff7d8a1ca27ff6cddd989220e1efabf50d450722..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-115:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.115
-      mac: 00:e0:81:d5:08:07
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.115
-      mac: 00:e0:81:d5:08:04
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:05
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:06
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9305'
-      interface: InfiniBand
-      ip: 172.18.64.115
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:05
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9306'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fcf0"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
deleted file mode 100644
index 90821f843641c7ff78e073ce6fd7f939ab7189a0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-116:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.116
-      mac: 00:e0:81:d5:08:2b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.116
-      mac: 00:e0:81:d5:08:28
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:29
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:2a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b931d'
-      interface: InfiniBand
-      ip: 172.18.64.116
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b931e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1e
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e93aa5"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
deleted file mode 100644
index 789c1b3c998170f92d0c6dec679231989360b198..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-117:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.117
-      mac: 00:e0:81:d5:06:e7
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.117
-      mac: 00:e0:81:d5:06:e4
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:e5
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:e6
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9325'
-      interface: InfiniBand
-      ip: 172.18.64.117
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:25
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9326'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:26
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e93ac2"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
deleted file mode 100644
index 50e3272e0945ed05dc067435c5aafd4fa6975eb4..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-118:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.118
-      mac: 00:e0:81:d5:07:bb
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.118
-      mac: 00:e0:81:d5:07:b8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:b9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:ba
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92d9'
-      interface: InfiniBand
-      ip: 172.18.64.118
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92da'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e98452"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
deleted file mode 100644
index 9a7d61536d60c45a7d5cd1bd1f32088fa8b6d960..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-119:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.119
-      mac: 00:e0:81:d5:06:f3
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.119
-      mac: 00:e0:81:d5:06:f0
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:f1
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:f2
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9319'
-      interface: InfiniBand
-      ip: 172.18.64.119
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:19
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b931a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e93ac9"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
deleted file mode 100644
index d8ca1340613df45a12cefc111ca9c1c18566dbee..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-12:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.12
-      mac: 00:e0:81:d5:07:8f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.12
-      mac: 00:e0:81:d5:07:8c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:8d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:8e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9381'
-      interface: InfiniBand
-      ip: 172.18.64.12
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:81
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9382'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:82
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371df3bd5"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
deleted file mode 100644
index 3d8c5afde7bba89ad7f2fc7a3243c8ccf52976b2..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-120:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.120
-      mac: 00:e0:81:d5:08:af
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.120
-      mac: 00:e0:81:d5:08:ac
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:ad
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:ae
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9329'
-      interface: InfiniBand
-      ip: 172.18.64.120
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:29
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b932a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2a
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e69f52"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
deleted file mode 100644
index 6509e47c4a96d4acf1fa56a19474cba06e9fe77c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-121:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.121
-      mac: 00:e0:81:d5:07:3b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.121
-      mac: 00:e0:81:d5:07:38
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:39
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:3a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b932d'
-      interface: InfiniBand
-      ip: 172.18.64.121
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b932e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cd7b"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
deleted file mode 100644
index c0201532f503bdb9ef2fd96333cf78b9c6e66ee8..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-122:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.122
-      mac: 00:e0:81:d5:08:3b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.122
-      mac: 00:e0:81:d5:08:38
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:39
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:3a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d85'
-      interface: InfiniBand
-      ip: 172.18.64.122
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:85
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d86'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:86
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e60ba2"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml
deleted file mode 100644
index 07c1e44c356cda1c8f343fd471bcc868667fc4f6..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-123:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-    serial: 1009390125
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.123
-      mac: 00:e0:81:d5:06:af
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.64.123
-      ip6: fe80::2e0:81ff:fed5:6ac
-      mac: 00:e0:81:d5:06:ac
-      management: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:ad
-      management: false
-      rate: 100000000
-    eth2:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:ae
-      management: false
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9219'
-      interface: InfiniBand
-      ip: 172.18.64.123
-      ip6: fe80::202:c903:b:9219
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:19
-      management: false
-      name: ib0
-      rate: 20000000000
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b921a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1a
-      management: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: Hitachi HDS72103
-      rev: A3EA
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
deleted file mode 100644
index 6c24d50d30a657c1a7fee69bb7189dc722cd5dfa..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-124:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.124
-      mac: 00:e0:81:d5:06:a7
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.124
-      mac: 00:e0:81:d5:06:a4
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:a5
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:a6
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c90300027f61'
-      interface: InfiniBand
-      ip: 172.18.64.124
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:61
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c90300027f62'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e669a0"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
deleted file mode 100644
index 574614fbd9e173a59d7e608934fc9925a281aa20..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-125:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.125
-      mac: 00:e0:81:d5:08:6b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.125
-      mac: 00:e0:81:d5:08:68
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:69
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:6a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9391'
-      interface: InfiniBand
-      ip: 172.18.64.125
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:91
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9392'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:92
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fe1f"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml
deleted file mode 100644
index a38c78ce661a5ed81cebeffa8f36a2b10ccc3f37..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-126:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.126
-      mac: 00:e0:81:d5:08:d3
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.126
-      mac: 00:e0:81:d5:08:d0
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:d1
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:d2
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9151'
-      interface: InfiniBand
-      ip: 172.18.64.126
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:51
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9152'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:52
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e6d627"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
deleted file mode 100644
index faff933befd9c8703f060e0cd7d163cae683d7bb..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-127:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.127
-      mac: 00:e0:81:d5:08:43
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.127
-      mac: 00:e0:81:d5:08:40
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:41
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:42
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9285'
-      interface: InfiniBand
-      ip: 172.18.64.127
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:85
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9286'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:86
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fe0f"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
deleted file mode 100644
index c557858d3669e383361cacade3cd9599446cfae4..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-128:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.128
-      mac: 00:e0:81:d5:08:e7
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.128
-      mac: 00:e0:81:d5:08:e4
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:e5
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:e6
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9215'
-      interface: InfiniBand
-      ip: 172.18.64.128
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:15
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9216'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e901ec"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
deleted file mode 100644
index bbe61ea9b700b4246dbefd5895686a50154eb837..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-129:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.129
-      mac: 00:e0:81:d5:07:1f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.129
-      mac: 00:e0:81:d5:07:1c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:1d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:1e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9205'
-      interface: InfiniBand
-      ip: 172.18.64.129
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:05
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9206'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cd7c"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
deleted file mode 100644
index 3bcc17cad2982effde03436ef149a6fd48ad514b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-13:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.13
-      mac: 00:e0:81:d5:06:ff
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.13
-      mac: 00:e0:81:d5:06:fc
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:fd
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:fe
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9385'
-      interface: InfiniBand
-      ip: 172.18.64.13
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:85
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9386'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:86
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e2ae6c"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
deleted file mode 100644
index e495c684c830bee91f17cc7f16fc2b0003f0ddc0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-130:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.130
-      mac: 00:e0:81:d2:5a:37
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.130
-      mac: 00:e0:81:d2:5a:34
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d2:5a:35
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d2:5a:36
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9209'
-      interface: InfiniBand
-      ip: 172.18.64.130
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:09
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b920a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0a
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e901df"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
deleted file mode 100644
index 343e671037ab8347aa702837a4f927c3c88512d4..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-131:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.131
-      mac: 00:e0:81:d5:06:fb
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.131
-      mac: 00:e0:81:d5:06:f8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:f9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:fa
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b914d'
-      interface: InfiniBand
-      ip: 172.18.64.131
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b914e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4e
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e722b5"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
deleted file mode 100644
index bf033392db067513c57133782b17431b079620c1..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-132:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.132
-      mac: 00:e0:81:d5:08:8f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.132
-      mac: 00:e0:81:d5:08:8c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:8d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:8e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b920d'
-      interface: InfiniBand
-      ip: 172.18.64.132
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b920e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e6a3a3"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
deleted file mode 100644
index 6db0d4195ac6e0e7284b1b1566a296030993c98f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-133:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.133
-      mac: 00:e0:81:d5:07:e3
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.133
-      mac: 00:e0:81:d5:07:e0
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:e1
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:e2
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f7b3'
-      interface: InfiniBand
-      ip: 172.18.64.133
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:b3
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f7b4'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:b4
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e60bd7"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
deleted file mode 100644
index 7226c3ddcc452d1dfcbda66ab2f292b9b70b6105..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-134:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.134
-      mac: 00:e0:81:d5:08:eb
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.134
-      mac: 00:e0:81:d5:08:e8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:e9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:ea
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f44f'
-      interface: InfiniBand
-      ip: 172.18.64.134
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:4f
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f450'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:50
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ffe9"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
deleted file mode 100644
index 71acb99d76c47ee97556d3168e6549bb54093025..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-135:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.135
-      mac: 00:e0:81:d5:06:73
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.135
-      mac: 00:e0:81:d5:06:70
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:71
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:72
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f4c7'
-      interface: InfiniBand
-      ip: 172.18.64.135
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c7
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f4c8'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c8
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e98413"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
deleted file mode 100644
index d5e0d41158690639d7b7534692998da3cb235dc5..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-136:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.136
-      mac: 00:e0:81:d5:07:7f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.136
-      mac: 00:e0:81:d5:07:7c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:7d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:7e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f847'
-      interface: InfiniBand
-      ip: 172.18.64.136
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:47
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f848'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:48
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e90000"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
deleted file mode 100644
index bc83103093ca573dd2a069691a49a04305c7d85b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-137:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.137
-      mac: 00:e0:81:d5:08:47
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.137
-      mac: 00:e0:81:d5:08:44
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:45
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:46
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f647'
-      interface: InfiniBand
-      ip: 172.18.64.137
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f6:47
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f648'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f6:48
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e95045"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
deleted file mode 100644
index b2412017f11aa26a6e783288fe1facb620e7dcb4..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-138:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.138
-      mac: 00:e0:81:d5:08:c7
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.138
-      mac: 00:e0:81:d5:08:c4
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:c5
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:c6
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f4c3'
-      interface: InfiniBand
-      ip: 172.18.64.138
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c3
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f4c4'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c4
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fdf6"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
deleted file mode 100644
index 0c296d816096bd1d5193ffe53c54927f20f33632..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-139:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.139
-      mac: 00:e0:81:d5:07:83
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.139
-      mac: 00:e0:81:d5:07:80
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:81
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:82
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f7ff'
-      interface: InfiniBand
-      ip: 172.18.64.139
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:ff
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f800'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:00
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fe04"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
deleted file mode 100644
index 9bb0d5838acc8ade5f35459bf8879cfef9dd56ba..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-14:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.14
-      mac: 00:e0:81:d5:06:d7
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.14
-      mac: 00:e0:81:d5:06:d4
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:d5
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:d6
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93e1'
-      interface: InfiniBand
-      ip: 172.18.64.14
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93e2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371dfa661"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
deleted file mode 100644
index 5841d7202486322a3fe55bb5bb52cff37819a330..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-140:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.140
-      mac: 00:e0:81:d5:07:7b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.140
-      mac: 00:e0:81:d5:07:78
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:79
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:7a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f79f'
-      interface: InfiniBand
-      ip: 172.18.64.140
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:9f
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f7a0'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a0
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cdbb"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml
deleted file mode 100644
index 093c94f08f1dc4a9b0586c9604ed3b7db124b946..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-141:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.141
-      mac: 00:e0:81:d5:08:77
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.141
-      mac: 00:e0:81:d5:08:74
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:75
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:76
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f793'
-      interface: InfiniBand
-      ip: 172.18.64.141
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:93
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f794'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:94
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e66c69"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
deleted file mode 100644
index de9f7295b97624a19e367c32c9cb8f9376f3a76a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-142:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.142
-      mac: 00:e0:81:d5:06:8f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.142
-      mac: 00:e0:81:d5:06:8c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:8d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:8e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f7a7'
-      interface: InfiniBand
-      ip: 172.18.64.142
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a7
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f7a8'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a8
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e60c3a"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
deleted file mode 100644
index 2a3376ac358609a54298104ce69c201ba31e03e3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-143:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.143
-      mac: 00:e0:81:d5:07:97
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.143
-      mac: 00:e0:81:d5:07:94
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:95
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:96
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f497'
-      interface: InfiniBand
-      ip: 172.18.64.143
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:97
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f498'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:98
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fcbd"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml
deleted file mode 100644
index e032093f4e9022af1af97cc0e585b285c498b9cb..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-144:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-    serial: 1009390146
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.144
-      mac: 00:e0:81:d5:06:bb
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.64.144
-      ip6: fe80::2e0:81ff:fed5:6b8
-      mac: 00:e0:81:d5:06:b8
-      management: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:b9
-      management: false
-      rate: 100000000
-    eth2:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:ba
-      management: false
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f85b'
-      interface: InfiniBand
-      ip: 172.18.64.144
-      ip6: fe80::202:c903:5:f85b
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5b
-      management: false
-      name: ib0
-      rate: 20000000000
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030005f85c'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5c
-      management: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: Hitachi HDS72103
-      rev: A3EA
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
deleted file mode 100644
index c7c574d4206402ca1e8e15a860e7cb7fd7e9015f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-15:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.15
-      mac: 00:e0:81:d5:07:eb
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.15
-      mac: 00:e0:81:d5:07:e8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:e9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:ea
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93c9'
-      interface: InfiniBand
-      ip: 172.18.64.15
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93ca'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e68f5e"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
deleted file mode 100644
index e5a8de12e3ebe02b2929885c7e3ec3e6c5345a13..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-16:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.16
-      mac: 00:e0:81:d5:07:c3
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.16
-      mac: 00:e0:81:d5:07:c0
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:c1
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:c2
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9375'
-      interface: InfiniBand
-      ip: 172.18.64.16
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:75
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9376'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:76
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e75540"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
deleted file mode 100644
index 482d236f0d4769d102e367bb510d727c0e058e6b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-17:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.17
-      mac: 00:e0:81:d5:08:ab
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.17
-      mac: 00:e0:81:d5:08:a8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:a9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:aa
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9371'
-      interface: InfiniBand
-      ip: 172.18.64.17
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:71
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9372'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:72
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371df3aa3"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
deleted file mode 100644
index 7241c6736b0e3fa990e9c1ad14154104d9f852dd..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-18:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.18
-      mac: 00:e0:81:d5:08:3f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.18
-      mac: 00:e0:81:d5:08:3c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:3d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:3e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b937d'
-      interface: InfiniBand
-      ip: 172.18.64.18
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b937e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7e
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e70ca5"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
deleted file mode 100644
index 043624a63eac3947231568c23a9bda46ba03233d..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-19:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.19
-      mac: 00:e0:81:d5:08:b7
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.19
-      mac: 00:e0:81:d5:08:b4
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:b5
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:b6
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9155'
-      interface: InfiniBand
-      ip: 172.18.64.19
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:55
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9156'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:56
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371dfa662"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
deleted file mode 100644
index 9ffc371131bd1df9d1e5286800793748f16e7d48..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-2:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.2
-      mac: 00:e0:81:d5:07:73
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.2
-      mac: 00:e0:81:d5:07:70
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:71
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:72
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b915d'
-      interface: InfiniBand
-      ip: 172.18.64.2
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b915e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e6fd31"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
deleted file mode 100644
index bb0fc330c55a3da3f506cb8dcfee30aa1de3cead..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-20:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.20
-      mac: 00:e0:81:d5:07:6b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.20
-      mac: 00:e0:81:d5:07:68
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:69
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:6a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9145'
-      interface: InfiniBand
-      ip: 172.18.64.20
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:45
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9146'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:46
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e73c2d"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
deleted file mode 100644
index 0579fb2700d8e29112403527618ab9319402be83..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-21:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.21
-      mac: 00:e0:81:d2:59:fb
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.21
-      mac: 00:e0:81:d2:59:f8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d2:59:f9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d2:59:fa
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030004536d'
-      interface: InfiniBand
-      ip: 172.18.64.21
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030004536e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6e
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fe4f"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
deleted file mode 100644
index 2658b3931be67493d995ba961ae9ce7e638cc35f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-22:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.22
-      mac: 00:e0:81:d5:07:db
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.22
-      mac: 00:e0:81:d5:07:d8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:d9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:da
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9379'
-      interface: InfiniBand
-      ip: 172.18.64.22
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:79
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b937a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7a
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e69ef4"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
deleted file mode 100644
index 79959eb498c5d2b5b39d7694d2b035dbf633c1a7..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-23:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.23
-      mac: 00:e0:81:d5:06:c7
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.23
-      mac: 00:e0:81:d5:06:c4
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:c5
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:c6
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9365'
-      interface: InfiniBand
-      ip: 172.18.64.23
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:65
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9366'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e901f8"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
deleted file mode 100644
index 95a5761bfaa20032ba9cfd922dbee5d2546630db..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-24:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.24
-      mac: 00:e0:81:d5:07:13
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.24
-      mac: 00:e0:81:d5:07:10
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:11
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:12
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92cd'
-      interface: InfiniBand
-      ip: 172.18.64.24
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:cd
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92ce'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e6a448"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
deleted file mode 100644
index d28a41142d41eb2590ae8db120e4d19700ea8a74..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-25:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.25
-      mac: 00:e0:81:d5:07:53
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.25
-      mac: 00:e0:81:d5:07:50
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:51
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:52
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92a5'
-      interface: InfiniBand
-      ip: 172.18.64.25
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92a6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e69f03"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml
deleted file mode 100644
index df3a48518e12a51ea7ff1fbfb281d30e118cbf2b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-26:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.26
-      mac: 00:e0:81:d5:08:6f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.26
-      mac: 00:e0:81:d5:08:6c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:6d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:6e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b929d'
-      interface: InfiniBand
-      ip: 172.18.64.26
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b929e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9e
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e69f33"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
deleted file mode 100644
index 9a30d39ef49d608578d720fc98b56fc2f00cbba4..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-27:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.27
-      mac: 00:e0:81:d5:07:5f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.27
-      mac: 00:e0:81:d5:07:5c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:5d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:5e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9289'
-      interface: InfiniBand
-      ip: 172.18.64.27
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:89
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b928a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8a
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce39"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml
deleted file mode 100644
index f8dbc4409a3420ef482a3e89e71f3432e1a8a4d3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-28:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-    serial: 1009390030
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.28
-      mac: 00:e0:81:d5:07:f3
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.64.28
-      ip6: fe80::2e0:81ff:fed5:65c
-      mac: 00:e0:81:d5:07:f0
-      management: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:f1
-      management: false
-      rate: 100000000
-    eth2:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:f2
-      management: false
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b928d'
-      interface: InfiniBand
-      ip: 172.18.64.28
-      ip6: fe80::202:c903:b:928d
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8d
-      management: false
-      name: ib0
-      rate: 20000000000
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b928e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8e
-      management: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: Hitachi HDS72103
-      rev: A3EA
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
deleted file mode 100644
index 744a970dbbf20cd7c53cac2d7212cdc71c748cb5..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-29:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.29
-      mac: 00:e0:81:d5:06:57
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.29
-      mac: 00:e0:81:d5:06:54
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:55
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:56
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b90dd'
-      interface: InfiniBand
-      ip: 172.18.64.29
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:dd
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b90de'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:de
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce23"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml
deleted file mode 100644
index 8a7094772a315267b52c1044e2e8e6e2ab706526..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-3:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-    serial: 605634005
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.3
-      mac: 00:e0:81:d5:08:73
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.64.3
-      ip6: fe80::2e0:81ff:fed5:870
-      mac: 00:e0:81:d5:08:70
-      management: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:71
-      management: false
-      rate: 100000000
-    eth2:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:72
-      management: false
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9159'
-      interface: InfiniBand
-      ip: 172.18.64.3
-      ip6: fe80::202:c903:b:9159
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:59
-      management: false
-      name: ib0
-      rate: 20000000000
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b915a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5a
-      management: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: Hitachi HDS72103
-      rev: A3EA
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
deleted file mode 100644
index 241799565fe385f8e344c3a47cb19be50cb2be41..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-30:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.30
-      mac: 00:e0:81:d5:08:ef
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.30
-      mac: 00:e0:81:d5:08:ec
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:ed
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:ee
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9279'
-      interface: InfiniBand
-      ip: 172.18.64.30
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:79
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b927a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7a
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce27"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
deleted file mode 100644
index ee31b1b026dd8e5d52b905d429c1b93d8d9971eb..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-31:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.31
-      mac: 00:e0:81:d5:06:63
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.31
-      mac: 00:e0:81:d5:06:60
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:61
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:62
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b921d'
-      interface: InfiniBand
-      ip: 172.18.64.31
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b921e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1e
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e69ee5"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
deleted file mode 100644
index 75ec04ea8b23ad33001e2c23e70a546eb35e3aa0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-32:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.32
-      mac: 00:e0:81:d5:06:cb
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.32
-      mac: 00:e0:81:d5:06:c8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:c9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:ca
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b927d'
-      interface: InfiniBand
-      ip: 172.18.64.32
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b927e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7e
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e69efc"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
deleted file mode 100644
index 7fa3f36dff5be4aaea64d05efcf469056d6a31c6..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-33:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.33
-      mac: 00:e0:81:d5:06:6f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.33
-      mac: 00:e0:81:d5:06:6c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:6d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:6e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b90d9'
-      interface: InfiniBand
-      ip: 172.18.64.33
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:d9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b90da'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e69ecf"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
deleted file mode 100644
index 68d6669f81dfc2fd2db513710902199a13027f50..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-34:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.34
-      mac: 00:e0:81:d5:08:9f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.34
-      mac: 00:e0:81:d5:08:9c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:9d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:9e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9165'
-      interface: InfiniBand
-      ip: 172.18.64.34
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:65
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9166'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e902da"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
deleted file mode 100644
index 810b86b198db4c16245c2a92638c08aa4f027988..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-35:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.35
-      mac: 00:e0:81:d5:08:1f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.35
-      mac: 00:e0:81:d5:08:1c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:1d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:1e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030001d5ef'
-      interface: InfiniBand
-      ip: 172.18.64.35
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:d5:ef
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c9030001d5f0'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:01:d5:f0
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e90217"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml
deleted file mode 100644
index 62b467b1acced0c1285ca01154c2f219889eb633..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-36:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-    serial: 
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.36
-      mac: 00:e0:81:d5:06:4b
-      management: true
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.64.36
-      mac: 00:e0:81:d5:06:48
-      management: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:49
-      management: false
-      rate: 100000000
-    eth2:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:4a
-      management: false
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92b9'
-      interface: InfiniBand
-      ip: 172.18.64.36
-      ip6: fe80::202:c903:b:92b9
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b9
-      management: false
-      name: ib0
-      rate: 20000000000
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92ba'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ba
-      management: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: Hitachi HDS72103
-      rev: A3EA
-      size: 320072933376
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
deleted file mode 100644
index 24a7e41e584a75e423e906043e032294578624ba..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-37:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.37
-      mac: 00:e0:81:d5:08:a7
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.37
-      mac: 00:e0:81:d5:08:a4
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:a5
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:a6
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92c5'
-      interface: InfiniBand
-      ip: 172.18.64.37
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92c6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c6
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e901e5"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
deleted file mode 100644
index d248c74bc0c693d444f55a613cd24df8fd80871f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-38:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.38
-      mac: 00:e0:81:d5:07:33
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.38
-      mac: 00:e0:81:d5:07:30
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:31
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:32
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92b1'
-      interface: InfiniBand
-      ip: 172.18.64.38
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92b2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b2
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e901e9"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml
deleted file mode 100644
index 255d509eb9ef9929ef3d76767311aceff8cd72c0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-39:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.39
-      mac: 00:e0:81:d5:07:df
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.39
-      mac: 00:e0:81:d5:07:dc
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:dd
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:de
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92c1'
-      interface: InfiniBand
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92c2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cde7"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
deleted file mode 100644
index c3c513aacab0288e8967f6c96b8c3f2cf3a5c656..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-4:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.4
-      mac: 00:e0:81:d5:08:57
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.4
-      mac: 00:e0:81:d5:08:54
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:55
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:56
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92bd'
-      interface: InfiniBand
-      ip: 172.18.64.4
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:bd
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92be'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e60b9b"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml
deleted file mode 100644
index dd7472629781cb9fa4608846787f899bbb63e001..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-40:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-    serial: 
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.64.40
-      mac: 00:e0:81:d5:06:f4
-      management: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:f5
-      management: false
-      rate: 100000000
-    eth2:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:f6
-      management: false
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93cd'
-      interface: InfiniBand
-      ip: 172.18.64.40
-      ip6: fe80::202:c903:b:93cd
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:cd
-      management: false
-      name: ib0
-      rate: 20000000000
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93ce'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ce
-      management: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: Hitachi HDS72103
-      rev: A3EA
-      size: 320072933376
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
deleted file mode 100644
index 128fd6f66d3c56d236e03c39ad8460e0017b576f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-41:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.41
-      mac: 00:e0:81:d5:07:af
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.41
-      mac: 00:e0:81:d5:07:ac
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:ad
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:ae
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9299'
-      interface: InfiniBand
-      ip: 172.18.64.41
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:99
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b929a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9a
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fe3b"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
deleted file mode 100644
index e625b7ecfc33599378a661cd49b90992161782cf..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-42:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.42
-      mac: 00:e0:81:d5:07:8b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.42
-      mac: 00:e0:81:d5:07:88
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:89
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:8a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92a9'
-      interface: InfiniBand
-      ip: 172.18.64.42
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92aa'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e6d13d"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
deleted file mode 100644
index 471b6ebbcca3c2b23859f657ccddea5156e376e9..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-43:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.43
-      mac: 00:e0:81:d5:08:27
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.43
-      mac: 00:e0:81:d5:08:24
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:25
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:26
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92ad'
-      interface: InfiniBand
-      ip: 172.18.64.43
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ad
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92ae'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e93c32"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
deleted file mode 100644
index a5152ba09c864802cd11fc6de57f6bb95dad5d5f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-44:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.44
-      mac: 00:e0:81:d5:06:e3
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.44
-      mac: 00:e0:81:d5:06:e0
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:e1
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:e2
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92b5'
-      interface: InfiniBand
-      ip: 172.18.64.44
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92b6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e6a746"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml
deleted file mode 100644
index b9d77bba945d41bf6f081be1a76c05bbeb4ca737..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-45:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 01/06/2011
-    vendor: American Megatrends Inc.
-    version: V7.02
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.45
-      mac: 00:e0:81:d5:06:5f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.45
-      mac: 00:e0:81:d5:06:5c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:5d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:5e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9321'
-      interface: InfiniBand
-      ip: 172.18.64.45
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:21
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9322'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:22
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca34de8f88e"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: GM3OA5CA
-      model: Hitachi HDP72503
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
deleted file mode 100644
index bf8ba9ceb6cfd8495a1b6c66e9855212d22216f1..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-46:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.46
-      mac: 00:e0:81:d5:06:97
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.46
-      mac: 00:e0:81:d5:06:94
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:95
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:96
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93d5'
-      interface: InfiniBand
-      ip: 172.18.64.46
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93d6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e90220"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
deleted file mode 100644
index 5715ebbe69b7c019364403a01420877c31e6de64..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-47:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.47
-      mac: 00:e0:81:d5:08:97
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.47
-      mac: 00:e0:81:d5:08:94
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:95
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:96
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93e5'
-      interface: InfiniBand
-      ip: 172.18.64.47
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93e6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fe33"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
deleted file mode 100644
index 616b13ff77259f3c7ab91e4bcaf272bf0f6bd086..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-48:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.48
-      mac: 00:e0:81:d5:06:eb
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.48
-      mac: 00:e0:81:d5:06:e8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:e9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:ea
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93dd'
-      interface: InfiniBand
-      ip: 172.18.64.48
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:dd
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93de'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:de
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cee9"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
deleted file mode 100644
index 9ef6177a1d43328771b4ebb92726bbdbfdf631b7..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-49:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.49
-      mac: 00:e0:81:d5:08:5f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.49
-      mac: 00:e0:81:d5:08:5c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:5d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:5e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93d1'
-      interface: InfiniBand
-      ip: 172.18.64.49
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93d2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e6d249"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
deleted file mode 100644
index ab1046847ebc23c5e5f210efd5a0554882641276..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-5:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.5
-      mac: 00:e0:81:d5:08:bb
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.5
-      mac: 00:e0:81:d5:08:b8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:b9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:ba
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9179'
-      interface: InfiniBand
-      ip: 172.18.64.5
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:79
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b917a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7a
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e7027a"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml
deleted file mode 100644
index 8b560e037079f205fbb63d2e1784e16211df99ae..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-50:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.50
-      mac: 00:e0:81:d5:06:77
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.50
-      mac: 00:e0:81:d5:06:74
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:75
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:76
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92f1'
-      interface: InfiniBand
-      ip: 172.18.64.50
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92f2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f2
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e6a744"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
deleted file mode 100644
index 4e3d9c22881528082276297d1e78f67a45c6b0c9..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-51:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.51
-      mac: 00:e0:81:d5:07:63
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.51
-      mac: 00:e0:81:d5:07:60
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:61
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:62
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92e9'
-      interface: InfiniBand
-      ip: 172.18.64.51
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92ea'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e66eb9"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
deleted file mode 100644
index 1f9803631a30888a099201050078f775d9b6e666..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-52:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.52
-      mac: 00:e0:81:d5:07:0f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.52
-      mac: 00:e0:81:d5:07:0c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:0d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:0e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92f9'
-      interface: InfiniBand
-      ip: 172.18.64.52
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92fa'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fa
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e6d1e4"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
deleted file mode 100644
index d1ceef85a470777c05c1095e85221e34a11d2453..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-53:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.53
-      mac: 00:e0:81:d5:07:fb
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.53
-      mac: 00:e0:81:d5:07:f8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:f9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:fa
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9309'
-      interface: InfiniBand
-      ip: 172.18.64.53
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:09
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b930a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0a
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fe1a"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
deleted file mode 100644
index 79d7ecfba9baf28c56282bd1919ff092e87e88f7..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-54:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.54
-      mac: 00:e0:81:d5:07:ab
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.54
-      mac: 00:e0:81:d5:07:a8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:a9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:aa
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9315'
-      interface: InfiniBand
-      ip: 172.18.64.54
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:15
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9316'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e9022d"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
deleted file mode 100644
index 09a3f1acf9c5b7f899f07372780b7331f8bad74d..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-55:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.55
-      mac: 00:e0:81:d5:08:93
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.55
-      mac: 00:e0:81:d5:08:90
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:91
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:92
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b930d'
-      interface: InfiniBand
-      ip: 172.18.64.55
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b930e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e90212"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml
deleted file mode 100644
index 6802abef5874089895ea254c856640eb083e489b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-56:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-    serial: 
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.56
-      mac: 00:e0:81:d5:06:7b
-      management: true
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.64.56
-      mac: 00:e0:81:d5:06:78
-      management: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:79
-      management: false
-      rate: 100000000
-    eth2:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:7a
-      management: false
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9189'
-      interface: InfiniBand
-      ip: 172.18.64.56
-      ip6: fe80::202:c903:b:9189
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:89
-      management: false
-      name: ib0
-      rate: 20000000000
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b918a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8a
-      management: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: Hitachi HDS72103
-      rev: A3EA
-      size: 320072933376
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
deleted file mode 100644
index 91c5ce8ccd7ec3d4cce9e4058e1f5e91e16a78f3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-57:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.57
-      mac: 00:e0:81:d5:08:a3
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.57
-      mac: 00:e0:81:d5:08:a0
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:a1
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:a2
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b918d'
-      interface: InfiniBand
-      ip: 172.18.64.57
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b918e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8e
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e677a1"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
deleted file mode 100644
index 6bf9fb4d93cffd810446479d877539ed25d1df6b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-58:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.58
-      mac: 00:e0:81:d5:07:37
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.58
-      mac: 00:e0:81:d5:07:34
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:35
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:36
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b919d'
-      interface: InfiniBand
-      ip: 172.18.64.58
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b919e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9e
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca32bd48345"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: GM3OA52A
-      model: Hitachi HDP72503
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
deleted file mode 100644
index b967c3a606e4ff5d331eb3a586a6ee9a2b36a095..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-59:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.59
-      mac: 00:e0:81:d5:07:2f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.59
-      mac: 00:e0:81:d5:07:2c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:2d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:2e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9195'
-      interface: InfiniBand
-      ip: 172.18.64.59
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:95
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9196'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:96
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e6d228"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
deleted file mode 100644
index c4468382855fc26564d640f8fbb1b69f554bec03..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-6:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.6
-      mac: 00:e0:81:d5:06:ef
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.6
-      mac: 00:e0:81:d5:06:ec
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:ed
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:ee
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b917d'
-      interface: InfiniBand
-      ip: 172.18.64.6
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b917e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7e
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371de258a"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
deleted file mode 100644
index bfe586d6903f0a95456c5177f56620ae8b08b351..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-60:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.60
-      mac: 00:e0:81:d5:08:4f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.60
-      mac: 00:e0:81:d5:08:4c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:4d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:4e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9185'
-      interface: InfiniBand
-      ip: 172.18.64.60
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:85
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9186'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:86
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fdf9"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
deleted file mode 100644
index 003f03e31d9f8f64da1709571c5db19e40279290..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-61:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.61
-      mac: 00:e0:81:d5:07:03
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.61
-      mac: 00:e0:81:d5:07:00
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:01
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:02
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9191'
-      interface: InfiniBand
-      ip: 172.18.64.61
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:91
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9192'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:92
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e60bea"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
deleted file mode 100644
index 09b9c502759cbc3e75438c3c96b8f87feeaec7c9..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-62:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.62
-      mac: 00:e0:81:d5:07:c7
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.62
-      mac: 00:e0:81:d5:07:c4
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:c5
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:c6
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9199'
-      interface: InfiniBand
-      ip: 172.18.64.62
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:99
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b919a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9a
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce37"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
deleted file mode 100644
index cb4b77bbd542b85771f042eb8249e4bfc2c38133..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-63:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.63
-      mac: 00:e0:81:d5:06:6b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.63
-      mac: 00:e0:81:d5:06:68
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:69
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:6a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9181'
-      interface: InfiniBand
-      ip: 172.18.64.63
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:81
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9182'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:82
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e60b9a"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
deleted file mode 100644
index 660f94b4677257d5f4b9e5541084c310f543a7c0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-64:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.64
-      mac: 00:e0:81:d5:08:8b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.64
-      mac: 00:e0:81:d5:08:88
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:89
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:8a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92a1'
-      interface: InfiniBand
-      ip: 172.18.64.64
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92a2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce47"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
deleted file mode 100644
index 8f157acd69726e0dadbb5f952d11b7d0c00150aa..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-65:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.65
-      mac: 00:e0:81:d5:07:47
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.65
-      mac: 00:e0:81:d5:07:44
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:45
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:46
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93d9'
-      interface: InfiniBand
-      ip: 172.18.64.65
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93da'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce3f"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
deleted file mode 100644
index 0ec83573d97eb479129d8d78856da7e7e3dee9a6..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-66:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.66
-      mac: 00:e0:81:d5:08:17
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.66
-      mac: 00:e0:81:d5:08:14
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:15
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:16
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9149'
-      interface: InfiniBand
-      ip: 172.18.64.66
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:49
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b914a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4a
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce44"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
deleted file mode 100644
index 72f57980ef26f067b61758fb41b0655c0c003082..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-67:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.67
-      mac: 00:e0:81:d5:07:b3
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.67
-      mac: 00:e0:81:d5:07:b0
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:b1
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:b2
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93b9'
-      interface: InfiniBand
-      ip: 172.18.64.67
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93ba'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce3c"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
deleted file mode 100644
index 615c7183e996d6a98a255a350ae8456e7790f0cd..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-68:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.68
-      mac: 00:e0:81:d5:06:53
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.68
-      mac: 00:e0:81:d5:06:50
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:51
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:52
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9291'
-      interface: InfiniBand
-      ip: 172.18.64.68
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:91
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9292'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:92
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e60b25"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
deleted file mode 100644
index 4eb5cfa8635399a1bf888051822a46762f07ee20..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-69:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.69
-      mac: 00:e0:81:d5:06:9b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.69
-      mac: 00:e0:81:d5:06:98
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:99
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:9a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93c1'
-      interface: InfiniBand
-      ip: 172.18.64.69
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93c2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce33"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
deleted file mode 100644
index 58460b71ff331ad1ec896a428666a60837ce47a0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-7:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.7
-      mac: 00:e0:81:d5:07:3f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.7
-      mac: 00:e0:81:d5:07:3c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:3d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:3e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9161'
-      interface: InfiniBand
-      ip: 172.18.64.7
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:61
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9162'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e73c3e"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
deleted file mode 100644
index 13551dd9269dfe0a4c7faa32379929bfaa5876bc..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-70:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.70
-      mac: 00:e0:81:d5:07:4f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.70
-      mac: 00:e0:81:d5:07:4c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:4d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:4e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9311'
-      interface: InfiniBand
-      ip: 172.18.64.70
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:11
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9312'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:12
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e66a94"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
deleted file mode 100644
index c630c6a6830d09285e50fa2f262ec5f273415e6f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-71:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.71
-      mac: 00:e0:81:d5:07:2b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.71
-      mac: 00:e0:81:d5:07:28
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:29
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:2a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92ed'
-      interface: InfiniBand
-      ip: 172.18.64.71
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ed
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92ee'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce2a"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
deleted file mode 100644
index 9383fea8ab8555e4f0aa6b7d1d92703803970645..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-72:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.72
-      mac: 00:e0:81:d5:07:e7
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.72
-      mac: 00:e0:81:d5:07:e4
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:e5
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:e6
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9295'
-      interface: InfiniBand
-      ip: 172.18.64.72
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:95
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9296'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:96
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e60bc4"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
deleted file mode 100644
index 441aa1161d1c94cdad3eee19e5cacf799306a449..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-73:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.73
-      mac: 00:e0:81:d5:07:43
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.73
-      mac: 00:e0:81:d5:07:40
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:41
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:42
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92fd'
-      interface: InfiniBand
-      ip: 172.18.64.73
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fd
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92fe'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce29"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
deleted file mode 100644
index 142320d66d67d44f30c44363dcbf8b61d70a8177..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-74:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.74
-      mac: 00:e0:81:d5:08:83
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.74
-      mac: 00:e0:81:d5:08:80
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:81
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:82
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92dd'
-      interface: InfiniBand
-      ip: 172.18.64.74
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:dd
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92de'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:de
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce87"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
deleted file mode 100644
index eaa02ecb90aed278d4339435f624d9a6e315988f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-75:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.75
-      mac: 00:e0:81:d5:07:07
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.75
-      mac: 00:e0:81:d5:07:04
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:05
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:06
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92e5'
-      interface: InfiniBand
-      ip: 172.18.64.75
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92e6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce35"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
deleted file mode 100644
index f5c6f37b978abaa16e75f17559bf15cf85ee5366..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-76:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.76
-      mac: 00:e0:81:d5:07:23
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.76
-      mac: 00:e0:81:d5:07:20
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:21
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:22
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92d5'
-      interface: InfiniBand
-      ip: 172.18.64.76
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92d6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce34"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
deleted file mode 100644
index c6be12920f8bb1955f02a0fb80bebfe1322ed621..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-77:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.77
-      mac: 00:e0:81:d5:07:a3
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.77
-      mac: 00:e0:81:d5:07:a0
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:a1
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:a2
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92e1'
-      interface: InfiniBand
-      ip: 172.18.64.77
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92e2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce28"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
deleted file mode 100644
index 5786c94cd2d94b8ddb0072a6582667c6f709f758..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-78:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.78
-      mac: 00:e0:81:d5:08:53
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.78
-      mac: 00:e0:81:d5:08:50
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:51
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:52
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9301'
-      interface: InfiniBand
-      ip: 172.18.64.78
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:01
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9302'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e60bc8"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
deleted file mode 100644
index 1215ef9119518fff294abc49616877df692c3b7f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-79:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.79
-      mac: 00:e0:81:d5:08:7b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.79
-      mac: 00:e0:81:d5:08:78
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:79
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:7a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92f5'
-      interface: InfiniBand
-      ip: 172.18.64.79
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92f6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f6
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e901f3"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
deleted file mode 100644
index f405846fd8d956341b0242e0d83ef8c4b35a1b5b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-8:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.8
-      mac: 00:e0:81:d5:08:0b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.8
-      mac: 00:e0:81:d5:08:08
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:09
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:0a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9175'
-      interface: InfiniBand
-      ip: 172.18.64.8
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:75
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9176'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:76
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e70e50"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
deleted file mode 100644
index 239c253854c6867c6c90614cf7748dbf2b36bab8..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-80:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.80
-      mac: 00:e0:81:d5:06:db
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.80
-      mac: 00:e0:81:d5:06:d8
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:d9
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:da
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92d1'
-      interface: InfiniBand
-      ip: 172.18.64.80
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b92d2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e60b2a"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
deleted file mode 100644
index df4176f0b90b0bbd4f2a04906fd98a1093321f54..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-81:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.81
-      mac: 00:e0:81:d5:07:27
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.81
-      mac: 00:e0:81:d5:07:24
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:25
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:26
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93a9'
-      interface: InfiniBand
-      ip: 172.18.64.81
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a9
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93aa'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce88"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
deleted file mode 100644
index dbebb8152507aba4c94186cccb9456aea78befdb..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-82:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.82
-      mac: 00:e0:81:d5:07:b7
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.82
-      mac: 00:e0:81:d5:07:b4
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:b5
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:b6
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9395'
-      interface: InfiniBand
-      ip: 172.18.64.82
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:95
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9396'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:96
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce18"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
deleted file mode 100644
index 209abc8d9b0aa625b875260da302d239f40d4746..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-83:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.83
-      mac: 00:e0:81:d5:06:93
-      management: true
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.64.83
-      mac: 00:e0:81:d5:06:90
-      management: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:91
-      management: false
-      rate: 100000000
-    eth2:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:92
-      management: false
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93a5'
-      interface: InfiniBand
-      ip: 172.18.64.83
-      ip6: fe80::202:c903:b:93a5
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a5
-      management: false
-      name: ib0
-      rate: 20000000000
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93a6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a6
-      management: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: Hitachi HDS72103
-      rev: JPFOA3EA
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
deleted file mode 100644
index 812cc1af628fbc70dcd30062a5142e8f9f8a6e9f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-84:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.84
-      mac: 00:e0:81:d5:07:1b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.84
-      mac: 00:e0:81:d5:07:18
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:19
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:1a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b939d'
-      interface: InfiniBand
-      ip: 172.18.64.84
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9d
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b939e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9e
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e9021d"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
deleted file mode 100644
index c85feac87312bd02802dfa17ad13ecc705496888..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-85:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.85
-      mac: 00:e0:81:d5:07:ef
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.85
-      mac: 00:e0:81:d5:07:ec
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:ed
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:ee
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9399'
-      interface: InfiniBand
-      ip: 172.18.64.85
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:99
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b939a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9a
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e60b13"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml
deleted file mode 100644
index bcfbfefcfaf0ce97d1cea6b5830e678599a1d01f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-86:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/10/2011
-    vendor: American Megatrends Inc.
-    version: V7.04
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.86
-      mac: 00:e0:81:d5:08:0f
-      management: true
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.64.86
-      mac: 00:e0:81:d5:08:0c
-      management: false
-      mounted: true
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:0d
-      management: false
-      mounted: false
-      rate: 100000000
-    eth2:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:0e
-      management: false
-      mounted: false
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93a1'
-      interface: InfiniBand
-      ip: 172.18.64.86
-      ip6: fe80::202:c903:b:93a1
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a1
-      management: false
-      mounted: true
-      name: ib0
-      rate: 20000000000
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93a2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a2
-      management: false
-      mounted: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: Hitachi HDS72103
-      rev: JPFOA3EA
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
deleted file mode 100644
index cad9e711ddf31a7a932753930562f104eeaf1c86..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-87:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.87
-      mac: 00:e0:81:d5:07:5b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.87
-      mac: 00:e0:81:d5:07:58
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:59
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:5a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93ad'
-      interface: InfiniBand
-      ip: 172.18.64.87
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ad
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93ae'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce12"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
deleted file mode 100644
index f5538ec9de1f33effd944b84a360eee4530ec062..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-88:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.88
-      mac: 00:e0:81:d5:08:63
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.88
-      mac: 00:e0:81:d5:08:60
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:61
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:62
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93b1'
-      interface: InfiniBand
-      ip: 172.18.64.88
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b93b2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b2
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cdfd"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
deleted file mode 100644
index 5015a62b60c0582165a2c495b2ebdef1d3a6ba4e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-89:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.89
-      mac: 00:e0:81:d5:08:9b
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.89
-      mac: 00:e0:81:d5:08:98
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:99
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:9a
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5ced'
-      interface: InfiniBand
-      ip: 172.18.64.89
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ed
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5cee'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8cdcf"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
deleted file mode 100644
index c2afa8341696d403cb7b8c1ed55ea39a93c451c9..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-9:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.9
-      mac: 00:e0:81:d5:08:87
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.9
-      mac: 00:e0:81:d5:08:84
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:85
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:86
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b9169'
-      interface: InfiniBand
-      ip: 172.18.64.9
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:69
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b916a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6a
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e6bf36"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
deleted file mode 100644
index 53e724f64a4985d13693168771ccbd259a302ef3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-90:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.90
-      mac: 00:e0:81:d5:06:67
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.90
-      mac: 00:e0:81:d5:06:64
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:65
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:66
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d09'
-      interface: InfiniBand
-      ip: 172.18.64.90
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:09
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5d0a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0a
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce40"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
deleted file mode 100644
index 0a85c9c2737acd2b4cf1650f7186be2a7870488b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-91:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.91
-      mac: 00:e0:81:d5:06:df
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.91
-      mac: 00:e0:81:d5:06:dc
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:dd
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:de
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5cd1'
-      interface: InfiniBand
-      ip: 172.18.64.91
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5cd2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce49"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
deleted file mode 100644
index a5b0d4a846cd3e6388c9b4718d10e607df5a6324..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-92:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.92
-      mac: 00:e0:81:d5:07:a7
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.92
-      mac: 00:e0:81:d5:07:a4
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:a5
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:a6
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5ce5'
-      interface: InfiniBand
-      ip: 172.18.64.92
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:e5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5ce6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e60b32"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
deleted file mode 100644
index 2a90300924b7c751605abe171dd37809c60c7fde..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-93:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.93
-      mac: 00:e0:81:d5:06:4f
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.93
-      mac: 00:e0:81:d5:06:4c
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:4d
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:4e
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5ead'
-      interface: InfiniBand
-      ip: 172.18.64.93
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:ad
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5eae'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fffd"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml
deleted file mode 100644
index ec138835e437be1a346fb538dd193b5a02204586..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-94:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-    serial: 1009390096
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.94
-      mac: 00:e0:81:d5:07:93
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.64.94
-      ip6: fe80::2e0:81ff:fed5:790
-      mac: 00:e0:81:d5:07:90
-      management: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:91
-      management: false
-      rate: 100000000
-    eth2:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:92
-      management: false
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5c95'
-      interface: InfiniBand
-      ip: 172.18.64.94
-      ip6: fe80::202:c903:b:5c95
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:95
-      management: false
-      name: ib0
-      rate: 20000000000
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5c96'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:96
-      management: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: Hitachi HDS72103
-      rev: A3EA
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
deleted file mode 100644
index 395f3e90fedb838913cb6db3c5c269f096aad03d..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-95:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.95
-      mac: 00:e0:81:d5:06:c3
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.95
-      mac: 00:e0:81:d5:06:c0
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:c1
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:06:c2
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5e95'
-      interface: InfiniBand
-      ip: 172.18.64.95
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:95
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5e96'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:96
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e6855b"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml
deleted file mode 100644
index 84ce9c104fc58c2827c5a00a8ed9779d8d3094b1..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-96:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-    serial: 1009390098
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.96
-      mac: 00:e0:81:d5:08:37
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.64.96
-      ip6: fe80::2e0:81ff:fed5:834
-      mac: 0
-      management: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:35
-      management: false
-      rate: 100000000
-    eth2:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:36
-      management: false
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5e9d'
-      interface: InfiniBand
-      ip: 172.18.64.96
-      ip6: fe80::202:c903:b:5e9d
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9d
-      management: false
-      name: ib0
-      rate: 20000000000
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5e9e'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9e
-      management: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: Hitachi HDS72103
-      rev: A3EA
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
deleted file mode 100644
index 6424589d072396dc1ec27281fc4d7cef96d31cb1..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-97:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.97
-      mac: 00:e0:81:d5:08:03
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.97
-      mac: 00:e0:81:d5:08:00
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:01
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:02
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5ed5'
-      interface: InfiniBand
-      ip: 172.18.64.97
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:d5
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5ed6'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e: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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8fc48"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml
deleted file mode 100644
index a4083844e6b61019f8813e6b1e020509542a1c6c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-98:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-    serial: 1009390100
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.98
-      mac: 00:e0:81:d5:07:d7
-    eth0:
-      driver: e1000e
-      interface: Ethernet
-      ip: 172.16.64.98
-      ip6: fe80::2e0:81ff:fed5:7d4
-      mac: 00:e0:81:d5:07:d4
-      management: false
-      rate: 1000000000
-    eth1:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:d5
-      management: false
-      rate: 100000000
-    eth2:
-      driver: e1000e
-      interface: Ethernet
-      mac: 00:e0:81:d5:07:d6
-      management: false
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5e99'
-      interface: InfiniBand
-      ip: 172.18.64.98
-      ip6: fe80::202:c903:b:5e99
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:99
-      management: false
-      name: ib0
-      rate: 20000000000
-      version: MT26418
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5e9a'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9a
-      management: false
-      name: ib1
-      rate: 10000000000
-      version: MT26418
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: node-was-not-available-to-retrieve-this-value
-      model: Hitachi HDS72103
-      rev: A3EA
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
deleted file mode 100644
index 86a4e56ab76090a57c561ef5bd04bf7556d1f025..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphene-99:
-  architecture:
-    nb_cores: 4
-    nb_procs: 1
-    nb_threads: 4
-    platform_type: x86_64
-  bios:
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-    version: V7.01e
-  chassis:
-    manufacturer: TYAN
-    name: S5501
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.64.99
-      mac: 00:e0:81:d5:08:d7
-      management: true
-    eth0:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      ip: 172.16.64.99
-      mac: 00:e0:81:d5:08:d4
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp3s0
-      rate: 1000000000
-      vendor: Intel
-    eth1:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:d5
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp4s0
-      rate: 100000000
-      vendor: Intel
-    eth2:
-      driver: e1000e
-      firmware_version: 1.8-0
-      interface: Ethernet
-      mac: 00:e0:81:d5:08:d6
-      management: false
-      model: 82574L Gigabit Network Connection
-      name: enp5s0
-      vendor: Intel
-    ib0:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5eb1'
-      interface: InfiniBand
-      ip: 172.18.64.99
-      mac: 80:00:02:08:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:b1
-      management: false
-      model: MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
-      name: ib0
-      rate: 20000000000
-      vendor: Mellanox Technologies
-    ib1:
-      driver: mlx4_core
-      firmware_version: 2.9.1000
-      guid: '0x0002c903000b5eb2'
-      interface: InfiniBand
-      mac: 80:00:02:09:fe:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:b2
-      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: intel_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: acpi-cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 8388608
-    clock_speed: 2550000000
-    ht_capable: true
-    instruction_set: x86-64
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    vendor: Intel
-    version: X3440
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000cca371e8ce36"
-      by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
-      firmware_version: JPFOA3EA
-      model: Hitachi HDS72103
-      size: 320072933376
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite_extra.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite_extra.yaml
index 0c110da1b365040af4d243614f33b2205cb5dc40..2f3d76d8f3333cd1946c5f74d6cc01827ed16736 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite_extra.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite_extra.yaml
@@ -1,40 +1,24 @@
 ---
 nodes:
   graphite-1:
-    network_adapters:
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/41
     mic:
       mic_count: 1
       mic_cores: 61
       mic_vendor: Intel Xeon Phi
       mic_model: 7120P
   graphite-2:
-    network_adapters:
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/43
     mic:
       mic_count: 1
       mic_cores: 61
       mic_vendor: Intel Xeon Phi
       mic_model: 7120P
   graphite-3:
-    network_adapters:
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/45
     mic:
       mic_count: 1
       mic_cores: 61
       mic_vendor: Intel Xeon Phi
       mic_model: 7120P
   graphite-4:
-    network_adapters:
-      bmc:
-        switch: sgraphene3-ipmi
-        switch_port: 1/0/47
     mic:
       mic_count: 1
       mic_cores: 61
diff --git a/input/grid5000/sites/nancy/networks/net-links.yaml b/input/grid5000/sites/nancy/networks/net-links.yaml
index 84d5e08ac5d0ed2a20e09f4444cb4a9c093e65de..62ba4b55e15f2baddfdcf0bee0d1f3c8f9427f94 100644
--- a/input/grid5000/sites/nancy/networks/net-links.yaml
+++ b/input/grid5000/sites/nancy/networks/net-links.yaml
@@ -1,48 +1,4 @@
 ---
-sgraphene1:
-  network_adapters:
-    eth0:
-      mounted: true
-      ip: 172.16.79.201
-      mac: 40:01:C6:8B:E4:80
-    bmc:
-      mounted: true
-      mac: 40:01:C6:BE:8E:40
-      ip: 172.17.79.201
-
-sgraphene2:
-  network_adapters:
-    eth0:
-      mounted: true
-      ip: 172.16.79.202
-      mac: 40:01:C6:8C:06:00
-    bmc:
-      mounted: true
-      mac: 40:01:C6:BE:49:00
-      ip: 172.17.79.202
-
-sgraphene3:
-  network_adapters:
-    eth0:
-      mounted: true
-      ip: 172.16.79.203
-      mac: 40:01:C6:8B:C2:00
-    bmc:
-      mounted: true
-      ip: 172.17.79.203
-      mac: 40:01:C6:BE:4D:00
-
-sgraphene4:
-  network_adapters:
-    eth0:
-      mounted: true
-      ip: 172.16.79.204
-      mac: 40:01:C6:8B:EE:00
-    bmc:
-      mounted: true
-      mac: 40:01:C6:BE:85:00
-      ip: 172.17.79.204
-
 sgriffon1:
   network_adapters:
     eth0:
diff --git a/input/grid5000/sites/nancy/networks/sgraphene1.yaml b/input/grid5000/sites/nancy/networks/sgraphene1.yaml
deleted file mode 100644
index bccd2ce5c84ed3c40b60dbeb476bbcdca6bab2a3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/networks/sgraphene1.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
----
-sgraphene1:
-  model: 3com 4510G
-  warranty: 2014-10-01
-  kind: switch
-  site: nancy
-  snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-    power:
-      available: true
-      resolution: 1
-      via:
-        pdu:
-          - uid: graphene-pdu1
-            port: 6
-          - uid: graphene-pdu2
-            port: 7
-  monitoring:
-    wattmeter: multiple
-    metric: power
-  vlans:
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.16.79.201
-  backplane_bps: 176000000000
-  linecards:
-    0:
-      snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      kavlan_pattern: "%PORT%"
-      kind: node
-      port: eth0
-      rate: 1000000000
-      ports:
-        1: graphene-2
-        3: graphene-4
-        6: graphene-5
-        5: graphene-6
-        8: graphene-7
-        12: graphene-8
-        11: graphene-9
-        7: graphene-10
-        10: graphene-11
-        9: graphene-12
-        14: graphene-13
-        13: graphene-14
-        16: graphene-15
-        15: graphene-16
-        18: graphene-17
-        17: graphene-18
-        20: graphene-19
-        19: graphene-20
-        22: graphene-21
-        21: graphene-22
-        24: graphene-23
-        23: graphene-24
-        26: graphene-25
-        25: graphene-26
-        28: graphene-27
-        30: graphene-29
-        29: graphene-30
-        32: graphene-31
-        31: graphene-32
-        34: graphene-33
-        33: graphene-34
-        36: graphene-35
-        38: graphene-37
-        37: graphene-38
-    1:
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports:
-        1: 
-          uid: sgravillon1
-          kind: switch
diff --git a/input/grid5000/sites/nancy/networks/sgraphene2.yaml b/input/grid5000/sites/nancy/networks/sgraphene2.yaml
deleted file mode 100644
index 1df35b801f67d2ee36dddd8650b7548a140f4078..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/networks/sgraphene2.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sgraphene2:
-  model: 3com 4510G
-  warranty: 2014-10-01
-  kind: switch
-  site: nancy
-  snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-  vlans:
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.16.79.202
-  backplane_bps: 176000000000
-  linecards:
-    0:
-      snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      kavlan_pattern: "%PORT%"
-      kind: node
-      port: eth0
-      rate: 1000000000
-      ports:
-        2: graphene-41
-        3: graphene-42
-        4: graphene-43
-        6: graphene-45
-        7: graphene-46
-        8: graphene-47
-        9: graphene-48
-        10: graphene-49
-        11: graphene-50
-        12: graphene-51
-        13: graphene-52
-        14: graphene-53
-        16: graphene-55
-        18: graphene-57
-        19: graphene-58
-        20: graphene-59
-        21: graphene-60
-        23: graphene-62
-        24: graphene-63
-        25: graphene-64
-        26: graphene-65
-        27: graphene-66
-        28: graphene-67
-        29: graphene-68
-        30: graphene-69
-        31: graphene-70
-        32: graphene-71
-        33: graphene-72
-        34: graphene-73
-        35: graphene-74
-    1:
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports:
-        1: 
-          uid: sgravillon1
-          kind: switch
diff --git a/input/grid5000/sites/nancy/networks/sgraphene3.yaml b/input/grid5000/sites/nancy/networks/sgraphene3.yaml
deleted file mode 100644
index 806d57ecaaf6e077d7950480375edabb1775b118..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/networks/sgraphene3.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-sgraphene3:
-  model: 3com 4510G
-  warranty: 2014-10-01
-  kind: switch
-  site: nancy
-  snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-  vlans:
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.16.79.203
-  backplane_bps: 176000000000
-  linecards:
-    0:
-      snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      kavlan_pattern: "%PORT%"
-      kind: node
-      port: eth0
-      rate: 1000000000
-      ports:
-        2: graphene-75
-        1: graphene-76
-        4: graphene-77
-        3: graphene-78
-        6: graphene-79
-        5: graphene-80
-        8: graphene-81
-        7: graphene-82
-        9: graphene-84
-        12: graphene-85
-        14: graphene-87
-        13: graphene-88
-        16: graphene-89
-        15: graphene-90
-        17: graphene-92
-        20: graphene-93
-        22: graphene-95
-        24: graphene-97
-        26: graphene-99
-        25: graphene-100
-        28: graphene-101
-        27: graphene-102
-        30: graphene-103
-        29: graphene-104
-    1:
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports:
-        1: 
-          uid: sgravillon1
-          kind: switch
diff --git a/input/grid5000/sites/nancy/networks/sgraphene4.yaml b/input/grid5000/sites/nancy/networks/sgraphene4.yaml
deleted file mode 100644
index c36525608e68ec255e810537721430438617aaee..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/networks/sgraphene4.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
----
-sgraphene4:
-  model: 3com 4510G
-  warranty: 2014-10-01
-  kind: switch
-  site: nancy
-  snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-  vlans:
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.16.79.204
-  backplane_bps: 176000000000
-  linecards:
-    0:
-      snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      kavlan_pattern: "%PORT%"
-      kind: node
-      port: eth0
-      rate: 1000000000
-      ports:
-        2: graphene-106
-        1: graphene-105
-        3: graphene-107
-        4: graphene-108
-        5: graphene-109
-        6: graphene-110
-        7: graphene-111
-        8: graphene-112
-        9: graphene-113
-        10: graphene-114
-        11: graphene-115
-        12: graphene-116
-        13: graphene-117
-        14: graphene-118
-        15: graphene-119
-        16: graphene-120
-        17: graphene-121
-        18: graphene-122
-        20: graphene-124
-        21: graphene-125
-        22: graphene-126
-        24: graphene-128
-        25: graphene-129
-        26: graphene-130
-        27: graphene-131
-        28: graphene-132
-        29: graphene-133
-        30: graphene-134
-        31: graphene-135
-        32: graphene-136
-        33: graphene-137
-        34: graphene-138
-        35: graphene-139
-        36: graphene-140
-        37: graphene-141
-        38: graphene-142
-        39: graphene-143
-    1:
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports:
-        1: 
-          uid: sgravillon1
-          kind: switch
diff --git a/input/grid5000/sites/nancy/networks/sgrapheneib.yaml b/input/grid5000/sites/nancy/networks/sgrapheneib.yaml
deleted file mode 100644
index 5c34fc63f104431fca60a47867fa8aa642a96872..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/nancy/networks/sgrapheneib.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-sgrapheneib:
-  model: Infiniband
-  warranty: 2015-11-01
-  kind: switch
-  site: nancy
-  snmp_community: public
-  sensors:
-    network:
-      available: false
-  weathermap:
-    use_cacti: "no"
-  vlans: {}
-  linecards:
-    12:
-      snmp_pattern: "%LINECARD%/%PORT%"
-      kavlan_pattern: "%LINECARD%/%PORT%"
-      kind: switch
-      rate: 20000000000
-      ports:
-        42: 
-          uid: node-mapping-undocumented-for-this-ib-switch
-          kind: node
diff --git a/input/grid5000/sites/nancy/networks/sgravillon1.yaml b/input/grid5000/sites/nancy/networks/sgravillon1.yaml
index 9f6d70545c5a4025760cb1a499b0e1811acf1732..08dd62f4600096f707303abbda4e5407b0a27622 100644
--- a/input/grid5000/sites/nancy/networks/sgravillon1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgravillon1.yaml
@@ -47,17 +47,6 @@ sgravillon1:
       rate: 10000000000
       ports:
         1: sgriffon1
-    3:
-      snmp_pattern: "C%PORT%"
-      kavlan_pattern: "C%PORT%"
-      backplane_bps: 14400000000
-      model: J8708A
-      kind: switch
-      rate: 10000000000
-      ports:
-        1: sgraphene1
-        2: sgraphene2
-        4: sgraphene4
     4:
       snmp_pattern: "D%PORT%"
       kavlan_pattern: "D%PORT%"
@@ -74,9 +63,6 @@ sgravillon1:
           kind: other
           uid: fgriffon2
           port: eth2
-        4:
-          uid: sgraphene3
-          kind: switch
     6:
       snmp_pattern: "F%PORT%"
       kavlan_pattern: "F%PORT%"
diff --git a/input/grid5000/sites/nancy/pdus.yaml b/input/grid5000/sites/nancy/pdus.yaml
index 8a3e33adc497078768fa24044e2b48e7cdaa726d..41c9278c552a3ef50d4912192c5a3ccb8687a08a 100644
--- a/input/grid5000/sites/nancy/pdus.yaml
+++ b/input/grid5000/sites/nancy/pdus.yaml
@@ -12,34 +12,6 @@ pdus:
           unit: W
         resolution: 1
 
-  graphene-pdu[1-6]:
-    vendor: APC
-    model: AP7953
-    sensors:
-     - power:
-        per_outlets: false
-        snmp:
-          available: true
-          total_oids: 
-            - iso.3.6.1.4.1.318.1.1.12.1.16.0
-          unit: W
-        resolution: 1
-  
-  graphene-pdu[7-8]:
-    vendor: Eaton Corporation
-    model: ''
-    sensors:
-     - power:
-        per_outlets: true
-        snmp:
-          available: true
-          total_oids:
-            - iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1
-            - iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2
-          unit: W
-          outlet_prefix_oid: iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0
-        resolution: 60
-
   griffon-pdu[1-2]:
     vendor: APC
     model: AP7953
@@ -117,38 +89,6 @@ pdus:
     ip:  172.17.79.244 
     mac: 00:C0:B7:85:13:9C
 
-  graphene-pdu1:
-    ip:  172.17.79.208 
-    mac: 00:C0:B7:4D:A4:B0
-
-  graphene-pdu2:
-    ip:  172.17.79.209 
-    mac: 00:C0:B7:4D:A4:A3
-
-  graphene-pdu3:
-    ip:  172.17.79.210 
-    mac: 00:C0:B7:4D:A4:AA
-
-  graphene-pdu4:
-    ip:  172.17.79.211 
-    mac: 00:C0:B7:4D:A4:BC
-
-  graphene-pdu5:
-    ip:  172.17.79.212 
-    mac: 00:C0:B7:4D:A4:AC
-
-  graphene-pdu6:
-    ip:  172.17.79.213 
-    mac: 00:C0:B7:4D:A1:87
-
-  graphene-pdu7:
-    ip:  172.17.79.214 
-    mac: 00:C0:B7:4D:D7:87
-
-  graphene-pdu8:
-    ip:  172.17.79.215 
-    mac: 00:C0:B7:4D:A1:87
-
   grimoire-pdu1:
     ip: 172.17.79.245
     mac: 00:C0:B7:85:13:93
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index 0e380a75479053cd1f738b37402adf86b29b0258..7a8807f18168b80a7e74e222376e01903a496af8 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -80,7 +80,6 @@ vlans:
       local lyon hercule eth1 0 0 3 0
       local lyon nova eth0 0 0 4 0
       local nancy griffon eth0 0 0 0 0
-      local nancy graphene eth0 0 0 1 0
       local nancy grcinq eth0 0 0 2 0
       local nancy grvingt eth0 0 0 3 0
       local nancy graphite eth0 0 0 4 0
@@ -137,7 +136,6 @@ vlans:
       global nancy grisou eth4 0 0 18 100
       global nancy grele eth0 0 0 19 0
       global nancy griffon eth0 0 0 20 0
-      global nancy graphene eth0 0 0 21 0
       global nancy graphite eth0 0 0 22 0
       global nancy grcinq eth0 0 0 23 0
       global nancy grvingt eth0 0 0 24 0
@@ -178,7 +176,6 @@ vlans:
       routed lyon hercule eth1 0 12 3 0
       routed lyon nova eth0 0 12 4 0
       routed nancy griffon eth0 0 16 0 0
-      routed nancy graphene eth0 0 16 1 0
       routed nancy grcinq eth0 0 16 2 0
       routed nancy grvingt eth0 0 16 3 0
       routed nancy graphite eth0 0 16 4 0
diff --git a/lib/refrepo/gen/puppet/conf-examples/console-password.yaml b/lib/refrepo/gen/puppet/conf-examples/console-password.yaml
index aae2f16e251ed38793806b394144de191f85333d..1465045a861ad99abeb4d34d28f01e2fb43b06e5 100644
--- a/lib/refrepo/gen/puppet/conf-examples/console-password.yaml
+++ b/lib/refrepo/gen/puppet/conf-examples/console-password.yaml
@@ -14,7 +14,6 @@ lyon:
   hercule: login password
 nancy:
   griffon: login password
-  graphene: login password
   graphite: login password
   graphique: login password
   graoully: login password
diff --git a/lib/refrepo/gen/puppet/conf-examples/kadeployg5k-dev.yaml b/lib/refrepo/gen/puppet/conf-examples/kadeployg5k-dev.yaml
index 8175c9674a8a69dc83a906d39fd5a0f39578489b..81f3a2293cc779e374b0dc24c47cd66e782866da 100644
--- a/lib/refrepo/gen/puppet/conf-examples/kadeployg5k-dev.yaml
+++ b/lib/refrepo/gen/puppet/conf-examples/kadeployg5k-dev.yaml
@@ -155,22 +155,6 @@ nancy:
     boot.timeout.0: 180
     boot.timeout.1: 900
     remoteops.reboot.very_hard.cmd: "/usr/bin/lanpower -c safety_cycle -m HOSTNAME_SHORT"
-  graphene:
-    reboot.timeout: 250
-    reboot.kexec: 120
-    user.params: console=tty0 console=ttyS0,38400n8
-    deploy.drivers: ata_piix
-    deploy.params: ETH_DRV=e1000e ETH_DEV=eth0 DISK_DRV=ahci console=tty0 console=ttyS0,38400n8
-      ramdisk_size=290000 rw noapic init=/linuxrc
-    dhcp.serial: 0 38400
-    nfsroot.params: boot=casper netboot=nfs nfsroot=172.28.53.104:/srv/livecd/recette
-      initrd=livecd/initrd.lz console=tty0 console=ttyS0,115200n8 ip
-    deployment.timeout: 450
-    broadcast.retries: 0
-    broadcast.timeout: 900
-    boot.timeout.0: 180
-    boot.timeout.1: 400
-    remoteops.reboot.very_hard.cmd: "/usr/bin/lanpower -c safety_cycle -m HOSTNAME_SHORT"
   graphique:
     reboot.timeout: 350
     reboot.kexec: 120
diff --git a/lib/refrepo/gen/puppet/conf-examples/kadeployg5k.yaml b/lib/refrepo/gen/puppet/conf-examples/kadeployg5k.yaml
index f7b8a3982533783e575776ec2f37915f3f33816f..14bb0ead54cd7a08bc91cbdc57b45353d3fe673b 100644
--- a/lib/refrepo/gen/puppet/conf-examples/kadeployg5k.yaml
+++ b/lib/refrepo/gen/puppet/conf-examples/kadeployg5k.yaml
@@ -155,22 +155,6 @@ nancy:
     boot.timeout.0: 180
     boot.timeout.1: 900
     remoteops.reboot.very_hard.cmd: "/usr/bin/lanpower -c safety_cycle -m HOSTNAME_SHORT"
-  graphene:
-    reboot.timeout: 250
-    reboot.kexec: 120
-    user.params: console=tty0 console=ttyS0,38400n8
-    deploy.drivers: ata_piix
-    deploy.params: ETH_DRV=e1000e ETH_DEV=eth0 DISK_DRV=ahci console=tty0 console=ttyS0,38400n8
-      ramdisk_size=290000 rw noapic init=/linuxrc
-    dhcp.serial: 0 38400
-    nfsroot.params: boot=casper netboot=nfs nfsroot=172.28.53.104:/srv/livecd/recette
-      initrd=livecd/initrd.lz console=tty0 console=ttyS0,115200n8 ip
-    deployment.timeout: 450
-    broadcast.retries: 0
-    broadcast.timeout: 900
-    boot.timeout.0: 180
-    boot.timeout.1: 400
-    remoteops.reboot.very_hard.cmd: "/usr/bin/lanpower -c safety_cycle -m HOSTNAME_SHORT"
   graphique:
     reboot.timeout: 350
     reboot.kexec: 120
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 81fe409a2f2fa1491c90d25bc72e5a5a84601bb1..0f2e99674b81ae81ee1a5ab9b2e203c8bbb51e62 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -48,10 +48,6 @@ graoully:
   eno4: eth5
   enp129s0f0: eth2
   enp129s0f1: eth3
-graphene:
-  enp3s0: eth0
-  enp4s0: eth1
-  enp5s0: eth2
 graphique:
   eno1: eth0
   eno2: eth1
diff --git a/lib/refrepo/valid/data/homogeneity.yaml.erb b/lib/refrepo/valid/data/homogeneity.yaml.erb
index 605f3aa156cbccdce96914dc5e26486ea7bfa0eb..3486a56bca633bec56389c945c4373f12b8bc405 100644
--- a/lib/refrepo/valid/data/homogeneity.yaml.erb
+++ b/lib/refrepo/valid/data/homogeneity.yaml.erb
@@ -13,8 +13,6 @@
 #   graphique: model differs on graphique-1
 #   grisou-50+: 2 IB interfaces
 #   grisou-49+: Doesn't have eth4 link
-#   graphene-[45,85]: wrong BIOS version
-#   graphene-104+: different wattmeter
 #   griffon-[1-91]: missing some serial
 #   griffon-[11-14]: additional myrinet interface
 #
@@ -37,14 +35,6 @@ nancy:
     - ~network_adapters.eth4.enabled
     - ~network_adapters.eth4.mountable
     - +network_adapters.ib0
-  graphene-[45-46]:
-    - ~bios.release_date
-    - ~bios.version
-  graphene-[86-87]:
-    - ~bios.release_date
-    - ~bios.version
-  graphene-[104-144]:
-    - ~monitoring.wattmeter
   griffon-[1-91]:
     - +chassis.serial
     - -chassis.serial
diff --git a/lib/refrepo/valid/network.rb b/lib/refrepo/valid/network.rb
index ee5bc8c098219653505e6c1875e0ec066db17d9a..8b008cd84f3f3328857e7ac2ba192d8a4552319c 100644
--- a/lib/refrepo/valid/network.rb
+++ b/lib/refrepo/valid/network.rb
@@ -5,7 +5,7 @@
 # in clustershell and graphviz debian packages
 
 # FIXME infiniband equipment is not completely described in the ref-api yet. See Bug 8586
-HPC_SWITCHES = ['ib-grenoble', 'voltaire-1', 'voltaire-2', 'voltaire-3', 'sgraoullyib', 'sgrapheneib', 'sw-myrinet', 'sgrele-opf']
+HPC_SWITCHES = ['ib-grenoble', 'voltaire-1', 'voltaire-2', 'voltaire-3', 'sgraoullyib', 'sw-myrinet', 'sgrele-opf']
 
 def check_network_description(options)
   ok = true