diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json b/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json
deleted file mode 100644
index 34cc89b0528e78ec31c0181fa8435cbf3ba9cd7f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json
+++ /dev/null
@@ -1,297 +0,0 @@
-{
-  "created_at": "Thu, 01 Dec 2011 00:00:00 GMT",
-  "exotic": false,
-  "kavlan": true,
-  "metrics": [
-    {
-      "description": "Front node ambiant temperature reported by BMC, in celsius",
-      "name": "bmc_temp_ambiant_celsius",
-      "period": 5000,
-      "source": {
-        "id": 5,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 1A reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod1a"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 22,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 1B reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod1b"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 23,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 1C reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod1c"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 24,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 1D reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod1d"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 25,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 2A reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod2a"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 26,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 2B reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod2b"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 27,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 2C reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod2c"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 28,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 2D reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod2d"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 29,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 3A reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod3a"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 30,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 3B reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod3b"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 31,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 3C reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod3c"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 32,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 3D reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod3d"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 33,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 4A reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod4a"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 34,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 4B reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod4b"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 35,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 4C reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod4c"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 36,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of FAN MOD 4D reported by BMC, in rpm",
-      "labels": {
-        "fan": "mod4d"
-      },
-      "name": "bmc_fan_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 37,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Input byte counter for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Input byte counter for the network device port",
-      "labels": {
-        "interface": "eth1"
-      },
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port",
-      "labels": {
-        "interface": "eth1"
-      },
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Input byte counter for the network device port",
-      "labels": {
-        "interface": "eth2"
-      },
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port",
-      "labels": {
-        "interface": "eth2"
-      },
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    }
-  ],
-  "model": "Dell PowerEdge 1950",
-  "queues": [
-    "default",
-    "admin"
-  ],
-  "type": "cluster",
-  "uid": "granduc"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
deleted file mode 100644
index b9a38cceac46605031e776b376dceb876510bccc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/30/2010",
-    "vendor": "Dell Inc.",
-    "version": "2.7.0"
-  },
-  "bmc_version": "1.33",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge 1950",
-    "serial": "50W883J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.12",
-      "kavlan-11": "10.7.237.12",
-      "kavlan-12": "10.11.237.12",
-      "kavlan-13": "10.15.237.12",
-      "kavlan-14": "10.19.237.12",
-      "kavlan-16": "10.27.237.12",
-      "kavlan-18": "10.35.237.12",
-      "kavlan-2": "192.168.208.12",
-      "kavlan-20": "10.43.237.12",
-      "kavlan-21": "10.47.237.12",
-      "kavlan-3": "192.168.224.12",
-      "kavlan-4": "10.40.0.12",
-      "kavlan-5": "10.40.64.12",
-      "kavlan-6": "10.40.128.12",
-      "kavlan-7": "10.40.192.12",
-      "kavlan-8": "10.41.0.12",
-      "kavlan-9": "10.41.64.12"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.193.12",
-      "kavlan-11": "10.7.237.112",
-      "kavlan-12": "10.11.237.112",
-      "kavlan-13": "10.15.237.112",
-      "kavlan-14": "10.19.237.112",
-      "kavlan-16": "10.27.237.112",
-      "kavlan-18": "10.35.237.112",
-      "kavlan-2": "192.168.209.12",
-      "kavlan-20": "10.43.237.112",
-      "kavlan-21": "10.47.237.112",
-      "kavlan-3": "192.168.225.12",
-      "kavlan-4": "10.40.1.12",
-      "kavlan-5": "10.40.65.12",
-      "kavlan-6": "10.40.129.12",
-      "kavlan-7": "10.40.193.12",
-      "kavlan-8": "10.41.1.12",
-      "kavlan-9": "10.41.65.12"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:381:1::c",
-      "kavlan-11": "2001:660:4406:38b:1::c",
-      "kavlan-12": "2001:660:4406:38c:1::c",
-      "kavlan-13": "2001:660:4406:38d:1::c",
-      "kavlan-14": "2001:660:4406:38e:1::c",
-      "kavlan-16": "2001:660:4406:390:1::c",
-      "kavlan-18": "2001:660:4406:392:1::c",
-      "kavlan-2": "2001:660:4406:382:1::c",
-      "kavlan-20": "2001:660:4406:394:1::c",
-      "kavlan-21": "2001:660:4406:395:1::c",
-      "kavlan-3": "2001:660:4406:383:1::c",
-      "kavlan-4": "2001:660:4406:384:1::c",
-      "kavlan-5": "2001:660:4406:385:1::c",
-      "kavlan-6": "2001:660:4406:386:1::c",
-      "kavlan-7": "2001:660:4406:387:1::c",
-      "kavlan-8": "2001:660:4406:388:1::c",
-      "kavlan-9": "2001:660:4406:389:1::c"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:381:1:1::c",
-      "kavlan-11": "2001:660:4406:38b:1:1::c",
-      "kavlan-12": "2001:660:4406:38c:1:1::c",
-      "kavlan-13": "2001:660:4406:38d:1:1::c",
-      "kavlan-14": "2001:660:4406:38e:1:1::c",
-      "kavlan-16": "2001:660:4406:390:1:1::c",
-      "kavlan-18": "2001:660:4406:392:1:1::c",
-      "kavlan-2": "2001:660:4406:382:1:1::c",
-      "kavlan-20": "2001:660:4406:394:1:1::c",
-      "kavlan-21": "2001:660:4406:395:1:1::c",
-      "kavlan-3": "2001:660:4406:383:1:1::c",
-      "kavlan-4": "2001:660:4406:384:1:1::c",
-      "kavlan-5": "2001:660:4406:385:1:1::c",
-      "kavlan-6": "2001:660:4406:386:1:1::c",
-      "kavlan-7": "2001:660:4406:387:1:1::c",
-      "kavlan-8": "2001:660:4406:388:1:1::c",
-      "kavlan-9": "2001:660:4406:389:1:1::c"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.12",
-      "ip6": "2001:660:4406:300:1::c",
-      "kavlan": true,
-      "mac": "00:19:b9:f2:0e:10",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "granduc-12.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/12",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.112",
-      "ip6": "2001:660:4406:300:1:1::c",
-      "kavlan": true,
-      "mac": "00:19:b9:f2:0e:12",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "granduc-12-eth1.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/24",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "ip": "172.16.176.212",
-      "ip6": "2001:660:4406:300:1:2::c",
-      "kavlan": false,
-      "mac": "00:1b:21:34:e1:1c",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp13s0f1",
-      "network_address": "granduc-12-eth2.luxembourg.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "ul-grid5000-sw02",
-      "switch_port": "Ethernet1/13",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": false,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:1b:21:34:e1:1d",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp13s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.176.12",
-      "kavlan": false,
-      "mac": "00:1c:23:d3:57:5f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "granduc-12-bmc.luxembourg.grid5000.fr",
-      "switch": "gw-luxembourg"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 6409000000.0,
-    "node_flops": 44070000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 4194304,
-    "cache_l3": 0,
-    "clock_speed": 2000000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Clovertown",
-    "microcode": "0xbc",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz",
-    "vendor": "Intel",
-    "version": "L5335"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500078e4947",
-      "by_path": "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0",
-      "device": "sda",
-      "firmware_version": "S207",
-      "interface": "SAS",
-      "model": "ST9146802SS",
-      "size": 146815733760,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "granduc-12"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
deleted file mode 100644
index d337428ff3d7372f0417b38379ad13d5db17b12b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/30/2010",
-    "vendor": "Dell Inc.",
-    "version": "2.7.0"
-  },
-  "bmc_version": "2.37",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge 1950",
-    "serial": "60W883J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.15",
-      "kavlan-11": "10.7.237.15",
-      "kavlan-12": "10.11.237.15",
-      "kavlan-13": "10.15.237.15",
-      "kavlan-14": "10.19.237.15",
-      "kavlan-16": "10.27.237.15",
-      "kavlan-18": "10.35.237.15",
-      "kavlan-2": "192.168.208.15",
-      "kavlan-20": "10.43.237.15",
-      "kavlan-21": "10.47.237.15",
-      "kavlan-3": "192.168.224.15",
-      "kavlan-4": "10.40.0.15",
-      "kavlan-5": "10.40.64.15",
-      "kavlan-6": "10.40.128.15",
-      "kavlan-7": "10.40.192.15",
-      "kavlan-8": "10.41.0.15",
-      "kavlan-9": "10.41.64.15"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.193.15",
-      "kavlan-11": "10.7.237.115",
-      "kavlan-12": "10.11.237.115",
-      "kavlan-13": "10.15.237.115",
-      "kavlan-14": "10.19.237.115",
-      "kavlan-16": "10.27.237.115",
-      "kavlan-18": "10.35.237.115",
-      "kavlan-2": "192.168.209.15",
-      "kavlan-20": "10.43.237.115",
-      "kavlan-21": "10.47.237.115",
-      "kavlan-3": "192.168.225.15",
-      "kavlan-4": "10.40.1.15",
-      "kavlan-5": "10.40.65.15",
-      "kavlan-6": "10.40.129.15",
-      "kavlan-7": "10.40.193.15",
-      "kavlan-8": "10.41.1.15",
-      "kavlan-9": "10.41.65.15"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:381:1::f",
-      "kavlan-11": "2001:660:4406:38b:1::f",
-      "kavlan-12": "2001:660:4406:38c:1::f",
-      "kavlan-13": "2001:660:4406:38d:1::f",
-      "kavlan-14": "2001:660:4406:38e:1::f",
-      "kavlan-16": "2001:660:4406:390:1::f",
-      "kavlan-18": "2001:660:4406:392:1::f",
-      "kavlan-2": "2001:660:4406:382:1::f",
-      "kavlan-20": "2001:660:4406:394:1::f",
-      "kavlan-21": "2001:660:4406:395:1::f",
-      "kavlan-3": "2001:660:4406:383:1::f",
-      "kavlan-4": "2001:660:4406:384:1::f",
-      "kavlan-5": "2001:660:4406:385:1::f",
-      "kavlan-6": "2001:660:4406:386:1::f",
-      "kavlan-7": "2001:660:4406:387:1::f",
-      "kavlan-8": "2001:660:4406:388:1::f",
-      "kavlan-9": "2001:660:4406:389:1::f"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:381:1:1::f",
-      "kavlan-11": "2001:660:4406:38b:1:1::f",
-      "kavlan-12": "2001:660:4406:38c:1:1::f",
-      "kavlan-13": "2001:660:4406:38d:1:1::f",
-      "kavlan-14": "2001:660:4406:38e:1:1::f",
-      "kavlan-16": "2001:660:4406:390:1:1::f",
-      "kavlan-18": "2001:660:4406:392:1:1::f",
-      "kavlan-2": "2001:660:4406:382:1:1::f",
-      "kavlan-20": "2001:660:4406:394:1:1::f",
-      "kavlan-21": "2001:660:4406:395:1:1::f",
-      "kavlan-3": "2001:660:4406:383:1:1::f",
-      "kavlan-4": "2001:660:4406:384:1:1::f",
-      "kavlan-5": "2001:660:4406:385:1:1::f",
-      "kavlan-6": "2001:660:4406:386:1:1::f",
-      "kavlan-7": "2001:660:4406:387:1:1::f",
-      "kavlan-8": "2001:660:4406:388:1:1::f",
-      "kavlan-9": "2001:660:4406:389:1:1::f"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.15",
-      "ip6": "2001:660:4406:300:1::f",
-      "kavlan": true,
-      "mac": "00:19:b9:f2:0e:2e",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "granduc-15.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/15",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.115",
-      "ip6": "2001:660:4406:300:1:1::f",
-      "kavlan": true,
-      "mac": "00:19:b9:f2:0e:30",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "granduc-15-eth1.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/27",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "ip": "172.16.176.215",
-      "ip6": "2001:660:4406:300:1:2::f",
-      "kavlan": false,
-      "mac": "00:1b:21:34:e0:f1",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp13s0f0",
-      "network_address": "granduc-15-eth2.luxembourg.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "ul-grid5000-sw02",
-      "switch_port": "Ethernet1/16",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": false,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:1b:21:34:e0:f0",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp13s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.176.15",
-      "kavlan": false,
-      "mac": "00:1c:23:d3:57:37",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "granduc-15-bmc.luxembourg.grid5000.fr",
-      "switch": "gw-luxembourg"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 6409000000.0,
-    "node_flops": 44070000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 4194304,
-    "cache_l3": 0,
-    "clock_speed": 2000000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Clovertown",
-    "microcode": "0xbc",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz",
-    "vendor": "Intel",
-    "version": "L5335"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500078e6fc7",
-      "by_path": "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0",
-      "device": "sda",
-      "firmware_version": "S207",
-      "interface": "SAS",
-      "model": "ST9146802SS",
-      "size": 146815733760,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "granduc-15"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
deleted file mode 100644
index 724adf9a724c98dae9c324aee7c8ae82d6975020..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/30/2010",
-    "vendor": "Dell Inc.",
-    "version": "2.7.0"
-  },
-  "bmc_version": "1.33",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge 1950",
-    "serial": "JZV883J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.16",
-      "kavlan-11": "10.7.237.16",
-      "kavlan-12": "10.11.237.16",
-      "kavlan-13": "10.15.237.16",
-      "kavlan-14": "10.19.237.16",
-      "kavlan-16": "10.27.237.16",
-      "kavlan-18": "10.35.237.16",
-      "kavlan-2": "192.168.208.16",
-      "kavlan-20": "10.43.237.16",
-      "kavlan-21": "10.47.237.16",
-      "kavlan-3": "192.168.224.16",
-      "kavlan-4": "10.40.0.16",
-      "kavlan-5": "10.40.64.16",
-      "kavlan-6": "10.40.128.16",
-      "kavlan-7": "10.40.192.16",
-      "kavlan-8": "10.41.0.16",
-      "kavlan-9": "10.41.64.16"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.193.16",
-      "kavlan-11": "10.7.237.116",
-      "kavlan-12": "10.11.237.116",
-      "kavlan-13": "10.15.237.116",
-      "kavlan-14": "10.19.237.116",
-      "kavlan-16": "10.27.237.116",
-      "kavlan-18": "10.35.237.116",
-      "kavlan-2": "192.168.209.16",
-      "kavlan-20": "10.43.237.116",
-      "kavlan-21": "10.47.237.116",
-      "kavlan-3": "192.168.225.16",
-      "kavlan-4": "10.40.1.16",
-      "kavlan-5": "10.40.65.16",
-      "kavlan-6": "10.40.129.16",
-      "kavlan-7": "10.40.193.16",
-      "kavlan-8": "10.41.1.16",
-      "kavlan-9": "10.41.65.16"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:381:1::10",
-      "kavlan-11": "2001:660:4406:38b:1::10",
-      "kavlan-12": "2001:660:4406:38c:1::10",
-      "kavlan-13": "2001:660:4406:38d:1::10",
-      "kavlan-14": "2001:660:4406:38e:1::10",
-      "kavlan-16": "2001:660:4406:390:1::10",
-      "kavlan-18": "2001:660:4406:392:1::10",
-      "kavlan-2": "2001:660:4406:382:1::10",
-      "kavlan-20": "2001:660:4406:394:1::10",
-      "kavlan-21": "2001:660:4406:395:1::10",
-      "kavlan-3": "2001:660:4406:383:1::10",
-      "kavlan-4": "2001:660:4406:384:1::10",
-      "kavlan-5": "2001:660:4406:385:1::10",
-      "kavlan-6": "2001:660:4406:386:1::10",
-      "kavlan-7": "2001:660:4406:387:1::10",
-      "kavlan-8": "2001:660:4406:388:1::10",
-      "kavlan-9": "2001:660:4406:389:1::10"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:381:1:1::10",
-      "kavlan-11": "2001:660:4406:38b:1:1::10",
-      "kavlan-12": "2001:660:4406:38c:1:1::10",
-      "kavlan-13": "2001:660:4406:38d:1:1::10",
-      "kavlan-14": "2001:660:4406:38e:1:1::10",
-      "kavlan-16": "2001:660:4406:390:1:1::10",
-      "kavlan-18": "2001:660:4406:392:1:1::10",
-      "kavlan-2": "2001:660:4406:382:1:1::10",
-      "kavlan-20": "2001:660:4406:394:1:1::10",
-      "kavlan-21": "2001:660:4406:395:1:1::10",
-      "kavlan-3": "2001:660:4406:383:1:1::10",
-      "kavlan-4": "2001:660:4406:384:1:1::10",
-      "kavlan-5": "2001:660:4406:385:1:1::10",
-      "kavlan-6": "2001:660:4406:386:1:1::10",
-      "kavlan-7": "2001:660:4406:387:1:1::10",
-      "kavlan-8": "2001:660:4406:388:1:1::10",
-      "kavlan-9": "2001:660:4406:389:1:1::10"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.16",
-      "ip6": "2001:660:4406:300:1::10",
-      "kavlan": true,
-      "mac": "00:19:b9:f2:0f:4b",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "granduc-16.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/16",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.116",
-      "ip6": "2001:660:4406:300:1:1::10",
-      "kavlan": true,
-      "mac": "00:19:b9:f2:0f:4d",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "granduc-16-eth1.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/28",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "ip": "172.16.176.216",
-      "ip6": "2001:660:4406:300:1:2::10",
-      "kavlan": false,
-      "mac": "00:1b:21:34:e1:1a",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp13s0f1",
-      "network_address": "granduc-16-eth2.luxembourg.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "ul-grid5000-sw02",
-      "switch_port": "Ethernet1/17",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": false,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:1b:21:34:e1:1b",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp13s0f0",
-      "vendor": "Intel"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.176.16",
-      "kavlan": false,
-      "mac": "00:1c:23:d3:57:67",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "granduc-16-bmc.luxembourg.grid5000.fr",
-      "switch": "gw-luxembourg"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 6409000000.0,
-    "node_flops": 44070000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 4194304,
-    "cache_l3": 0,
-    "clock_speed": 2000000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Clovertown",
-    "microcode": "0xbc",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz",
-    "vendor": "Intel",
-    "version": "L5335"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500078ea163",
-      "by_path": "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0",
-      "device": "sda",
-      "firmware_version": "S207",
-      "interface": "SAS",
-      "model": "ST9146802SS",
-      "size": 146815733760,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "granduc-16"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
deleted file mode 100644
index 2075feabdabb6bef833be22b5f5d7c542a8499b1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/30/2010",
-    "vendor": "Dell Inc.",
-    "version": "2.7.0"
-  },
-  "bmc_version": "1.77",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge 1950",
-    "serial": "GQ2593J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.18",
-      "kavlan-11": "10.7.237.18",
-      "kavlan-12": "10.11.237.18",
-      "kavlan-13": "10.15.237.18",
-      "kavlan-14": "10.19.237.18",
-      "kavlan-16": "10.27.237.18",
-      "kavlan-18": "10.35.237.18",
-      "kavlan-2": "192.168.208.18",
-      "kavlan-20": "10.43.237.18",
-      "kavlan-21": "10.47.237.18",
-      "kavlan-3": "192.168.224.18",
-      "kavlan-4": "10.40.0.18",
-      "kavlan-5": "10.40.64.18",
-      "kavlan-6": "10.40.128.18",
-      "kavlan-7": "10.40.192.18",
-      "kavlan-8": "10.41.0.18",
-      "kavlan-9": "10.41.64.18"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.193.18",
-      "kavlan-11": "10.7.237.118",
-      "kavlan-12": "10.11.237.118",
-      "kavlan-13": "10.15.237.118",
-      "kavlan-14": "10.19.237.118",
-      "kavlan-16": "10.27.237.118",
-      "kavlan-18": "10.35.237.118",
-      "kavlan-2": "192.168.209.18",
-      "kavlan-20": "10.43.237.118",
-      "kavlan-21": "10.47.237.118",
-      "kavlan-3": "192.168.225.18",
-      "kavlan-4": "10.40.1.18",
-      "kavlan-5": "10.40.65.18",
-      "kavlan-6": "10.40.129.18",
-      "kavlan-7": "10.40.193.18",
-      "kavlan-8": "10.41.1.18",
-      "kavlan-9": "10.41.65.18"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:381:1::12",
-      "kavlan-11": "2001:660:4406:38b:1::12",
-      "kavlan-12": "2001:660:4406:38c:1::12",
-      "kavlan-13": "2001:660:4406:38d:1::12",
-      "kavlan-14": "2001:660:4406:38e:1::12",
-      "kavlan-16": "2001:660:4406:390:1::12",
-      "kavlan-18": "2001:660:4406:392:1::12",
-      "kavlan-2": "2001:660:4406:382:1::12",
-      "kavlan-20": "2001:660:4406:394:1::12",
-      "kavlan-21": "2001:660:4406:395:1::12",
-      "kavlan-3": "2001:660:4406:383:1::12",
-      "kavlan-4": "2001:660:4406:384:1::12",
-      "kavlan-5": "2001:660:4406:385:1::12",
-      "kavlan-6": "2001:660:4406:386:1::12",
-      "kavlan-7": "2001:660:4406:387:1::12",
-      "kavlan-8": "2001:660:4406:388:1::12",
-      "kavlan-9": "2001:660:4406:389:1::12"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:381:1:1::12",
-      "kavlan-11": "2001:660:4406:38b:1:1::12",
-      "kavlan-12": "2001:660:4406:38c:1:1::12",
-      "kavlan-13": "2001:660:4406:38d:1:1::12",
-      "kavlan-14": "2001:660:4406:38e:1:1::12",
-      "kavlan-16": "2001:660:4406:390:1:1::12",
-      "kavlan-18": "2001:660:4406:392:1:1::12",
-      "kavlan-2": "2001:660:4406:382:1:1::12",
-      "kavlan-20": "2001:660:4406:394:1:1::12",
-      "kavlan-21": "2001:660:4406:395:1:1::12",
-      "kavlan-3": "2001:660:4406:383:1:1::12",
-      "kavlan-4": "2001:660:4406:384:1:1::12",
-      "kavlan-5": "2001:660:4406:385:1:1::12",
-      "kavlan-6": "2001:660:4406:386:1:1::12",
-      "kavlan-7": "2001:660:4406:387:1:1::12",
-      "kavlan-8": "2001:660:4406:388:1:1::12",
-      "kavlan-9": "2001:660:4406:389:1:1::12"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.18",
-      "ip6": "2001:660:4406:300:1::12",
-      "kavlan": true,
-      "mac": "00:19:b9:f3:ba:b0",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "granduc-18.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/18",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.118",
-      "ip6": "2001:660:4406:300:1:1::12",
-      "kavlan": true,
-      "mac": "00:19:b9:f3:ba:b2",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "granduc-18-eth1.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/30",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "ip": "172.16.176.218",
-      "ip6": "2001:660:4406:300:1:2::12",
-      "kavlan": false,
-      "mac": "00:1b:21:34:e1:07",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp13s0f0",
-      "network_address": "granduc-18-eth2.luxembourg.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "ul-grid5000-sw02",
-      "switch_port": "Ethernet1/19",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": false,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:1b:21:34:e1:06",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp13s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.176.18",
-      "kavlan": false,
-      "mac": "00:1c:23:d6:c4:ea",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "granduc-18-bmc.luxembourg.grid5000.fr",
-      "switch": "gw-luxembourg"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 6409000000.0,
-    "node_flops": 44070000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 4194304,
-    "cache_l3": 0,
-    "clock_speed": 2000000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Clovertown",
-    "microcode": "0xbc",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz",
-    "vendor": "Intel",
-    "version": "L5335"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5000ec6bd07",
-      "by_path": "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0",
-      "device": "sda",
-      "firmware_version": "S22A",
-      "interface": "SAS",
-      "model": "ST9146802SS",
-      "size": 146815733760,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "granduc-18"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
deleted file mode 100644
index 2d938cf171f0214dd411bcbdbc4f4285586e400e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/30/2010",
-    "vendor": "Dell Inc.",
-    "version": "2.7.0"
-  },
-  "bmc_version": "1.33",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge 1950",
-    "serial": "1QV963J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.2",
-      "kavlan-11": "10.7.237.2",
-      "kavlan-12": "10.11.237.2",
-      "kavlan-13": "10.15.237.2",
-      "kavlan-14": "10.19.237.2",
-      "kavlan-16": "10.27.237.2",
-      "kavlan-18": "10.35.237.2",
-      "kavlan-2": "192.168.208.2",
-      "kavlan-20": "10.43.237.2",
-      "kavlan-21": "10.47.237.2",
-      "kavlan-3": "192.168.224.2",
-      "kavlan-4": "10.40.0.2",
-      "kavlan-5": "10.40.64.2",
-      "kavlan-6": "10.40.128.2",
-      "kavlan-7": "10.40.192.2",
-      "kavlan-8": "10.41.0.2",
-      "kavlan-9": "10.41.64.2"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.193.2",
-      "kavlan-11": "10.7.237.102",
-      "kavlan-12": "10.11.237.102",
-      "kavlan-13": "10.15.237.102",
-      "kavlan-14": "10.19.237.102",
-      "kavlan-16": "10.27.237.102",
-      "kavlan-18": "10.35.237.102",
-      "kavlan-2": "192.168.209.2",
-      "kavlan-20": "10.43.237.102",
-      "kavlan-21": "10.47.237.102",
-      "kavlan-3": "192.168.225.2",
-      "kavlan-4": "10.40.1.2",
-      "kavlan-5": "10.40.65.2",
-      "kavlan-6": "10.40.129.2",
-      "kavlan-7": "10.40.193.2",
-      "kavlan-8": "10.41.1.2",
-      "kavlan-9": "10.41.65.2"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:381:1::2",
-      "kavlan-11": "2001:660:4406:38b:1::2",
-      "kavlan-12": "2001:660:4406:38c:1::2",
-      "kavlan-13": "2001:660:4406:38d:1::2",
-      "kavlan-14": "2001:660:4406:38e:1::2",
-      "kavlan-16": "2001:660:4406:390:1::2",
-      "kavlan-18": "2001:660:4406:392:1::2",
-      "kavlan-2": "2001:660:4406:382:1::2",
-      "kavlan-20": "2001:660:4406:394:1::2",
-      "kavlan-21": "2001:660:4406:395:1::2",
-      "kavlan-3": "2001:660:4406:383:1::2",
-      "kavlan-4": "2001:660:4406:384:1::2",
-      "kavlan-5": "2001:660:4406:385:1::2",
-      "kavlan-6": "2001:660:4406:386:1::2",
-      "kavlan-7": "2001:660:4406:387:1::2",
-      "kavlan-8": "2001:660:4406:388:1::2",
-      "kavlan-9": "2001:660:4406:389:1::2"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:381:1:1::2",
-      "kavlan-11": "2001:660:4406:38b:1:1::2",
-      "kavlan-12": "2001:660:4406:38c:1:1::2",
-      "kavlan-13": "2001:660:4406:38d:1:1::2",
-      "kavlan-14": "2001:660:4406:38e:1:1::2",
-      "kavlan-16": "2001:660:4406:390:1:1::2",
-      "kavlan-18": "2001:660:4406:392:1:1::2",
-      "kavlan-2": "2001:660:4406:382:1:1::2",
-      "kavlan-20": "2001:660:4406:394:1:1::2",
-      "kavlan-21": "2001:660:4406:395:1:1::2",
-      "kavlan-3": "2001:660:4406:383:1:1::2",
-      "kavlan-4": "2001:660:4406:384:1:1::2",
-      "kavlan-5": "2001:660:4406:385:1:1::2",
-      "kavlan-6": "2001:660:4406:386:1:1::2",
-      "kavlan-7": "2001:660:4406:387:1:1::2",
-      "kavlan-8": "2001:660:4406:388:1:1::2",
-      "kavlan-9": "2001:660:4406:389:1:1::2"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.2",
-      "ip6": "2001:660:4406:300:1::2",
-      "kavlan": true,
-      "mac": "00:19:b9:f0:01:d7",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "granduc-2.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/2",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.102",
-      "ip6": "2001:660:4406:300:1:1::2",
-      "kavlan": true,
-      "mac": "00:19:b9:f0:01:d9",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "granduc-2-eth1.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet1/25",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "ip": "172.16.176.202",
-      "ip6": "2001:660:4406:300:1:2::2",
-      "kavlan": false,
-      "mac": "00:1b:21:34:e1:35",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp13s0f0",
-      "network_address": "granduc-2-eth2.luxembourg.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "ul-grid5000-sw02",
-      "switch_port": "Ethernet1/3",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": false,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:1b:21:34:e1:34",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp13s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.176.2",
-      "kavlan": false,
-      "mac": "00:1c:23:c8:69:aa",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "granduc-2-bmc.luxembourg.grid5000.fr",
-      "switch": "gw-luxembourg"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 6409000000.0,
-    "node_flops": 44070000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 4194304,
-    "cache_l3": 0,
-    "clock_speed": 2000000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Clovertown",
-    "microcode": "0xbc",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz",
-    "vendor": "Intel",
-    "version": "L5335"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c50007389fb3",
-      "by_path": "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0",
-      "device": "sda",
-      "firmware_version": "S207",
-      "interface": "SAS",
-      "model": "ST9146802SS",
-      "size": 146815733760,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "granduc-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
deleted file mode 100644
index 082dd6a54111985a555e9f1611c1515b5f59cbc8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/30/2010",
-    "vendor": "Dell Inc.",
-    "version": "2.7.0"
-  },
-  "bmc_version": "1.33",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge 1950",
-    "serial": "39N983J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.20",
-      "kavlan-11": "10.7.237.20",
-      "kavlan-12": "10.11.237.20",
-      "kavlan-13": "10.15.237.20",
-      "kavlan-14": "10.19.237.20",
-      "kavlan-16": "10.27.237.20",
-      "kavlan-18": "10.35.237.20",
-      "kavlan-2": "192.168.208.20",
-      "kavlan-20": "10.43.237.20",
-      "kavlan-21": "10.47.237.20",
-      "kavlan-3": "192.168.224.20",
-      "kavlan-4": "10.40.0.20",
-      "kavlan-5": "10.40.64.20",
-      "kavlan-6": "10.40.128.20",
-      "kavlan-7": "10.40.192.20",
-      "kavlan-8": "10.41.0.20",
-      "kavlan-9": "10.41.64.20"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.193.20",
-      "kavlan-11": "10.7.237.120",
-      "kavlan-12": "10.11.237.120",
-      "kavlan-13": "10.15.237.120",
-      "kavlan-14": "10.19.237.120",
-      "kavlan-16": "10.27.237.120",
-      "kavlan-18": "10.35.237.120",
-      "kavlan-2": "192.168.209.20",
-      "kavlan-20": "10.43.237.120",
-      "kavlan-21": "10.47.237.120",
-      "kavlan-3": "192.168.225.20",
-      "kavlan-4": "10.40.1.20",
-      "kavlan-5": "10.40.65.20",
-      "kavlan-6": "10.40.129.20",
-      "kavlan-7": "10.40.193.20",
-      "kavlan-8": "10.41.1.20",
-      "kavlan-9": "10.41.65.20"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:381:1::14",
-      "kavlan-11": "2001:660:4406:38b:1::14",
-      "kavlan-12": "2001:660:4406:38c:1::14",
-      "kavlan-13": "2001:660:4406:38d:1::14",
-      "kavlan-14": "2001:660:4406:38e:1::14",
-      "kavlan-16": "2001:660:4406:390:1::14",
-      "kavlan-18": "2001:660:4406:392:1::14",
-      "kavlan-2": "2001:660:4406:382:1::14",
-      "kavlan-20": "2001:660:4406:394:1::14",
-      "kavlan-21": "2001:660:4406:395:1::14",
-      "kavlan-3": "2001:660:4406:383:1::14",
-      "kavlan-4": "2001:660:4406:384:1::14",
-      "kavlan-5": "2001:660:4406:385:1::14",
-      "kavlan-6": "2001:660:4406:386:1::14",
-      "kavlan-7": "2001:660:4406:387:1::14",
-      "kavlan-8": "2001:660:4406:388:1::14",
-      "kavlan-9": "2001:660:4406:389:1::14"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:381:1:1::14",
-      "kavlan-11": "2001:660:4406:38b:1:1::14",
-      "kavlan-12": "2001:660:4406:38c:1:1::14",
-      "kavlan-13": "2001:660:4406:38d:1:1::14",
-      "kavlan-14": "2001:660:4406:38e:1:1::14",
-      "kavlan-16": "2001:660:4406:390:1:1::14",
-      "kavlan-18": "2001:660:4406:392:1:1::14",
-      "kavlan-2": "2001:660:4406:382:1:1::14",
-      "kavlan-20": "2001:660:4406:394:1:1::14",
-      "kavlan-21": "2001:660:4406:395:1:1::14",
-      "kavlan-3": "2001:660:4406:383:1:1::14",
-      "kavlan-4": "2001:660:4406:384:1:1::14",
-      "kavlan-5": "2001:660:4406:385:1:1::14",
-      "kavlan-6": "2001:660:4406:386:1:1::14",
-      "kavlan-7": "2001:660:4406:387:1:1::14",
-      "kavlan-8": "2001:660:4406:388:1:1::14",
-      "kavlan-9": "2001:660:4406:389:1:1::14"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.20",
-      "ip6": "2001:660:4406:300:1::14",
-      "kavlan": true,
-      "mac": "00:19:b9:f2:08:ca",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "granduc-20.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/20",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.120",
-      "ip6": "2001:660:4406:300:1:1::14",
-      "kavlan": true,
-      "mac": "00:19:b9:f2:08:cc",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "granduc-20-eth1.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/32",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "ip": "172.16.176.220",
-      "ip6": "2001:660:4406:300:1:2::14",
-      "kavlan": false,
-      "mac": "00:1b:21:3d:13:27",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp13s0f0",
-      "network_address": "granduc-20-eth2.luxembourg.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "ul-grid5000-sw02",
-      "switch_port": "Ethernet1/21",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": false,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:1b:21:3d:13:26",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp13s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.176.20",
-      "kavlan": false,
-      "mac": "00:1c:23:d3:42:6c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "granduc-20-bmc.luxembourg.grid5000.fr",
-      "switch": "gw-luxembourg"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 6409000000.0,
-    "node_flops": 44070000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 4194304,
-    "cache_l3": 0,
-    "clock_speed": 2000000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Clovertown",
-    "microcode": "0xbc",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz",
-    "vendor": "Intel",
-    "version": "L5335"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500078e7303",
-      "by_path": "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0",
-      "device": "sda",
-      "firmware_version": "S207",
-      "interface": "SAS",
-      "model": "ST9146802SS",
-      "size": 146815733760,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "granduc-20"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
deleted file mode 100644
index 62ded4be300c126e686f4118c99c62ac1349a64f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/30/2010",
-    "vendor": "Dell Inc.",
-    "version": "2.7.0"
-  },
-  "bmc_version": "1.33",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge 1950",
-    "serial": "1R2593J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.21",
-      "kavlan-11": "10.7.237.21",
-      "kavlan-12": "10.11.237.21",
-      "kavlan-13": "10.15.237.21",
-      "kavlan-14": "10.19.237.21",
-      "kavlan-16": "10.27.237.21",
-      "kavlan-18": "10.35.237.21",
-      "kavlan-2": "192.168.208.21",
-      "kavlan-20": "10.43.237.21",
-      "kavlan-21": "10.47.237.21",
-      "kavlan-3": "192.168.224.21",
-      "kavlan-4": "10.40.0.21",
-      "kavlan-5": "10.40.64.21",
-      "kavlan-6": "10.40.128.21",
-      "kavlan-7": "10.40.192.21",
-      "kavlan-8": "10.41.0.21",
-      "kavlan-9": "10.41.64.21"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.193.21",
-      "kavlan-11": "10.7.237.121",
-      "kavlan-12": "10.11.237.121",
-      "kavlan-13": "10.15.237.121",
-      "kavlan-14": "10.19.237.121",
-      "kavlan-16": "10.27.237.121",
-      "kavlan-18": "10.35.237.121",
-      "kavlan-2": "192.168.209.21",
-      "kavlan-20": "10.43.237.121",
-      "kavlan-21": "10.47.237.121",
-      "kavlan-3": "192.168.225.21",
-      "kavlan-4": "10.40.1.21",
-      "kavlan-5": "10.40.65.21",
-      "kavlan-6": "10.40.129.21",
-      "kavlan-7": "10.40.193.21",
-      "kavlan-8": "10.41.1.21",
-      "kavlan-9": "10.41.65.21"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:381:1::15",
-      "kavlan-11": "2001:660:4406:38b:1::15",
-      "kavlan-12": "2001:660:4406:38c:1::15",
-      "kavlan-13": "2001:660:4406:38d:1::15",
-      "kavlan-14": "2001:660:4406:38e:1::15",
-      "kavlan-16": "2001:660:4406:390:1::15",
-      "kavlan-18": "2001:660:4406:392:1::15",
-      "kavlan-2": "2001:660:4406:382:1::15",
-      "kavlan-20": "2001:660:4406:394:1::15",
-      "kavlan-21": "2001:660:4406:395:1::15",
-      "kavlan-3": "2001:660:4406:383:1::15",
-      "kavlan-4": "2001:660:4406:384:1::15",
-      "kavlan-5": "2001:660:4406:385:1::15",
-      "kavlan-6": "2001:660:4406:386:1::15",
-      "kavlan-7": "2001:660:4406:387:1::15",
-      "kavlan-8": "2001:660:4406:388:1::15",
-      "kavlan-9": "2001:660:4406:389:1::15"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:381:1:1::15",
-      "kavlan-11": "2001:660:4406:38b:1:1::15",
-      "kavlan-12": "2001:660:4406:38c:1:1::15",
-      "kavlan-13": "2001:660:4406:38d:1:1::15",
-      "kavlan-14": "2001:660:4406:38e:1:1::15",
-      "kavlan-16": "2001:660:4406:390:1:1::15",
-      "kavlan-18": "2001:660:4406:392:1:1::15",
-      "kavlan-2": "2001:660:4406:382:1:1::15",
-      "kavlan-20": "2001:660:4406:394:1:1::15",
-      "kavlan-21": "2001:660:4406:395:1:1::15",
-      "kavlan-3": "2001:660:4406:383:1:1::15",
-      "kavlan-4": "2001:660:4406:384:1:1::15",
-      "kavlan-5": "2001:660:4406:385:1:1::15",
-      "kavlan-6": "2001:660:4406:386:1:1::15",
-      "kavlan-7": "2001:660:4406:387:1:1::15",
-      "kavlan-8": "2001:660:4406:388:1:1::15",
-      "kavlan-9": "2001:660:4406:389:1:1::15"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.21",
-      "ip6": "2001:660:4406:300:1::15",
-      "kavlan": true,
-      "mac": "00:19:b9:f3:c2:7d",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "granduc-21.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/21",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.121",
-      "ip6": "2001:660:4406:300:1:1::15",
-      "kavlan": true,
-      "mac": "00:19:b9:f3:c2:7f",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "granduc-21-eth1.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/33",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "ip": "172.16.176.221",
-      "ip6": "2001:660:4406:300:1:2::15",
-      "kavlan": false,
-      "mac": "00:1b:21:3d:13:7d",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp13s0f0",
-      "network_address": "granduc-21-eth2.luxembourg.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "ul-grid5000-sw02",
-      "switch_port": "Ethernet1/22",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": false,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:1b:21:3d:13:7c",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp13s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.176.21",
-      "kavlan": false,
-      "mac": "00:1c:23:d6:c3:0c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "granduc-21-bmc.luxembourg.grid5000.fr",
-      "switch": "gw-luxembourg"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 6409000000.0,
-    "node_flops": 44070000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 4194304,
-    "cache_l3": 0,
-    "clock_speed": 2000000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Clovertown",
-    "microcode": "0xbc",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz",
-    "vendor": "Intel",
-    "version": "L5335"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5000ec2f6fb",
-      "by_path": "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0",
-      "device": "sda",
-      "firmware_version": "S22A",
-      "interface": "SAS",
-      "model": "ST9146802SS",
-      "size": 146815733760,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "granduc-21"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
deleted file mode 100644
index ecbebb375bb8b7f1fff5da6740048490a7fc9cae..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/30/2010",
-    "vendor": "Dell Inc.",
-    "version": "2.7.0"
-  },
-  "bmc_version": "1.33",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge 1950",
-    "serial": "FQ2593J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.4",
-      "kavlan-11": "10.7.237.4",
-      "kavlan-12": "10.11.237.4",
-      "kavlan-13": "10.15.237.4",
-      "kavlan-14": "10.19.237.4",
-      "kavlan-16": "10.27.237.4",
-      "kavlan-18": "10.35.237.4",
-      "kavlan-2": "192.168.208.4",
-      "kavlan-20": "10.43.237.4",
-      "kavlan-21": "10.47.237.4",
-      "kavlan-3": "192.168.224.4",
-      "kavlan-4": "10.40.0.4",
-      "kavlan-5": "10.40.64.4",
-      "kavlan-6": "10.40.128.4",
-      "kavlan-7": "10.40.192.4",
-      "kavlan-8": "10.41.0.4",
-      "kavlan-9": "10.41.64.4"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.193.4",
-      "kavlan-11": "10.7.237.104",
-      "kavlan-12": "10.11.237.104",
-      "kavlan-13": "10.15.237.104",
-      "kavlan-14": "10.19.237.104",
-      "kavlan-16": "10.27.237.104",
-      "kavlan-18": "10.35.237.104",
-      "kavlan-2": "192.168.209.4",
-      "kavlan-20": "10.43.237.104",
-      "kavlan-21": "10.47.237.104",
-      "kavlan-3": "192.168.225.4",
-      "kavlan-4": "10.40.1.4",
-      "kavlan-5": "10.40.65.4",
-      "kavlan-6": "10.40.129.4",
-      "kavlan-7": "10.40.193.4",
-      "kavlan-8": "10.41.1.4",
-      "kavlan-9": "10.41.65.4"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:381:1::4",
-      "kavlan-11": "2001:660:4406:38b:1::4",
-      "kavlan-12": "2001:660:4406:38c:1::4",
-      "kavlan-13": "2001:660:4406:38d:1::4",
-      "kavlan-14": "2001:660:4406:38e:1::4",
-      "kavlan-16": "2001:660:4406:390:1::4",
-      "kavlan-18": "2001:660:4406:392:1::4",
-      "kavlan-2": "2001:660:4406:382:1::4",
-      "kavlan-20": "2001:660:4406:394:1::4",
-      "kavlan-21": "2001:660:4406:395:1::4",
-      "kavlan-3": "2001:660:4406:383:1::4",
-      "kavlan-4": "2001:660:4406:384:1::4",
-      "kavlan-5": "2001:660:4406:385:1::4",
-      "kavlan-6": "2001:660:4406:386:1::4",
-      "kavlan-7": "2001:660:4406:387:1::4",
-      "kavlan-8": "2001:660:4406:388:1::4",
-      "kavlan-9": "2001:660:4406:389:1::4"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:381:1:1::4",
-      "kavlan-11": "2001:660:4406:38b:1:1::4",
-      "kavlan-12": "2001:660:4406:38c:1:1::4",
-      "kavlan-13": "2001:660:4406:38d:1:1::4",
-      "kavlan-14": "2001:660:4406:38e:1:1::4",
-      "kavlan-16": "2001:660:4406:390:1:1::4",
-      "kavlan-18": "2001:660:4406:392:1:1::4",
-      "kavlan-2": "2001:660:4406:382:1:1::4",
-      "kavlan-20": "2001:660:4406:394:1:1::4",
-      "kavlan-21": "2001:660:4406:395:1:1::4",
-      "kavlan-3": "2001:660:4406:383:1:1::4",
-      "kavlan-4": "2001:660:4406:384:1:1::4",
-      "kavlan-5": "2001:660:4406:385:1:1::4",
-      "kavlan-6": "2001:660:4406:386:1:1::4",
-      "kavlan-7": "2001:660:4406:387:1:1::4",
-      "kavlan-8": "2001:660:4406:388:1:1::4",
-      "kavlan-9": "2001:660:4406:389:1:1::4"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.4",
-      "ip6": "2001:660:4406:300:1::4",
-      "kavlan": true,
-      "mac": "00:19:b9:f2:0a:e6",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "granduc-4.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/4",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.104",
-      "ip6": "2001:660:4406:300:1:1::4",
-      "kavlan": true,
-      "mac": "00:19:b9:f2:0a:e8",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "granduc-4-eth1.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet1/27",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "ip": "172.16.176.204",
-      "ip6": "2001:660:4406:300:1:2::4",
-      "kavlan": false,
-      "mac": "00:1b:21:3d:12:e9",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp13s0f0",
-      "network_address": "granduc-4-eth2.luxembourg.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "ul-grid5000-sw02",
-      "switch_port": "Ethernet1/5",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": false,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:1b:21:3d:12:e8",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp13s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.176.4",
-      "kavlan": false,
-      "mac": "00:1c:23:d6:c3:06",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "granduc-4-bmc.luxembourg.grid5000.fr",
-      "switch": "gw-luxembourg"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 6409000000.0,
-    "node_flops": 44070000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 4194304,
-    "cache_l3": 0,
-    "clock_speed": 2000000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Clovertown",
-    "microcode": "0xbc",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz",
-    "vendor": "Intel",
-    "version": "L5335"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5000ec6d903",
-      "by_path": "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0",
-      "device": "sda",
-      "firmware_version": "S22A",
-      "interface": "SAS",
-      "model": "ST9146802SS",
-      "size": 146815733760,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "granduc-4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
deleted file mode 100644
index 00a5f43ac8d0f85002a9c926583195bc4a0e3eda..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/30/2010",
-    "vendor": "Dell Inc.",
-    "version": "2.7.0"
-  },
-  "bmc_version": "1.33",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge 1950",
-    "serial": "BQ2593J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.6",
-      "kavlan-11": "10.7.237.6",
-      "kavlan-12": "10.11.237.6",
-      "kavlan-13": "10.15.237.6",
-      "kavlan-14": "10.19.237.6",
-      "kavlan-16": "10.27.237.6",
-      "kavlan-18": "10.35.237.6",
-      "kavlan-2": "192.168.208.6",
-      "kavlan-20": "10.43.237.6",
-      "kavlan-21": "10.47.237.6",
-      "kavlan-3": "192.168.224.6",
-      "kavlan-4": "10.40.0.6",
-      "kavlan-5": "10.40.64.6",
-      "kavlan-6": "10.40.128.6",
-      "kavlan-7": "10.40.192.6",
-      "kavlan-8": "10.41.0.6",
-      "kavlan-9": "10.41.64.6"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.193.6",
-      "kavlan-11": "10.7.237.106",
-      "kavlan-12": "10.11.237.106",
-      "kavlan-13": "10.15.237.106",
-      "kavlan-14": "10.19.237.106",
-      "kavlan-16": "10.27.237.106",
-      "kavlan-18": "10.35.237.106",
-      "kavlan-2": "192.168.209.6",
-      "kavlan-20": "10.43.237.106",
-      "kavlan-21": "10.47.237.106",
-      "kavlan-3": "192.168.225.6",
-      "kavlan-4": "10.40.1.6",
-      "kavlan-5": "10.40.65.6",
-      "kavlan-6": "10.40.129.6",
-      "kavlan-7": "10.40.193.6",
-      "kavlan-8": "10.41.1.6",
-      "kavlan-9": "10.41.65.6"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:381:1::6",
-      "kavlan-11": "2001:660:4406:38b:1::6",
-      "kavlan-12": "2001:660:4406:38c:1::6",
-      "kavlan-13": "2001:660:4406:38d:1::6",
-      "kavlan-14": "2001:660:4406:38e:1::6",
-      "kavlan-16": "2001:660:4406:390:1::6",
-      "kavlan-18": "2001:660:4406:392:1::6",
-      "kavlan-2": "2001:660:4406:382:1::6",
-      "kavlan-20": "2001:660:4406:394:1::6",
-      "kavlan-21": "2001:660:4406:395:1::6",
-      "kavlan-3": "2001:660:4406:383:1::6",
-      "kavlan-4": "2001:660:4406:384:1::6",
-      "kavlan-5": "2001:660:4406:385:1::6",
-      "kavlan-6": "2001:660:4406:386:1::6",
-      "kavlan-7": "2001:660:4406:387:1::6",
-      "kavlan-8": "2001:660:4406:388:1::6",
-      "kavlan-9": "2001:660:4406:389:1::6"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:381:1:1::6",
-      "kavlan-11": "2001:660:4406:38b:1:1::6",
-      "kavlan-12": "2001:660:4406:38c:1:1::6",
-      "kavlan-13": "2001:660:4406:38d:1:1::6",
-      "kavlan-14": "2001:660:4406:38e:1:1::6",
-      "kavlan-16": "2001:660:4406:390:1:1::6",
-      "kavlan-18": "2001:660:4406:392:1:1::6",
-      "kavlan-2": "2001:660:4406:382:1:1::6",
-      "kavlan-20": "2001:660:4406:394:1:1::6",
-      "kavlan-21": "2001:660:4406:395:1:1::6",
-      "kavlan-3": "2001:660:4406:383:1:1::6",
-      "kavlan-4": "2001:660:4406:384:1:1::6",
-      "kavlan-5": "2001:660:4406:385:1:1::6",
-      "kavlan-6": "2001:660:4406:386:1:1::6",
-      "kavlan-7": "2001:660:4406:387:1:1::6",
-      "kavlan-8": "2001:660:4406:388:1:1::6",
-      "kavlan-9": "2001:660:4406:389:1:1::6"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.6",
-      "ip6": "2001:660:4406:300:1::6",
-      "kavlan": true,
-      "mac": "00:19:b9:f2:0c:80",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "granduc-6.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/6",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.106",
-      "ip6": "2001:660:4406:300:1:1::6",
-      "kavlan": true,
-      "mac": "00:19:b9:f2:0c:82",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "granduc-6-eth1.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet1/29",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "ip": "172.16.176.206",
-      "ip6": "2001:660:4406:300:1:2::6",
-      "kavlan": false,
-      "mac": "00:1b:21:3d:13:ab",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp13s0f0",
-      "network_address": "granduc-6-eth2.luxembourg.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "ul-grid5000-sw02",
-      "switch_port": "Ethernet1/7",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": false,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:1b:21:3d:13:aa",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp13s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.176.6",
-      "kavlan": false,
-      "mac": "00:1c:23:d6:c3:08",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "granduc-6-bmc.luxembourg.grid5000.fr",
-      "switch": "gw-luxembourg"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 6409000000.0,
-    "node_flops": 44070000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 4194304,
-    "cache_l3": 0,
-    "clock_speed": 2000000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Clovertown",
-    "microcode": "0xbc",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz",
-    "vendor": "Intel",
-    "version": "L5335"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5000ec6e277",
-      "by_path": "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0",
-      "device": "sda",
-      "firmware_version": "S22A",
-      "interface": "SAS",
-      "model": "ST9146802SS",
-      "size": 146815733760,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "granduc-6"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
deleted file mode 100644
index 3df74fe0f0f9d3bbbc42343516ddbeb6505377de..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/30/2010",
-    "vendor": "Dell Inc.",
-    "version": "2.7.0"
-  },
-  "bmc_version": "1.33",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge 1950",
-    "serial": "89N983J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.9",
-      "kavlan-11": "10.7.237.9",
-      "kavlan-12": "10.11.237.9",
-      "kavlan-13": "10.15.237.9",
-      "kavlan-14": "10.19.237.9",
-      "kavlan-16": "10.27.237.9",
-      "kavlan-18": "10.35.237.9",
-      "kavlan-2": "192.168.208.9",
-      "kavlan-20": "10.43.237.9",
-      "kavlan-21": "10.47.237.9",
-      "kavlan-3": "192.168.224.9",
-      "kavlan-4": "10.40.0.9",
-      "kavlan-5": "10.40.64.9",
-      "kavlan-6": "10.40.128.9",
-      "kavlan-7": "10.40.192.9",
-      "kavlan-8": "10.41.0.9",
-      "kavlan-9": "10.41.64.9"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.193.9",
-      "kavlan-11": "10.7.237.109",
-      "kavlan-12": "10.11.237.109",
-      "kavlan-13": "10.15.237.109",
-      "kavlan-14": "10.19.237.109",
-      "kavlan-16": "10.27.237.109",
-      "kavlan-18": "10.35.237.109",
-      "kavlan-2": "192.168.209.9",
-      "kavlan-20": "10.43.237.109",
-      "kavlan-21": "10.47.237.109",
-      "kavlan-3": "192.168.225.9",
-      "kavlan-4": "10.40.1.9",
-      "kavlan-5": "10.40.65.9",
-      "kavlan-6": "10.40.129.9",
-      "kavlan-7": "10.40.193.9",
-      "kavlan-8": "10.41.1.9",
-      "kavlan-9": "10.41.65.9"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:381:1::9",
-      "kavlan-11": "2001:660:4406:38b:1::9",
-      "kavlan-12": "2001:660:4406:38c:1::9",
-      "kavlan-13": "2001:660:4406:38d:1::9",
-      "kavlan-14": "2001:660:4406:38e:1::9",
-      "kavlan-16": "2001:660:4406:390:1::9",
-      "kavlan-18": "2001:660:4406:392:1::9",
-      "kavlan-2": "2001:660:4406:382:1::9",
-      "kavlan-20": "2001:660:4406:394:1::9",
-      "kavlan-21": "2001:660:4406:395:1::9",
-      "kavlan-3": "2001:660:4406:383:1::9",
-      "kavlan-4": "2001:660:4406:384:1::9",
-      "kavlan-5": "2001:660:4406:385:1::9",
-      "kavlan-6": "2001:660:4406:386:1::9",
-      "kavlan-7": "2001:660:4406:387:1::9",
-      "kavlan-8": "2001:660:4406:388:1::9",
-      "kavlan-9": "2001:660:4406:389:1::9"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:381:1:1::9",
-      "kavlan-11": "2001:660:4406:38b:1:1::9",
-      "kavlan-12": "2001:660:4406:38c:1:1::9",
-      "kavlan-13": "2001:660:4406:38d:1:1::9",
-      "kavlan-14": "2001:660:4406:38e:1:1::9",
-      "kavlan-16": "2001:660:4406:390:1:1::9",
-      "kavlan-18": "2001:660:4406:392:1:1::9",
-      "kavlan-2": "2001:660:4406:382:1:1::9",
-      "kavlan-20": "2001:660:4406:394:1:1::9",
-      "kavlan-21": "2001:660:4406:395:1:1::9",
-      "kavlan-3": "2001:660:4406:383:1:1::9",
-      "kavlan-4": "2001:660:4406:384:1:1::9",
-      "kavlan-5": "2001:660:4406:385:1:1::9",
-      "kavlan-6": "2001:660:4406:386:1:1::9",
-      "kavlan-7": "2001:660:4406:387:1:1::9",
-      "kavlan-8": "2001:660:4406:388:1:1::9",
-      "kavlan-9": "2001:660:4406:389:1:1::9"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.9",
-      "ip6": "2001:660:4406:300:1::9",
-      "kavlan": true,
-      "mac": "00:19:b9:f1:fc:49",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "granduc-9.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/9",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.109",
-      "ip6": "2001:660:4406:300:1:1::9",
-      "kavlan": true,
-      "mac": "00:19:b9:f1:fc:4b",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "granduc-9-eth1.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet1/32",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "ip": "172.16.176.209",
-      "ip6": "2001:660:4406:300:1:2::9",
-      "kavlan": false,
-      "mac": "00:1b:21:3d:14:31",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp13s0f0",
-      "network_address": "granduc-9-eth2.luxembourg.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "ul-grid5000-sw02",
-      "switch_port": "Ethernet1/10",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": false,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:1b:21:3d:14:30",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp13s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.176.9",
-      "kavlan": false,
-      "mac": "00:1c:23:d3:42:88",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "granduc-9-bmc.luxembourg.grid5000.fr",
-      "switch": "gw-luxembourg"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 6409000000.0,
-    "node_flops": 44070000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 4194304,
-    "cache_l3": 0,
-    "clock_speed": 2000000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Clovertown",
-    "microcode": "0xbc",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz",
-    "vendor": "Intel",
-    "version": "L5335"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5000ec6d79f",
-      "by_path": "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0",
-      "device": "sda",
-      "firmware_version": "S22A",
-      "interface": "SAS",
-      "model": "ST9146802SS",
-      "size": 146815733760,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "granduc-9"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/network_equipments/gw.json b/data/grid5000/sites/luxembourg/network_equipments/gw.json
index 6b54cb2f2343eaae340a61d46ceb815aba3363e0..b5cb2ae3b24202c66a567d6a872ca30e5e157457 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/gw.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/gw.json
@@ -72,36 +72,20 @@
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "GigabitEthernet1/25",
-          "uid": "granduc-2"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "GigabitEthernet1/27",
-          "uid": "granduc-4"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "GigabitEthernet1/29",
-          "uid": "granduc-6"
         },
         {
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "GigabitEthernet1/32",
-          "uid": "granduc-9"
         },
         {
         },
