diff --git a/data/grid5000/accesses/refrepo.json b/data/grid5000/accesses/refrepo.json
index cdef59ee6864b98ea2b88918dc765c2a9b46556b..6eeb2ca8cc48296772bd65d50850071728480049 100644
--- a/data/grid5000/accesses/refrepo.json
+++ b/data/grid5000/accesses/refrepo.json
@@ -706,69 +706,6 @@
               },
               "uid": "dahu-32"
             },
-            "dahu-33": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-33"
-            },
-            "dahu-34": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-34"
-            },
-            "dahu-35": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-35"
-            },
-            "dahu-36": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-36"
-            },
-            "dahu-37": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-37"
-            },
-            "dahu-38": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-38"
-            },
-            "dahu-39": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-39"
-            },
             "dahu-4": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -796,96 +733,6 @@
               },
               "uid": "dahu-4"
             },
-            "dahu-40": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-40"
-            },
-            "dahu-41": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-41"
-            },
-            "dahu-42": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-42"
-            },
-            "dahu-43": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-43"
-            },
-            "dahu-44": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-44"
-            },
-            "dahu-45": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-45"
-            },
-            "dahu-46": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-46"
-            },
-            "dahu-47": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-47"
-            },
-            "dahu-48": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-48"
-            },
-            "dahu-49": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-49"
-            },
             "dahu-5": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -913,96 +760,6 @@
               },
               "uid": "dahu-5"
             },
-            "dahu-50": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-50"
-            },
-            "dahu-51": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-51"
-            },
-            "dahu-52": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-52"
-            },
-            "dahu-53": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-53"
-            },
-            "dahu-54": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-54"
-            },
-            "dahu-55": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-55"
-            },
-            "dahu-56": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-56"
-            },
-            "dahu-57": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-57"
-            },
-            "dahu-58": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-58"
-            },
-            "dahu-59": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-59"
-            },
             "dahu-6": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -1030,96 +787,6 @@
               },
               "uid": "dahu-6"
             },
-            "dahu-60": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-60"
-            },
-            "dahu-61": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-61"
-            },
-            "dahu-62": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-62"
-            },
-            "dahu-63": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-63"
-            },
-            "dahu-64": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-64"
-            },
-            "dahu-65": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-65"
-            },
-            "dahu-66": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-66"
-            },
-            "dahu-67": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-67"
-            },
-            "dahu-68": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-68"
-            },
-            "dahu-69": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-69"
-            },
             "dahu-7": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -1147,33 +814,6 @@
               },
               "uid": "dahu-7"
             },
-            "dahu-70": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-70"
-            },
-            "dahu-71": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-71"
-            },
-            "dahu-72": {
-              "nodeset": "dahu",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Skylake"
-              },
-              "uid": "dahu-72"
-            },
             "dahu-8": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -4465,15 +4105,6 @@
               },
               "uid": "petitprince-11"
             },
-            "petitprince-12": {
-              "nodeset": "petitprince",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2000000000,
-                "microarchitecture": "Sandy Bridge"
-              },
-              "uid": "petitprince-12"
-            },
             "petitprince-13": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -4636,15 +4267,6 @@
               },
               "uid": "petitprince-3"
             },
-            "petitprince-4": {
-              "nodeset": "petitprince",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2000000000,
-                "microarchitecture": "Sandy Bridge"
-              },
-              "uid": "petitprince-4"
-            },
             "petitprince-5": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -4672,33 +4294,6 @@
               },
               "uid": "petitprince-5"
             },
-            "petitprince-6": {
-              "nodeset": "petitprince",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2000000000,
-                "microarchitecture": "Sandy Bridge"
-              },
-              "uid": "petitprince-6"
-            },
-            "petitprince-7": {
-              "nodeset": "petitprince",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2000000000,
-                "microarchitecture": "Sandy Bridge"
-              },
-              "uid": "petitprince-7"
-            },
-            "petitprince-8": {
-              "nodeset": "petitprince",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2000000000,
-                "microarchitecture": "Sandy Bridge"
-              },
-              "uid": "petitprince-8"
-            },
             "petitprince-9": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -7099,15 +6694,6 @@
               },
               "uid": "nova-2"
             },
