diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
deleted file mode 100644
index 7e99a0cb429ff52368baea671e5bedbb74091c0f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-10:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052075175
-  main_memory:
-    ram_size: 2146435072
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.10
-      mac: 00:09:3d:11:aa:e3
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:11:aa:e1
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.10
-      mac: 00:09:3d:11:aa:e2
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '1:10'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
deleted file mode 100644
index baed1b158a08a4395f41a36016999c918e4a4825..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-21:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083161
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.21
-      mac: 00:09:3d:12:85:72
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:85:70
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.21
-      mac: 00:09:3d:12:85:71
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '1:21'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
deleted file mode 100644
index e3636fbf04897b9bc28eae876a1d0eced17369d0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-22:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 03/02/2005
-    vendor: Phoenix Technologies Ltd.
-    version: V1.32.7.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052429001
-  main_memory:
-    ram_size: 2147483648
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.22
-      mac: 00:09:3d:12:90:a0
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:90:9e
-      management: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.22
-      mac: 00:09:3d:12:90:9f
-      management: false
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      by_id: ''
-      by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
deleted file mode 100644
index 7e8623a42a57b6163aaeb97d626bab9c72d852e4..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-23:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052422799
-  main_memory:
-    ram_size: 2147483648
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.23
-      mac: 00:09:3d:12:7d:48
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:7d:46
-      management: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.23
-      mac: 00:09:3d:12:7d:47
-      management: false
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      by_id: ''
-      by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
-      model: MAT3073NC
-      rev: 104
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
deleted file mode 100644
index 672d4a54b79f05345fcf5464568ab2e76a086e86..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-25:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083161
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.25
-      mac: 00:09:3d:10:de:8f
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:10:de:8d
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.25
-      mac: 00:09:3d:10:de:8e
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '1:25'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
deleted file mode 100644
index 08936d0330a27e8c631fc0b069c4995e12d8e371..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-26:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083140
-  main_memory:
-    ram_size: 2146435072
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.26
-      mac: 00:09:3d:11:ce:23
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:11:ce:21
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.26
-      mac: 00:09:3d:11:ce:22
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '1:26'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: MAT3073NC
-      rev: 104
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
deleted file mode 100644
index fc138e6d83f6cadef2ab12de4e28939211a905fd..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-28:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052422324
-  main_memory:
-    ram_size: 2146435072
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.28
-      mac: 00:09:3d:12:33:e7
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:33:e5
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.28
-      mac: 00:09:3d:12:33:e6
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '1:28'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
deleted file mode 100644
index 8a98fe9f80b74762523c13d943c2f17f2bec4b7f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-32:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052536375
-  main_memory:
-    ram_size: 2147483648
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.32
-      mac: 00:09:3d:12:a5:76
-    eth0:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      mac: 00:09:3d:12:a5:74
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f0
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-    eth1:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      ip: 172.16.49.32
-      mac: 00:09:3d:12:a5:75
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f1
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      by_id: ''
-      by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
-      firmware_version: 104
-      model: MAT3073NC
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
deleted file mode 100644
index c5ce4cfab9235d228e5c426f3f9275a70d95a129..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-33:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052536398
-  main_memory:
-    ram_size: 2147483648
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.33
-      mac: 00:09:3d:12:92:72
-    eth0:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      mac: 00:09:3d:12:92:70
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f0
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-    eth1:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      ip: 172.16.49.33
-      mac: 00:09:3d:12:92:71
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f1
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      by_id: ''
-      by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
-      firmware_version: 104
-      model: MAT3073NC
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
deleted file mode 100644
index 5b77217d695362d2cc5bfa6ba53802f4fe05b265..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-34:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052536349
-  main_memory:
-    ram_size: 2147483648
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.34
-      mac: 00:09:3d:12:a4:f0
-    eth0:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      mac: 00:09:3d:12:a4:ee
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f0
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-    eth1:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      ip: 172.16.49.34
-      mac: 00:09:3d:12:a4:ef
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f1
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      by_id: ''
-      by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
-      firmware_version: 104
-      model: MAT3073NC
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
deleted file mode 100644
index 382515523109fd73541bd01170c9db1a869f2119..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-35:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083161
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.35
-      mac: 00:09:3d:12:28:18
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:28:16
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.35
-      mac: 00:09:3d:12:28:17
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '1:35'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
deleted file mode 100644
index f2e4ea07da23bb86d083e07acf3e822ab58a4fa2..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-36:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083161
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.36
-      mac: 00:09:3d:10:c7:bc
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:10:c7:ba
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.36
-      mac: 00:09:3d:10:c7:bb
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '1:36'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
deleted file mode 100644
index 0bcba082afff1ab426d383b8c08155285774cd7a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-37:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052423605
-  main_memory:
-    ram_size: 2146435072
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.37
-      mac: 00:09:3d:12:69:fa
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:69:f8
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.37
-      mac: 00:09:3d:12:69:f9
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '1:37'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
deleted file mode 100644
index 7eb76c9960537ed9bcb81de72cde2fcf99303800..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-38:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052423602
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.38
-      mac: 00:09:3d:12:38:6c
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:38:6a
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.38
-      mac: 00:09:3d:12:38:6b
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2.0
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
deleted file mode 100644
index 673faf46d71eacc15c82ced5f5f055b2df225444..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-39:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052420611
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.39
-      mac: 00:09:3d:12:4f:1a
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:4f:18
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.39
-      mac: 00:09:3d:12:4f:19
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: MAT3073NC
-      rev: 104.0
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
deleted file mode 100644
index ee3cc9bc4b258dc8936ff72be993d438b64b6aca..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-40:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083161
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.40
-      mac: 00:09:3d:11:5a:32
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:11:5a:30
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.40
-      mac: 00:09:3d:11:5a:31
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
deleted file mode 100644
index 253d8e18004853b04a7f45adf767c0aa32d8c85c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-41:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083161
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.41
-      mac: 00:09:3d:12:6a:43
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:6a:41
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.41
-      mac: 00:09:3d:12:6a:42
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '1:41'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
deleted file mode 100644
index abd7aaf6555c5d407618e5a9b82c4e6f3f33a0e9..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-42:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052420624
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.42
-      mac: 00:09:3d:12:74:d6
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:74:d4
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.42
-      mac: 00:09:3d:12:74:d5
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: MAT3073NC
-      rev: 104.0
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
deleted file mode 100644
index 18bbc1f1f46cfafb443547ea0906c1c356586a92..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-43:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052422304
-  main_memory:
-    ram_size: 2147483648
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.43
-      mac: 00:09:3d:12:28:51
-    eth0:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      mac: 00:09:3d:12:28:4f
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f0
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-    eth1:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      ip: 172.16.49.43
-      mac: 00:09:3d:12:28:50
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f1
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      by_id: ''
-      by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
-      firmware_version: 2
-      model: ST373207LC
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
deleted file mode 100644
index 95ae0d01654c8a421293db2b443ca2637a4612bc..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-44:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052536146
-  main_memory:
-    ram_size: 2147483648
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.44
-      mac: 00:09:3d:12:a4:b6
-    eth0:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      mac: 00:09:3d:12:a4:b4
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f0
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-    eth1:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      ip: 172.16.49.44
-      mac: 00:09:3d:12:a4:b5
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f1
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      by_id: ''
-      by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
-      firmware_version: 104
-      model: MAT3073NC
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
deleted file mode 100644
index bf90a8c60252dd0edac984162956626cbfc1bde0..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-45:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052420619
-  main_memory:
-    ram_size: 2147483648
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.45
-      mac: 00:09:3d:12:3c:63
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:3c:61
-      management: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.45
-      mac: 00:09:3d:12:3c:62
-      management: false
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      by_id: ''
-      by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
-      model: MAT3073NC
-      rev: 104
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
deleted file mode 100644
index 5b322c1e65ef4f83121759c0094cea37f8315e08..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-47:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052423591
-  main_memory:
-    ram_size: 2147483648
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.47
-      mac: 00:09:3d:12:3c:05
-    eth0:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      mac: 00:09:3d:12:3c:03
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f0
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-    eth1:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      ip: 172.16.49.47
-      mac: 00:09:3d:12:3c:04
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f1
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      by_id: ''
-      by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
-      firmware_version: 2
-      model: ST373207LC
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
deleted file mode 100644
index a4eaa3eb7d31eaff0cbf449dd227596b84a7e8e6..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-48:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052536400
-  main_memory:
-    ram_size: 2147483648
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.48
-      mac: 00:09:3d:12:92:f7
-    eth0:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      mac: 00:09:3d:12:92:f5
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f0
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-    eth1:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      ip: 172.16.49.48
-      mac: 00:09:3d:12:92:f6
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f1
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      by_id: ''
-      by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
-      firmware_version: 104
-      model: MAT3073NC
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
deleted file mode 100644
index 033c9ac53a3ab5598e67d9113532571fc47d6a77..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-49:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052420599
-  main_memory:
-    ram_size: 2147483648
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.49
-      mac: 00:09:3d:12:3b:df
-    eth0:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      mac: 00:09:3d:12:3b:dd
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f0
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-    eth1:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      ip: 172.16.49.49
-      mac: 00:09:3d:12:3b:de
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f1
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      by_id: ''
-      by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
-      firmware_version: 2
-      model: ST373207LC
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
deleted file mode 100644
index 342c03e79834831cd1c27346fad822b80de58b66..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-50:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052423649
-  main_memory:
-    ram_size: 2147483648
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.50
-      mac: 00:09:3d:12:69:b9
-    eth0:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      mac: 00:09:3d:12:69:b7
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f0
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-    eth1:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      ip: 172.16.49.50
-      mac: 00:09:3d:12:69:b8
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f1
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      by_id: ''
-      by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
-      firmware_version: 2
-      model: ST373207LC
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
deleted file mode 100644
index a69f9080006c8ba901fbf545025882240da61b58..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-51:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052420601
-  main_memory:
-    ram_size: 2147483648
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.51
-      mac: 00:09:3d:12:3c:72
-    eth0:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      mac: 00:09:3d:12:3c:70
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f0
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-    eth1:
-      driver: tg3
-      firmware_version: 5704-v3.27
-      interface: Ethernet
-      ip: 172.16.49.51
-      mac: 00:09:3d:12:3c:71
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f1
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      by_id: ''
-      by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
-      firmware_version: 2
-      model: ST373207LC
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
deleted file mode 100644
index fa380faa57565230dd5d25d5e9dfaacb646843a1..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-52:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052422284
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.52
-      mac: 00:09:3d:12:27:68
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:27:66
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f0
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.52
-      mac: 00:09:3d:12:27:67
-      management: false
-      model: NetXtreme BCM5704 Gigabit Ethernet
-      name: enp2s2f1
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Broadcom Inc. and subsidiaries
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: MAT3073NC
-      rev: 104.0
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
deleted file mode 100644
index 80b0a4cf8226cbaf34eddc9027b5e91afad4aaf8..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-53:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052536172
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.53
-      mac: 00:09:3d:12:9d:8d
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:9d:8b
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.53
-      mac: 00:09:3d:12:9d:8c
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: MAT3073NC
-      rev: 104.0
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
deleted file mode 100644
index ae1748d563ee426109e188e2e294cf66c5228960..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-54:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052536363
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.54
-      mac: 00:09:3d:12:92:63
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:92:61
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.54
-      mac: 00:09:3d:12:92:62
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2.0
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
deleted file mode 100644
index f9104e90bd28cf4e80876a8fadb43634a589a497..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-55:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052310093
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.55
-      mac: 00:09:3d:12:68:ab
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:68:a9
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.55
-      mac: 00:09:3d:12:68:aa
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2.0
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
deleted file mode 100644
index 62ebbed21ea6c7e11dfae276f61c1e7ab97ebbdb..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-56:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052291009
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.56
-      mac: 00:09:3d:12:5a:d8
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:5a:d6
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.56
-      mac: 00:09:3d:12:5a:d7
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: MAT3073NC
-      rev: 104.0
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
deleted file mode 100644
index 6193e7e6fd32fc36e508536ae75ed84fde95510e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-57:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052310153
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.57
-      mac: 00:09:3d:12:62:f0
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:62:ee
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.57
-      mac: 00:09:3d:12:62:ef
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: MAT3073NC
-      rev: 104.0
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
deleted file mode 100644
index 474d4fa934edf3c56c01eac58ba55bcd249a03b5..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-58:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052310087
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.58
-      mac: 00:09:3d:12:68:69
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:68:67
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.58
-      mac: 00:09:3d:12:68:68
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2.0
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
deleted file mode 100644
index b73800c852ef795ac3aa3054fadc80f9cf1a0fef..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-59:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052081174
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.59
-      mac: 00:09:3d:12:29:fa
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:29:f8
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.59
-      mac: 00:09:3d:12:29:f9
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2.0
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
deleted file mode 100644
index f55ecdabf5548df237d25b9dc143a7b8bc5cb55b..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-60:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052310130
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.60
-      mac: 00:09:3d:12:6b:3d
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:6b:3b
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.60
-      mac: 00:09:3d:12:6b:3c
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '2:12'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2.0
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
deleted file mode 100644
index 40616dd67a3541a0f70f8de06aabe8c3596d6528..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-61:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052291007
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.61
-      mac: 00:09:3d:12:5d:fc
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:5d:fa
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.61
-      mac: 00:09:3d:12:5d:fb
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: MAT3073NC
-      rev: 104.0
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
deleted file mode 100644
index 5feb618f5becc70d60b3644cc113d48a1cda4f6c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-62:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083161
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.62
-      mac: 00:09:3d:12:70:5c
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:70:5a
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.62
-      mac: 00:09:3d:12:70:5b
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
deleted file mode 100644
index 1a2e7911edd20a0760fefb2c5e38e6b903ec6f0a..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-63:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052291036
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.63
-      mac: 00:09:3d:12:5e:fd
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:5e:fb
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.63
-      mac: 00:09:3d:12:5e:fc
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: MAT3073NC
-      rev: 104.0
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
deleted file mode 100644
index 31a18f34ac14de3c7f6ca0c678b2ce25866787da..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-64:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052291045
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.64
-      mac: 00:09:3d:12:31:7e
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:31:7c
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.64
-      mac: 00:09:3d:12:31:7d
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: MAT3073NC
-      rev: 104.0
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
deleted file mode 100644
index 96931b3b3751833708171f7cf9dfb73a00522720..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-65:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052422296
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.65
-      mac: 00:09:3d:12:28:03
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:28:01
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.65
-      mac: 00:09:3d:12:28:02
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2.0
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
deleted file mode 100644
index be9debeead7ef651ad972e671b0372f72aaba700..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-66:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052420562
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.66
-      mac: 00:09:3d:12:30:60
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:30:5e
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.66
-      mac: 00:09:3d:12:30:5f
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: MAT3073NC
-      rev: 104.0
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
deleted file mode 100644
index 29844051dc013b545247930da4b0d5b6812147eb..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-67:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052422292
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.67
-      mac: 00:09:3d:12:28:ab
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:28:a9
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.67
-      mac: 00:09:3d:12:28:aa
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: MAT3073NC
-      rev: 104.0
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
deleted file mode 100644
index 971966edde6278d274bc0edb1de880f22f8a45bf..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-68:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083161
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.68
-      mac: 00:09:3d:12:27:fa
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:27:f8
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.68
-      mac: 00:09:3d:12:27:f9
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '2:20'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
deleted file mode 100644
index a8cec01461e96e95b801a14c1af297f2ce346d11..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-69:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052423581
-  main_memory:
-    ram_size: 2107637760
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.69
-      mac: 00:09:3d:12:40:a3
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:40:a1
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.69
-      mac: 00:09:3d:12:40:a2
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: MAT3073NC
-      rev: 104.0
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
deleted file mode 100644
index ab97a9615b7fd93c34b23c3487c664b0304678a8..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-70:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083161
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.70
-      mac: 00:09:3d:11:ea:2a
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:11:ea:28
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.70
-      mac: 00:09:3d:11:ea:29
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
deleted file mode 100644
index b748e67b40d123875be7a895762ed6a87d3d9547..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-71:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083258
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.71
-      mac: 00:09:3d:11:db:b3
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:11:db:b1
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.71
-      mac: 00:09:3d:11:db:b2
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2.0
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
deleted file mode 100644
index 8d3adaaf35f5fcf0f30207281d9a737095b75a7c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-72:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083198
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.72
-      mac: 00:09:3d:11:ae:fe
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:11:ae:fc
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.72
-      mac: 00:09:3d:11:ae:fd
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2.0
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
deleted file mode 100644
index 2ce008cb30ff68a351f1f16709d21a35c05c0183..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-73:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083161
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.73
-      mac:
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac:
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.73
-      mac:
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '2:25'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
deleted file mode 100644
index 6f54473b3d5253944c04b4069ba0e63f42972917..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-74:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083265
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.74
-      mac: 00:09:3d:11:db:ad
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:11:db:ab
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.74
-      mac: 00:09:3d:11:db:ac
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2.0
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
deleted file mode 100644
index c4827fb551d895ed9d58e7ce854c62faa0d47956..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-75:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083161
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.75
-      mac: 00:09:3d:11:95:23
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:11:95:21
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.75
-      mac: 00:09:3d:11:95:22
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2.0
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
deleted file mode 100644
index c01d264973501a8011f8b8fd95f6c0dbf99c35b7..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-76:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083161
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.76
-      mac: 00:09:3d:11:c5:21
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:11:c5:1f
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.76
-      mac: 00:09:3d:11:c5:20
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '2:28'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
deleted file mode 100644
index c47c172829856f9ffc4f029c742176c1810b4c66..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-77:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG051642100
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.77
-      mac: 00:09:3d:11:c5:2d
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:11:c5:2b
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.77
-      mac: 00:09:3d:11:c5:2c
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '2:29'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: MAT3073NC
-      rev: 104.0
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
deleted file mode 100644
index 97dceda648cdb500a02a110785e3d45db9bec453..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-78:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083164
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.78
-      mac: 00:09:3d:11:12:2d
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:11:12:2b
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.78
-      mac: 00:09:3d:11:12:2c
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2.0
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
deleted file mode 100644
index 246f71c42f643c6d92811db08f5ce44c2d9bcaea..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-79:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083120
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.79
-      mac: 00:09:3d:11:cd:8d
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:11:cd:8b
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.79
-      mac: 00:09:3d:11:cd:8c
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '2:31'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
deleted file mode 100644
index 6ef0ee12abe62aeb0310711fc333d3cf879f985e..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-8:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052083161
-  main_memory:
-    ram_size: 17179869184
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.8
-      mac: 00:09:3d:12:6b:10
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:6b:0e
-      management: false
-      mounted: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.8
-      mac: 00:09:3d:12:6b:0f
-      management: false
-      mounted: true
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-      switch_port: '1:8'
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      model: ST373207LC
-      rev: 2
-      size: 73407868928
-  supported_job_types:
-    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
deleted file mode 100644
index 084a4492e5c7a45be336b92b46ecc02c1bdba93c..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-sagittaire-9:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 2
-    nb_procs: 2
-    nb_threads: 2
-    platform_type: x86_64
-  bios:
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-    version: V1.35.2.2
-  bmc_version: '2.04'
-  chassis:
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-    serial: XG052422764
-  main_memory:
-    ram_size: 2147483648
-  memory_devices:
-    dimm_0_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_0_cpu1:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu0:
-      size: 536870912
-      technology: dram
-    dimm_1_cpu1:
-      size: 536870912
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.49.9
-      mac: 00:09:3d:12:7f:dc
-    eth0:
-      driver: tg3
-      interface: Ethernet
-      mac: 00:09:3d:12:7f:da
-      management: false
-      sriov: false
-      sriov_totalvfs: 0
-    eth1:
-      driver: tg3
-      interface: Ethernet
-      ip: 172.16.49.9
-      mac: 00:09:3d:12:7f:db
-      management: false
-      rate: 1000000000
-      sriov: false
-      sriov_totalvfs: 0
-  operating_system:
-    cstate_driver: acpi_idle
-    cstate_governor: menu
-    ht_enabled: false
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
-  processor:
-    ht_capable: false
-    microcode: '0x3a'
-  storage_devices:
-    pci-0000:02:04.0-scsi-0:0:1:0:
-      by_id: ''
-      by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
-      model: MAT3073NC
-      rev: 104
-      size: 73543163904
-  supported_job_types:
-    virtual: false
diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb
index 04e481762e7c410c8aae309bc79208c1840ba72d..a5b5bd3a6425e0ef42b42be62731d9d3835aed2d 100644
--- a/lib/refrepo/input_loader.rb
+++ b/lib/refrepo/input_loader.rb
@@ -394,11 +394,11 @@ def add_switch_port(h)
 end
 
 def detect_dead_nodes_with_yaml_files(h)
-  h['sites'].each_pair do |_site_uid, hs|
-    hs.fetch('clusters', {}).each_pair do |_cluster_uid, hc|
+  h['sites'].each_pair do |site_uid, hs|
+    hs.fetch('clusters', {}).each_pair do |cluster_uid, hc|
       hc['nodes'].each_pair do |node_uid, hn|
         if hn['status'] == 'retired'
-          if (hn['processor']['model'] rescue nil)
+          if File.exist?( "input/grid5000/sites/#{site_uid}/clusters/#{cluster_uid}/nodes/#{node_uid}.yaml" )
             raise "ERROR: #{node_uid} is marked status:retired, but its yaml is still in the repository. Please remove it."
           end
         end