@@ -161,132 +145,68 @@
         {
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet2/2",
-          "uid": "granduc-2"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet2/4",
-          "uid": "granduc-4"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet2/6",
-          "uid": "granduc-6"
         },
         {
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet2/9",
-          "uid": "granduc-9"
         },
         {
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet2/12",
-          "uid": "granduc-12"
         },
         {
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet2/15",
-          "uid": "granduc-15"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet2/16",
-          "uid": "granduc-16"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet2/18",
-          "uid": "granduc-18"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet2/20",
-          "uid": "granduc-20"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet2/21",
-          "uid": "granduc-21"
         },
         {
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "GigabitEthernet2/24",
-          "uid": "granduc-12"
         },
         {
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "GigabitEthernet2/27",
-          "uid": "granduc-15"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "GigabitEthernet2/28",
-          "uid": "granduc-16"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "GigabitEthernet2/30",
-          "uid": "granduc-18"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "GigabitEthernet2/32",
-          "uid": "granduc-20"
         },
         {
-          "kind": "node",
-          "port": "eth1",
-          "snmp_name": "GigabitEthernet2/33",
-          "uid": "granduc-21"
         },
         {
         },
diff --git a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
index 6cd6cdc43438b391b894076d761eed2fb5ad5dae..89893d8038eb87bc9118c116dbbff5647f37aaa9 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
@@ -42,84 +42,44 @@
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet1/3",
-          "uid": "granduc-2"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet1/5",
-          "uid": "granduc-4"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet1/7",
-          "uid": "granduc-6"
         },
         {
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet1/10",
-          "uid": "granduc-9"
         },
         {
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet1/13",
-          "uid": "granduc-12"
         },
         {
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet1/16",
-          "uid": "granduc-15"
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet1/17",
-          "uid": "granduc-16"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet1/19",
-          "uid": "granduc-18"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet1/21",
-          "uid": "granduc-20"
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet1/22",
-          "uid": "granduc-21"
         },
         {
         },