-            "nova-20": {
-              "nodeset": "nova",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2100000000,
-                "microarchitecture": "Broadwell"
-              },
-              "uid": "nova-20"
-            },
             "nova-21": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -7434,27 +7020,6 @@
               },
               "uid": "orion-1"
             },
-            "orion-2": {
-              "gpu_devices": {
-                "nvidia0": {
-                  "cpu_affinity": 1,
-                  "device": "/dev/nvidia0",
-                  "memory": 5636096000,
-                  "model": "Tesla M2075",
-                  "power_default_limit": "225.00 W",
-                  "reservation": false,
-                  "vbios_version": "70.10.46.00.05",
-                  "vendor": "Nvidia"
-                }
-              },
-              "nodeset": "orion",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2300000000,
-                "microarchitecture": "Sandy Bridge"
-              },
-              "uid": "orion-2"
-            },
             "orion-3": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -7675,24 +7240,6 @@
         },
         "sagittaire": {
           "nodes": {
-            "sagittaire-1": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-1"
-            },
-            "sagittaire-10": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-10"
-            },
             "sagittaire-11": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -7805,766 +7352,163 @@
               "architecture": {
                 "cpu_core_numbering": "round-robin",
                 "nb_cores": 2,
-                "nb_procs": 2,
-                "nb_threads": 2,
-                "platform_type": "x86_64"
-              },
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "cache_l1d": 65536,
-                "cache_l1i": 65536,
-                "cache_l2": 1048576,
-                "cache_l3": 0,
-                "clock_speed": 2400000000,
-                "ht_capable": false,
-                "instruction_set": "x86-64",
-                "microarchitecture": "K8",
-                "microcode": "0x3a",
-                "model": "AMD Opteron",
-                "other_description": "AMD Opteron(tm) Processor 250",
-                "vendor": "AMD",
-                "version": 250
-              },
-              "uid": "sagittaire-15"
-            },
-            "sagittaire-16": {
-              "architecture": {
-                "cpu_core_numbering": "round-robin",
-                "nb_cores": 2,
-                "nb_procs": 2,
-                "nb_threads": 2,
-                "platform_type": "x86_64"
-              },
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "cache_l1d": 65536,
-                "cache_l1i": 65536,
-                "cache_l2": 1048576,
-                "cache_l3": 0,
-                "clock_speed": 2400000000,
-                "ht_capable": false,
-                "instruction_set": "x86-64",
-                "microarchitecture": "K8",
-                "microcode": "0x3a",
-                "model": "AMD Opteron",
-                "other_description": "AMD Opteron(tm) Processor 250",
-                "vendor": "AMD",
-                "version": 250
-              },
-              "uid": "sagittaire-16"
-            },
-            "sagittaire-17": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-17"
-            },
-            "sagittaire-18": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-18"
-            },
-            "sagittaire-19": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-19"
-            },
-            "sagittaire-2": {
-              "architecture": {
-                "cpu_core_numbering": "round-robin",
-                "nb_cores": 2,
-                "nb_procs": 2,
-                "nb_threads": 2,
-                "platform_type": "x86_64"
-              },
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "cache_l1d": 65536,
-                "cache_l1i": 65536,
-                "cache_l2": 1048576,
-                "cache_l3": 0,
-                "clock_speed": 2400000000,
-                "ht_capable": false,
-                "instruction_set": "x86-64",
-                "microarchitecture": "K8",
-                "microcode": "0x3a",
-                "model": "AMD Opteron",
-                "other_description": "AMD Opteron(tm) Processor 250",
-                "vendor": "AMD",
-                "version": 250
-              },
-              "uid": "sagittaire-2"
-            },
-            "sagittaire-20": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-20"
-            },
-            "sagittaire-21": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-21"
-            },
-            "sagittaire-22": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-22"
-            },
-            "sagittaire-23": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-23"
-            },
-            "sagittaire-24": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-24"
-            },
-            "sagittaire-25": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-25"
-            },
-            "sagittaire-26": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-26"
-            },
-            "sagittaire-27": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-27"
-            },
-            "sagittaire-28": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-28"
-            },
-            "sagittaire-29": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-29"
-            },
-            "sagittaire-3": {
-              "architecture": {
-                "cpu_core_numbering": "round-robin",
-                "nb_cores": 2,
-                "nb_procs": 2,
-                "nb_threads": 2,
-                "platform_type": "x86_64"
-              },
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "cache_l1d": 65536,
-                "cache_l1i": 65536,
-                "cache_l2": 1048576,
-                "cache_l3": 0,
-                "clock_speed": 2400000000,
-                "ht_capable": false,
-                "instruction_set": "x86-64",
-                "microarchitecture": "K8",
-                "microcode": "0x3a",
-                "model": "AMD Opteron",
-                "other_description": "AMD Opteron(tm) Processor 250",
-                "vendor": "AMD",
-                "version": 250
-              },
-              "uid": "sagittaire-3"
-            },
-            "sagittaire-30": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-30"
-            },
-            "sagittaire-31": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-31"
-            },
-            "sagittaire-32": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-32"
-            },
-            "sagittaire-33": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-33"
-            },
-            "sagittaire-34": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-34"
-            },
-            "sagittaire-35": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-35"
-            },
-            "sagittaire-36": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-36"
-            },
-            "sagittaire-37": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-37"
-            },
-            "sagittaire-38": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-38"
-            },
-            "sagittaire-39": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-39"
-            },
-            "sagittaire-4": {
-              "architecture": {
-                "cpu_core_numbering": "round-robin",
-                "nb_cores": 2,
-                "nb_procs": 2,
-                "nb_threads": 2,
-                "platform_type": "x86_64"
-              },
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "cache_l1d": 65536,
-                "cache_l1i": 65536,
-                "cache_l2": 1048576,
-                "cache_l3": 0,
-                "clock_speed": 2400000000,
-                "ht_capable": false,
-                "instruction_set": "x86-64",
-                "microarchitecture": "K8",
-                "microcode": "0x3a",
-                "model": "AMD Opteron",
-                "other_description": "AMD Opteron(tm) Processor 250",
-                "vendor": "AMD",
-                "version": 250
-              },
-              "uid": "sagittaire-4"
-            },
-            "sagittaire-40": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-40"
-            },
-            "sagittaire-41": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-41"
-            },
-            "sagittaire-42": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-42"
-            },
-            "sagittaire-43": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-43"
-            },
-            "sagittaire-44": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-44"
-            },
-            "sagittaire-45": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-45"
-            },
-            "sagittaire-46": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-46"
-            },
-            "sagittaire-47": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-47"
-            },
-            "sagittaire-48": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-48"
-            },
-            "sagittaire-49": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-49"
-            },
-            "sagittaire-5": {
-              "architecture": {
-                "cpu_core_numbering": "round-robin",
-                "nb_cores": 2,
-                "nb_procs": 2,
-                "nb_threads": 2,
-                "platform_type": "x86_64"
-              },
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "cache_l1d": 65536,
-                "cache_l1i": 65536,
-                "cache_l2": 1048576,
-                "cache_l3": 0,
-                "clock_speed": 2400000000,
-                "ht_capable": false,
-                "instruction_set": "x86-64",
-                "microarchitecture": "K8",
-                "microcode": "0x3a",
-                "model": "AMD Opteron",
-                "other_description": "AMD Opteron(tm) Processor 250",
-                "vendor": "AMD",
-                "version": 250
-              },
-              "uid": "sagittaire-5"
-            },
-            "sagittaire-50": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-50"
-            },
-            "sagittaire-51": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-51"
-            },
-            "sagittaire-52": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-52"
-            },
-            "sagittaire-53": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-53"
-            },
-            "sagittaire-54": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-54"
-            },
-            "sagittaire-55": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-55"
-            },
-            "sagittaire-56": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-56"
-            },
-            "sagittaire-57": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-57"
-            },
-            "sagittaire-58": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-58"
-            },
-            "sagittaire-59": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-59"
-            },
-            "sagittaire-6": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-6"
-            },
-            "sagittaire-60": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-60"
-            },
-            "sagittaire-61": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-61"
-            },
-            "sagittaire-62": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-62"
-            },
-            "sagittaire-63": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-63"
-            },
-            "sagittaire-64": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-64"
-            },
-            "sagittaire-65": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-65"
-            },
-            "sagittaire-66": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-66"
-            },
-            "sagittaire-67": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-67"
-            },
-            "sagittaire-68": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-68"
-            },
-            "sagittaire-69": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-69"
-            },
-            "sagittaire-7": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-7"
-            },
-            "sagittaire-70": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-70"
-            },
-            "sagittaire-71": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-71"
-            },
-            "sagittaire-72": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
-              },
-              "uid": "sagittaire-72"
-            },
-            "sagittaire-73": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
+                "nb_procs": 2,
+                "nb_threads": 2,
+                "platform_type": "x86_64"
               },
-              "uid": "sagittaire-73"
-            },
-            "sagittaire-74": {
               "nodeset": "sagittaire",
               "processor": {
                 "cache_l1": null,
+                "cache_l1d": 65536,
+                "cache_l1i": 65536,
+                "cache_l2": 1048576,
+                "cache_l3": 0,
                 "clock_speed": 2400000000,
-                "microarchitecture": "K8"
+                "ht_capable": false,
+                "instruction_set": "x86-64",
+                "microarchitecture": "K8",
+                "microcode": "0x3a",
+                "model": "AMD Opteron",
+                "other_description": "AMD Opteron(tm) Processor 250",
+                "vendor": "AMD",
+                "version": 250
               },
-              "uid": "sagittaire-74"
+              "uid": "sagittaire-15"
             },
-            "sagittaire-75": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
+            "sagittaire-16": {
+              "architecture": {
+                "cpu_core_numbering": "round-robin",
+                "nb_cores": 2,
+                "nb_procs": 2,
+                "nb_threads": 2,
+                "platform_type": "x86_64"
               },
-              "uid": "sagittaire-75"
-            },
-            "sagittaire-76": {
               "nodeset": "sagittaire",
               "processor": {
                 "cache_l1": null,
+                "cache_l1d": 65536,
+                "cache_l1i": 65536,
+                "cache_l2": 1048576,
+                "cache_l3": 0,
                 "clock_speed": 2400000000,
-                "microarchitecture": "K8"
+                "ht_capable": false,
+                "instruction_set": "x86-64",
+                "microarchitecture": "K8",
+                "microcode": "0x3a",
+                "model": "AMD Opteron",
+                "other_description": "AMD Opteron(tm) Processor 250",
+                "vendor": "AMD",
+                "version": 250
               },
-              "uid": "sagittaire-76"
+              "uid": "sagittaire-16"
             },