diff --git a/data/grid5000/sites/luxembourg/servers/cronos.json b/data/grid5000/sites/luxembourg/servers/cronos.json
index 706525b14b64eeaa36a0377982f5059ab3c066ff..4c06e9eae2d7b03a737728e16b45905f07967595 100644
--- a/data/grid5000/sites/luxembourg/servers/cronos.json
+++ b/data/grid5000/sites/luxembourg/servers/cronos.json
@@ -1,8 +1,7 @@
 {
   "alias": [
     "adminfront",
-    "af",
-    "granduc-srv"
+    "af"
   ],
   "kind": "physical",
   "network_adapters": {
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index 11931eedb4a778a5057a358b721eff4d3f77432f..b6071908cb09d185d02f31e89de44e4848d970cc 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -23,9 +23,6 @@ ipv4:
       lille chifflet eth1 0 0 6 100
       lille chiclet eth0 0 0 7 0
       lille chiclet eth1 0 0 7 100
-      luxembourg granduc eth0 0 0 0 0
-      luxembourg granduc eth1 0 0 0 100
-      luxembourg granduc eth2 0 0 0 200
       luxembourg petitprince eth0 0 0 1 0
       luxembourg petitprince eth1 0 0 1 100
       lyon sagittaire eth1 0 0 1 0
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
deleted file mode 100644
index 4e2e609e876368b4b90030e5b8af575d38c8a0e8..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
----
-model: Dell PowerEdge 1950
-created_at: 2011-12-01
-kavlan: true
-queues:
-  - default
-  - admin
-
-nodes:
-  granduc-[1-22]:
-    processor:
-      microarchitecture: Clovertown
-      clock_speed: 2000000000
-    software:
-      standard-environment: debian10-x64-std
-    performance:
-      node_flops: 44.07e+9
-      core_flops: 6.409e+9
-    supported_job_types:
-      deploy: true
-      besteffort: true
-      max_walltime: 0
-    storage_devices:
-      sda:
-        interface: SAS
-        storage: HDD
-    network_adapters:
-      eth0:
-        enabled: true
-        mountable: true
-        mounted: true
-        bridged: true
-      eth1:
-        enabled: true
-        mountable: true
-        mounted: false
-        bridged: false
-      eth2:
-        enabled: true
-        mountable: true
-        mounted: false
-        bridged: false
-        kavlan: false
-      eth3:
-        enabled: false
-        mountable: false
-        mounted: false
-        bridged: false
-      bmc:
-        interface: Ethernet
-        enabled: true
-        mountable: false
-        mounted: false
-        switch: gw-luxembourg
-    monitoring:
-      wattmeter: false
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_metrics.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_metrics.yaml
deleted file mode 100644
index e93f712b214d17e26496ca4a5cbe7a26436d6079..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_metrics.yaml
+++ /dev/null
@@ -1,167 +0,0 @@
----
-metrics:
-
-  - name: network_ifacein_bytes_total
-    description: >-
-      Input byte counter for the network device port connected to the node
-    period: 1000
-    source:
-      protocol: network_equipment
-
-  - name: network_ifaceout_bytes_total
-    description: >-
-      Output byte counter for the network device port connected to the node
-    period: 1000
-    source:
-      protocol: network_equipment
-
-  - name: bmc_temp_ambiant_celsius
-    description: Front node ambiant temperature reported by BMC, in celsius
-    period: 5000
-    source:
-      protocol: ipmisensor
-      id: 5  # Ambient Temp
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod1a"}
-    description: Speed of FAN MOD 1A reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 22  # FAN MOD 1A RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod1b"}
-    description: Speed of FAN MOD 1B reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 23  # FAN MOD 1B RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod1c"}
-    description: Speed of FAN MOD 1C reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 24  # FAN MOD 1C RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod1d"}
-    description: Speed of FAN MOD 1D reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 25  # FAN MOD 1D RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod2a"}
-    description: Speed of FAN MOD 2A reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 26  # FAN MOD 2A RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod2b"}
-    description: Speed of FAN MOD 2B reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 27  # FAN MOD 2B RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod2c"}
-    description: Speed of FAN MOD 2C reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 28  # FAN MOD 2C RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod2d"}
-    description: Speed of FAN MOD 2D reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 29  # FAN MOD 2D RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod3a"}
-    description: Speed of FAN MOD 3A reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 30  # FAN MOD 3A RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod3b"}
-    description: Speed of FAN MOD 3B reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 31  # FAN MOD 3B RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod3c"}
-    description: Speed of FAN MOD 3C reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 32  # FAN MOD 3C RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod3d"}
-    description: Speed of FAN MOD 3D reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 33  # FAN MOD 3D RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod4a"}
-    description: Speed of FAN MOD 4A reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 34  # FAN MOD 4A RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod4b"}
-    description: Speed of FAN MOD 4B reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 35  # FAN MOD 4B RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod4c"}
-    description: Speed of FAN MOD 4C reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 36  # FAN MOD 4C RPM
-
-  - name: bmc_fan_speed_rpm
-    labels: {"fan": "mod4d"}
-    description: Speed of FAN MOD 4D reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 37  # FAN MOD 4D RPM
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_retired.yaml.erb b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_retired.yaml.erb
deleted file mode 100644
index 4665cae20d9b883944f968a9104d03180d9f2a30..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_retired.yaml.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-nodes:
-<% [ 1, 3, 5, 7, 8, 10, 11, 13, 14, 17, 19, 22 ].each { |i| %>
-  granduc-<%= i %>:
-    status: retired
-<% } %>
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
deleted file mode 100644
index 57bf543b604c9d646aef3a31b7dd581662a6f695..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-1:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 2QV963J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.1
-      mac: 00:1c:23:c8:69:c2
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.1
-      mac: 00:19:b9:f0:01:c8
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f0:01:ca
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:4b
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:4a
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500078e60a7"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S207
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
deleted file mode 100644
index 9fce85dfeb89bf331bb93f2dba756444216426ac..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-10:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: DELL
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.10
-      mac: 00:1c:23:d3:42:56
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.10
-      mac: 00:22:19:6d:85:0a
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:22:19:6d:85:0c
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:3d
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:3c
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5000ec6b753"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-0x5000c5000ec6b751-lun-0"
-      model: ST9146802SS
-      rev: S22A
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
deleted file mode 100644
index cabd636cd64f53e8eb2f94250dd2c2a80097cbd3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-11:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 30W883J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.11
-      mac: 00:1c:23:d3:57:59
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.11
-      mac: 00:19:b9:f2:0f:46
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f2:0f:48
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:27
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:26
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      size: 146815733760
-      model: ST9146802SS
-      rev: S22A
-      by_id: node-was-not-available-to-retrieve-this-value
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
deleted file mode 100644
index 3f7c5ec7c51ede22ec77017006fa7fb3b9cb4e75..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-12:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 50W883J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.12
-      mac: 00:1c:23:d3:57:5f
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.12
-      mac: 00:19:b9:f2:0e:10
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f2:0e:12
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:1c
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:1d
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500078e4947"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S207
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
deleted file mode 100644
index f8a765830348ed817837c6f1ff841c6e7fc7ce10..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-13:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 40W883J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.13
-      mac: 00:1c:23:d3:57:75
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.13
-      mac: 00:19:b9:f2:0e:56
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f2:0e:58
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:13:af
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:13:ae
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5000ec32f37"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-0x5000c5000ec32f35-lun-0"
-      firmware_version: S22A
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
deleted file mode 100644
index 443d69d3b011ff951ef153ed489ef5d3541d2aa5..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-14:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 10W883J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.14
-      mac: 00:1c:23:d3:57:3b
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.14
-      mac: 00:19:b9:f2:03:bb
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f2:03:bd
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:11:f7
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:11:f6
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500078e9f87"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S207
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
deleted file mode 100644
index 1fb0305783ad3b344835cb908ef52897707c0080..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-15:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '2.37'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 60W883J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.15
-      mac: 00:1c:23:d3:57:37
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.15
-      mac: 00:19:b9:f2:0e:2e
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f2:0e:30
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e0:f1
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e0:f0
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500078e6fc7"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S207
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
deleted file mode 100644
index fc61e5fbd8553b09ecc45ec8f67c06016e6aa197..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-16:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: JZV883J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.16
-      mac: 00:1c:23:d3:57:67
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.16
-      mac: 00:19:b9:f2:0f:4b
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f2:0f:4d
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:1a
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:1b
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500078ea163"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S207
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
deleted file mode 100644
index d86cbacfa4f4671d3646d8a4e0061a12a418746a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-17:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: "..CN6970275D3242."
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.17
-      mac: 00:1c:23:d3:57:89
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.17
-      mac: 00:19:b9:de:b9:1c
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:de:b9:1e
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3c:87:71
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3c:87:70
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500078e3e9b"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S207
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
deleted file mode 100644
index ce87ff50131b46c2e71cfc3c1ab8f7657bbc1174..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-18:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.77'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: GQ2593J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.18
-      mac: 00:1c:23:d6:c4:ea
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.18
-      mac: 00:19:b9:f3:ba:b0
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f3:ba:b2
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:07
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:06
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5000ec6bd07"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S22A
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
deleted file mode 100644
index dca8adfdf26ba15cbde45592a7c4212c7e5e3c84..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-19:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 69N983J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.19
-      mac: 00:1c:23:d3:42:4e
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.19
-      mac: 00:19:b9:f2:0e:dd
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f2:0e:df
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:13:9b
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:13:9a
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500078e907b"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-0x5000c500078e9079-lun-0"
-      model: ST9146802SS
-      rev: S207
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
deleted file mode 100644
index b763fe7008603d9aecd7f4f582e01e316151760a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-2:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 1QV963J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.2
-      mac: 00:1c:23:c8:69:aa
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.2
-      mac: 00:19:b9:f0:01:d7
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f0:01:d9
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:35
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:34
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c50007389fb3"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S207
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
deleted file mode 100644
index 5ac19f8d91e070a974dc851f41fede3a365698cb..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-20:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 39N983J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.20
-      mac: 00:1c:23:d3:42:6c
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.20
-      mac: 00:19:b9:f2:08:ca
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f2:08:cc
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:13:27
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:13:26
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500078e7303"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S207
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
deleted file mode 100644
index 1d62aca55bed2cb3b80311efeb7147034211b9ba..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-21:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 1R2593J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.21
-      mac: 00:1c:23:d6:c3:0c
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.21
-      mac: 00:19:b9:f3:c2:7d
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f3:c2:7f
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:13:7d
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:13:7c
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5000ec2f6fb"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S22A
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
deleted file mode 100644
index 687604ad76368e3b30ca45b5df7c05b47e539496..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-22:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: HQ2593J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.22
-      mac: 00:1c:23:d6:c3:32
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.22
-      mac: 00:19:b9:f3:ba:a6
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f3:ba:a8
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e0:e7
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e0:e6
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5000ec5085b"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S22A
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
deleted file mode 100644
index db230bb74de3fdc5f8b0e62301f9f553ad9e28de..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-3:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.77'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 3R2593J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.3
-      mac: 00:1c:23:d6:c3:0a
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.3
-      mac: 00:19:b9:f2:0e:83
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f2:0e:85
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3c:87:cb
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3c:87:ca
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5000ec50793"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S22A
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
deleted file mode 100644
index d298f873520113c0b10a482306ca7625ba6b4455..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-4:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: FQ2593J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.4
-      mac: 00:1c:23:d6:c3:06
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.4
-      mac: 00:19:b9:f2:0a:e6
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f2:0a:e8
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:12:e9
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:12:e8
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5000ec6d903"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S22A
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
deleted file mode 100644
index a4715bb5c26f4597ef014eaac8bae039e4ad6a0a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-5:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 99N983J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.5
-      mac: 00:1c:23:d3:42:46
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.5
-      mac: 00:19:b9:f1:f8:09
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f1:f8:0b
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:12:d1
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:12:d0
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500078e4aef"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S207
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
deleted file mode 100644
index c7293f47346e975a7eef2350d8288d6af73e52c9..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-6:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: BQ2593J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.6
-      mac: 00:1c:23:d6:c3:08
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.6
-      mac: 00:19:b9:f2:0c:80
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f2:0c:82
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:13:ab
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:13:aa
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5000ec6e277"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S22A
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
deleted file mode 100644
index d72e1283340787ba82a197068b47bd2807750a31..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-7:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 49N983J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.7
-      mac: 00:1c:23:d3:42:2c
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.7
-      mac: 00:19:b9:f2:0e:6f
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f2:0e:71
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:5f
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:5e
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500078e9c6f"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-0x5000c500078e9c6d-lun-0"
-      model: ST9146802SS
-      rev: S207
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
deleted file mode 100644
index 809d234068bdc042463b48484dff3740218bc7aa..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-8:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: "..CN6970278K0603."
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.8
-      mac: 00:1c:23:d3:08:7a
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.8
-      mac: 00:19:b9:ee:11:4a
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:ee:11:4c
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:8d
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:34:e1:8c
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500082d5317"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S229
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
deleted file mode 100644
index 038e05a499b67eee8990283659c468f3b6e1be42..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-granduc-9:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  bmc_version: '1.33'
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 89N983J
-  main_memory:
-    ram_size: 17179869184
-  network_adapters:
-    bmc:
-      ip: 172.17.176.9
-      mac: 00:1c:23:d3:42:88
-      management: true
-    eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      ip: 172.16.176.9
-      mac: 00:19:b9:f1:fc:49
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno1
-      rate: 1000000000
-      vendor: Broadcom
-    eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
-      interface: Ethernet
-      mac: 00:19:b9:f1:fc:4b
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: eno2
-      rate: 1000000000
-      vendor: Broadcom
-    eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:14:31
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
-      rate: 10000000000
-      vendor: Intel
-    eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
-      interface: Ethernet
-      mac: 00:1b:21:3d:14:30
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
-      vendor: Intel
-  operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0xbc'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
-    version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5000ec6d79f"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S22A
-      model: ST9146802SS
-      size: 146815733760
-  supported_job_types:
-    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
index b66cee38a30dfe112d6cc2993a729020338ba93e..40af43ecb8d69934391088aa329b692b7d700d56 100644
--- a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
+++ b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
@@ -88,102 +88,6 @@ gw:
       rate: 1000000000
       kind: node
       ports:
-#        1:
-#          uid: granduc-1
-#          port: bmc
-#          kind: node
-#        2:
-#          uid: granduc-2
-#          port: bmc
-#          kind: node
-#        3:
-#          uid: granduc-3
-#          port: bmc
-#          kind: node
-#        4:
-#          uid: granduc-4
-#          port: bmc
-#          kind: node
-#        5:
-#          uid: granduc-5
-#          port: bmc
-#          kind: node
-#        6:
-#          uid: granduc-6
-#          port: bmc
-#          kind: node
-#        7:
-#          uid: granduc-7
-#          port: bmc
-#          kind: node
-#        8:
-#          uid: granduc-8
-#          port: bmc
-#          kind: node
-#        9:
-#          uid: granduc-9
-#          port: bmc
-#          kind: node
-#        10:
-#          uid: granduc-10
-#          port: bmc
-#          kind: node
-#        11:
-#          uid: granduc-11
-#          port: bmc
-#          kind: node
-#        12:
-#          uid: granduc-12
-#          port: bmc
-#          kind: node
-#        13:
-#          uid: granduc-13
-#          port: bmc
-#          kind: node
-#        14:
-#          uid: granduc-14
-#          port: bmc
-#          kind: node
-#        15:
-#          uid: granduc-15
-#          port: bmc
-#          kind: node
-#        16:
-#          uid: granduc-16
-#          port: bmc
-#          kind: node
-#        17:
-#          uid: granduc-17
-#          port: bmc
-#          kind: node
-#        18:
-#          uid: granduc-18
-#          port: bmc
-#          kind: node
-#        19:
-#          uid: granduc-19
-#          port: bmc
-#          kind: node
-#        20:
-#          uid: granduc-20
-#          port: bmc
-#          kind: node
-#        21:
-#          uid: granduc-21
-#          port: bmc
-#          kind: node
-#        22:
-#          uid: granduc-22
-#          port: bmc
-#          kind: node
-        25:
-          uid: granduc-2-eth1
-        27:
-          uid: granduc-4-eth1
-        29:
-          uid: granduc-6-eth1
-        32:
-          uid: granduc-9-eth1
         35:
           uid: cronos-eth1
           kind: server
@@ -208,38 +112,6 @@ gw:
       rate: 1000000000
       kind: node
       ports:
-        2:
-          uid: granduc-2
-        4:
-          uid: granduc-4
-        6:
-          uid: granduc-6
-        9:
-          uid: granduc-9
-        12:
-          uid: granduc-12
-        15:
-          uid: granduc-15
-        16:
-          uid: granduc-16
-        18:
-          uid: granduc-18
-        20:
-          uid: granduc-20
-        21:
-          uid: granduc-21
-        24:
-          uid: granduc-12-eth1
-        27:
-          uid: granduc-15-eth1
-        28:
-          uid: granduc-16-eth1
-        30:
-          uid: granduc-18-eth1
-        32:
-          uid: granduc-20-eth1
-        33:
-          uid: granduc-21-eth1
         44:
           uid: cronos
           kind: server
diff --git a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
index f1f4ea0654456b8f6c8199f62649e5340e452e23..b3fd08d0053e7f319a5a3a30a802d1737dd2f063 100644
--- a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
+++ b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
@@ -38,25 +38,15 @@ ul-grid5000-sw02:
       ports:
         1:
         3:
-          uid: granduc-2-eth2
         5:
-          uid: granduc-4-eth2
         7:
-          uid: granduc-6-eth2
         10:
-          uid: granduc-9-eth2
         13:
-          uid: granduc-12-eth2
         16:
-          uid: granduc-15-eth2
         17:
-          uid: granduc-16-eth2
         19:
-          uid: granduc-18-eth2
         21:
-          uid: granduc-20-eth2
         22:
-          uid: granduc-21-eth2
         24:
         25:
           uid: port-channel7
diff --git a/input/grid5000/sites/luxembourg/servers/servers.yaml b/input/grid5000/sites/luxembourg/servers/servers.yaml
index 5aac6becfd202cb8ea919061bdd0d2ee9e41b4ea..4dea6d97426f26d23fa24ac18880c2741200830b 100644
--- a/input/grid5000/sites/luxembourg/servers/servers.yaml
+++ b/input/grid5000/sites/luxembourg/servers/servers.yaml
@@ -1,7 +1,7 @@
 ---
 cronos:
   kind: physical
-  alias: [adminfront, af, granduc-srv]
+  alias: [adminfront, af]
   warranty: 2017-05
   serial: JSG625J
   network_adapters:
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index df6d63b58ea8410fbc8f8f93d745236cc38d0e40..c07786d957711006fa34b6eb9ceb030ed14b58f9 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -73,8 +73,6 @@ vlans:
       local lille chifflot eth1 0 0 5 0
       local lille chiclet eth0 0 0 6 0
       local lille chiclet eth1 0 0 7 0
-      local luxembourg granduc eth0 0 0 0 0
-      local luxembourg granduc eth1 0 0 1 0
       local luxembourg petitprince eth0 0 0 2 0
       local luxembourg petitprince eth1 0 0 3 0
       local lyon sagittaire eth1 0 0 0 0
@@ -168,8 +166,6 @@ vlans:
       global rennes parapluie eth1 0 0 36 0
       global sophia uvb eth0 0 0 40 0
       global sophia suno eth0 0 0 41 0
-      global luxembourg granduc eth0 0 0 45 0
-      global luxembourg granduc eth1 0 0 45 100
       global luxembourg petitprince eth0 0 0 46 0
       global luxembourg petitprince eth1 0 0 46 100
       global nantes econome eth0 0 0 48 0
@@ -225,8 +221,6 @@ vlans:
       routed rennes parasilo eth1 0 24 8 0
       routed sophia suno eth0 0 32 0 0
       routed sophia uvb eth0 0 32 1 0
-      routed luxembourg granduc eth0 0 40 0 0
-      routed luxembourg granduc eth1 0 40 1 0
       routed luxembourg petitprince eth0 0 40 2 0
       routed luxembourg petitprince eth1 0 40 3 0
       routed nantes econome eth0 0 44 0 0