-            "sagittaire-77": {
-              "nodeset": "sagittaire",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "K8"
+            "sagittaire-2": {
+              "architecture": {
+                "cpu_core_numbering": "round-robin",
+                "nb_cores": 2,
+                "nb_procs": 2,
+                "nb_threads": 2,
+                "platform_type": "x86_64"
               },
-              "uid": "sagittaire-77"
-            },
-            "sagittaire-78": {
               "nodeset": "sagittaire",
               "processor": {
                 "cache_l1": null,
+                "cache_l1d": 65536,
+                "cache_l1i": 65536,
+                "cache_l2": 1048576,
+                "cache_l3": 0,
                 "clock_speed": 2400000000,
-                "microarchitecture": "K8"
+                "ht_capable": false,
+                "instruction_set": "x86-64",
+                "microarchitecture": "K8",
+                "microcode": "0x3a",
+                "model": "AMD Opteron",
+                "other_description": "AMD Opteron(tm) Processor 250",
+                "vendor": "AMD",
+                "version": 250
               },
-              "uid": "sagittaire-78"
+              "uid": "sagittaire-2"
             },
-            "sagittaire-79": {
+            "sagittaire-3": {
+              "architecture": {
+                "cpu_core_numbering": "round-robin",
+                "nb_cores": 2,
+                "nb_procs": 2,
+                "nb_threads": 2,
+                "platform_type": "x86_64"
+              },
               "nodeset": "sagittaire",
               "processor": {
                 "cache_l1": null,
+                "cache_l1d": 65536,
+                "cache_l1i": 65536,
+                "cache_l2": 1048576,
+                "cache_l3": 0,
                 "clock_speed": 2400000000,
-                "microarchitecture": "K8"
+                "ht_capable": false,
+                "instruction_set": "x86-64",
+                "microarchitecture": "K8",
+                "microcode": "0x3a",
+                "model": "AMD Opteron",
+                "other_description": "AMD Opteron(tm) Processor 250",
+                "vendor": "AMD",
+                "version": 250
               },
-              "uid": "sagittaire-79"
+              "uid": "sagittaire-3"
             },
-            "sagittaire-8": {
+            "sagittaire-4": {
+              "architecture": {
+                "cpu_core_numbering": "round-robin",
+                "nb_cores": 2,
+                "nb_procs": 2,
+                "nb_threads": 2,
+                "platform_type": "x86_64"
+              },
               "nodeset": "sagittaire",
               "processor": {
                 "cache_l1": null,
+                "cache_l1d": 65536,
+                "cache_l1i": 65536,
+                "cache_l2": 1048576,
+                "cache_l3": 0,
                 "clock_speed": 2400000000,
-                "microarchitecture": "K8"
+                "ht_capable": false,
+                "instruction_set": "x86-64",
+                "microarchitecture": "K8",
+                "microcode": "0x3a",
+                "model": "AMD Opteron",
+                "other_description": "AMD Opteron(tm) Processor 250",
+                "vendor": "AMD",
+                "version": 250
               },
-              "uid": "sagittaire-8"
+              "uid": "sagittaire-4"
             },
-            "sagittaire-9": {
+            "sagittaire-5": {
+              "architecture": {
+                "cpu_core_numbering": "round-robin",
+                "nb_cores": 2,
+                "nb_procs": 2,
+                "nb_threads": 2,
+                "platform_type": "x86_64"
+              },
               "nodeset": "sagittaire",
               "processor": {
                 "cache_l1": null,
+                "cache_l1d": 65536,
+                "cache_l1i": 65536,
+                "cache_l2": 1048576,
+                "cache_l3": 0,
                 "clock_speed": 2400000000,
-                "microarchitecture": "K8"
+                "ht_capable": false,
+                "instruction_set": "x86-64",
+                "microarchitecture": "K8",
+                "microcode": "0x3a",
+                "model": "AMD Opteron",
+                "other_description": "AMD Opteron(tm) Processor 250",
+                "vendor": "AMD",
+                "version": 250
               },
-              "uid": "sagittaire-9"
+              "uid": "sagittaire-5"
             }
           },
           "queues": [
@@ -8830,15 +7774,6 @@
               },
               "uid": "taurus-11"
             },
-            "taurus-12": {
-              "nodeset": "taurus",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2300000000,
-                "microarchitecture": "Sandy Bridge"
-              },
-              "uid": "taurus-12"
-            },
             "taurus-13": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -8866,15 +7801,6 @@
               },
               "uid": "taurus-13"
             },
-            "taurus-14": {
-              "nodeset": "taurus",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2300000000,
-                "microarchitecture": "Sandy Bridge"
-              },
-              "uid": "taurus-14"
-            },
             "taurus-15": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -8902,24 +7828,6 @@
               },
               "uid": "taurus-15"
             },
-            "taurus-16": {
-              "nodeset": "taurus",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2300000000,
-                "microarchitecture": "Sandy Bridge"
-              },
-              "uid": "taurus-16"
-            },
-            "taurus-2": {
-              "nodeset": "taurus",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2300000000,
-                "microarchitecture": "Sandy Bridge"
-              },
-              "uid": "taurus-2"
-            },
             "taurus-3": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -22965,15 +21873,6 @@
               },
               "uid": "paranoia-5"
             },
-            "paranoia-6": {
-              "nodeset": "paranoia",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2200000000,
-                "microarchitecture": "Sandy Bridge"
-              },
-              "uid": "paranoia-6"
-            },
             "paranoia-7": {
               "architecture": {
                 "cpu_core_numbering": "contiguous",
@@ -23226,15 +22125,6 @@
               },
               "uid": "parasilo-15"
             },
-            "parasilo-16": {
-              "nodeset": "parasilo",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2400000000,
-                "microarchitecture": "Haswell"
-              },
-              "uid": "parasilo-16"
-            },
             "parasilo-17": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -26700,15 +25590,6 @@
               },
               "uid": "roazhon5-7"
             },
-            "roazhon5-8": {
-              "nodeset": "roazhon5",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2600000000,
-                "microarchitecture": "Haswell"
-              },
-              "uid": "roazhon5-8"
-            },
             "roazhon5-9": {
               "architecture": {
                 "cpu_core_numbering": "round-robin",
@@ -27326,15 +26207,6 @@
               },
               "uid": "uvb-12"
             },
-            "uvb-13": {
-              "nodeset": "uvb",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2950000000,
-                "microarchitecture": "Westmere"
-              },
-              "uid": "uvb-13"
-            },
             "uvb-14": {
               "architecture": {
                 "cpu_core_numbering": "contiguous",
@@ -27362,15 +26234,6 @@
               },
               "uid": "uvb-14"
             },
-            "uvb-15": {
-              "nodeset": "uvb",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2950000000,
-                "microarchitecture": "Westmere"
-              },
-              "uid": "uvb-15"
-            },
             "uvb-16": {
               "architecture": {
                 "cpu_core_numbering": "contiguous",
@@ -27452,15 +26315,6 @@
               },
               "uid": "uvb-18"
             },
-            "uvb-19": {
-              "nodeset": "uvb",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2950000000,
-                "microarchitecture": "Westmere"
-              },
-              "uid": "uvb-19"
-            },
             "uvb-2": {
               "architecture": {
                 "cpu_core_numbering": "contiguous",
@@ -27488,51 +26342,6 @@
               },
               "uid": "uvb-2"
             },
-            "uvb-20": {
-              "nodeset": "uvb",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2950000000,
-                "microarchitecture": "Westmere"
-              },
-              "uid": "uvb-20"
-            },
-            "uvb-21": {
-              "nodeset": "uvb",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2950000000,
-                "microarchitecture": "Westmere"
-              },
-              "uid": "uvb-21"
-            },
-            "uvb-22": {
-              "nodeset": "uvb",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2950000000,
-                "microarchitecture": "Westmere"
-              },
-              "uid": "uvb-22"
-            },
-            "uvb-23": {
-              "nodeset": "uvb",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2950000000,
-                "microarchitecture": "Westmere"
-              },
-              "uid": "uvb-23"
-            },
-            "uvb-24": {
-              "nodeset": "uvb",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2950000000,
-                "microarchitecture": "Westmere"
-              },
-              "uid": "uvb-24"
-            },
             "uvb-25": {
               "architecture": {
                 "cpu_core_numbering": "contiguous",
@@ -27668,24 +26477,6 @@
               },
               "uid": "uvb-29"
             },
-            "uvb-3": {
-              "nodeset": "uvb",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2950000000,
-                "microarchitecture": "Westmere"
-              },
-              "uid": "uvb-3"
-            },
-            "uvb-30": {
-              "nodeset": "uvb",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2950000000,
-                "microarchitecture": "Westmere"
-              },
-              "uid": "uvb-30"
-            },
             "uvb-31": {
               "architecture": {
                 "cpu_core_numbering": "contiguous",
@@ -27713,15 +26504,6 @@
               },
               "uid": "uvb-31"
             },
-            "uvb-32": {
-              "nodeset": "uvb",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2950000000,
-                "microarchitecture": "Westmere"
-              },
-              "uid": "uvb-32"
-            },
             "uvb-33": {
               "architecture": {
                 "cpu_core_numbering": "contiguous",
@@ -27884,15 +26666,6 @@
               },
               "uid": "uvb-38"
             },
-            "uvb-39": {
-              "nodeset": "uvb",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2950000000,
-                "microarchitecture": "Westmere"
-              },
-              "uid": "uvb-39"
-            },
             "uvb-4": {
               "architecture": {
                 "cpu_core_numbering": "contiguous",
@@ -27920,15 +26693,6 @@
               },
               "uid": "uvb-4"
             },
-            "uvb-40": {
-              "nodeset": "uvb",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2950000000,
-                "microarchitecture": "Westmere"
-              },
-              "uid": "uvb-40"
-            },
             "uvb-41": {
               "architecture": {
                 "cpu_core_numbering": "contiguous",
@@ -28118,15 +26882,6 @@
               },
               "uid": "uvb-7"
             },
-            "uvb-8": {
-              "nodeset": "uvb",
-              "processor": {
-                "cache_l1": null,
-                "clock_speed": 2950000000,
-                "microarchitecture": "Westmere"
-              },
-              "uid": "uvb-8"
-            },
             "uvb-9": {
               "architecture": {
                 "cpu_core_numbering": "contiguous",