From f74bd78e03eeebf76db6cecb0f539ee56f851aa2 Mon Sep 17 00:00:00 2001
From: Samir Noir <samir.noir@inria.fr>
Date: Wed, 29 Jan 2020 14:00:56 +0100
Subject: [PATCH] move processor/clock_speed at clusters level

---
 input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml            | 1 +
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml    | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml    | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml    | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-33.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-34.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-35.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-36.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-37.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-38.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-39.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml    | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-40.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-41.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-42.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-43.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-44.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-45.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-46.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-47.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-48.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-49.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml    | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-50.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-51.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-52.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-53.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-54.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-55.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-56.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-57.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-58.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-59.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml    | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-60.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-61.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-62.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-63.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-64.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-65.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-66.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-67.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-68.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-69.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml    | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-70.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-71.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-72.yaml   | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml    | 1 -
 input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml    | 1 -
 input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml  | 1 -
 input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml  | 1 -
 input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml  | 1 -
 input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml  | 1 -
 input/grid5000/sites/grenoble/clusters/troll/troll.yaml          | 1 +
 input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml    | 1 -
 input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml    | 1 -
 input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml    | 1 -
 input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml    | 1 -
 input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml            | 1 +
 input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml         | 1 +
 input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml | 1 -
 .../grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml  | 1 -
 .../grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml  | 1 -
 .../grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml  | 1 -
 .../grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml  | 1 -
 .../grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml  | 1 -
 .../grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml  | 1 -
 input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml | 1 -
 input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml | 1 -
 input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml | 1 -
 input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml | 1 -
 input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml | 1 -
 input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml | 1 -
 input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml | 1 -
 input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml | 1 -
 input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml         | 1 +
 input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml | 1 -
 input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml | 1 -
 input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml | 1 -
 input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml | 1 -
 input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml | 1 -
 input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml | 1 -
 input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml | 1 -
 input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml | 1 -
 input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml       | 1 +
 .../grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml | 1 -
 .../grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml | 1 -
 .../grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml | 1 -
 .../grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml | 1 -
 .../grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml | 1 -
 .../grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml | 1 -
 .../grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml | 1 -
 .../grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml | 1 -
 input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml       | 1 +
 .../grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml | 1 -
 .../grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml | 1 -
 .../grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml | 1 -
 .../grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml | 1 -
 .../grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml | 1 -
 .../grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml | 1 -
 .../grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml | 1 -
 .../grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml | 1 -
 input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml    | 1 +
 .../sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml       | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml      | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml      | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml      | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml      | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml      | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml      | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml      | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml      | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml      | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml      | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml       | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml      | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml      | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml      | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml       | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml       | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml       | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml       | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml       | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml       | 1 -
 .../sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml       | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-1.yaml     | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-10.yaml    | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-11.yaml    | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-12.yaml    | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-13.yaml    | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-14.yaml    | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-15.yaml    | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-16.yaml    | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-2.yaml     | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-3.yaml     | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-4.yaml     | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-5.yaml     | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-6.yaml     | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-7.yaml     | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-8.yaml     | 1 -
 .../luxembourg/clusters/petitprince/nodes/petitprince-9.yaml     | 1 -
 .../sites/luxembourg/clusters/petitprince/petitprince.yaml       | 1 +
 input/grid5000/sites/lyon/clusters/gemini/gemini.yaml            | 1 +
 input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml    | 1 -
 input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml    | 1 -
 input/grid5000/sites/lyon/clusters/hercule/hercule.yaml          | 1 +
 input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml  | 1 -
 input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml  | 1 -
 input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml  | 1 -
 input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml  | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml        | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml        | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml        | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml        | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml        | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml        | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml        | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml        | 1 -
 input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml        | 1 -
 input/grid5000/sites/lyon/clusters/nova/nova.yaml                | 1 +
 input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml      | 1 -
 input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml      | 1 -
 input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml      | 1 -
 input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml      | 1 -
 input/grid5000/sites/lyon/clusters/orion/orion.yaml              | 1 +
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml       | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml       | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml       | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml      | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml       | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml       | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml       | 1 -
 .../sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml       | 1 -
 input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml    | 1 +
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml    | 1 -
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml   | 1 -
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml   | 1 -
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml   | 1 -
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml   | 1 -
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml   | 1 -
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml   | 1 -
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml    | 1 -
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml    | 1 -
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml    | 1 -
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml    | 1 -
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml    | 1 -
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml    | 1 -
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml    | 1 -
 input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml    | 1 -
 input/grid5000/sites/lyon/clusters/taurus/taurus.yaml            | 1 +
 input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml       | 1 +
 .../grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml | 1 -
 .../sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml         | 1 -
 .../sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml         | 1 -
 .../sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml         | 1 -
 .../sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml         | 1 -
 .../grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml | 1 -
 input/grid5000/sites/nancy/clusters/graoully/graoully.yaml       | 1 +
 .../grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml | 1 -
 .../sites/nancy/clusters/graoully/nodes/graoully-10.yaml         | 1 -
 .../sites/nancy/clusters/graoully/nodes/graoully-11.yaml         | 1 -
 .../sites/nancy/clusters/graoully/nodes/graoully-12.yaml         | 1 -
 .../sites/nancy/clusters/graoully/nodes/graoully-13.yaml         | 1 -
 .../sites/nancy/clusters/graoully/nodes/graoully-14.yaml         | 1 -
 .../sites/nancy/clusters/graoully/nodes/graoully-15.yaml         | 1 -
 .../sites/nancy/clusters/graoully/nodes/graoully-16.yaml         | 1 -
 .../grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml | 1 -
 input/grid5000/sites/nancy/clusters/graphique/graphique.yaml     | 1 +
 .../sites/nancy/clusters/graphique/nodes/graphique-1.yaml        | 1 -
 .../sites/nancy/clusters/graphique/nodes/graphique-2.yaml        | 1 -
 .../sites/nancy/clusters/graphique/nodes/graphique-3.yaml        | 1 -
 .../sites/nancy/clusters/graphique/nodes/graphique-4.yaml        | 1 -
 .../sites/nancy/clusters/graphique/nodes/graphique-5.yaml        | 1 -
 .../sites/nancy/clusters/graphique/nodes/graphique-6.yaml        | 1 -
 input/grid5000/sites/nancy/clusters/graphite/graphite.yaml       | 1 +
 .../grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml | 1 -
 .../grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml           | 1 +
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grele/grele.yaml             | 1 +
 input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml    | 1 -
 input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml    | 1 -
 input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml    | 1 -
 input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml    | 1 -
 input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml    | 1 -
 input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/grimani/grimani.yaml         | 1 +
 input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml | 1 -
 input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml | 1 -
 input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml | 1 -
 input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml | 1 -
 input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml | 1 -
 input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml | 1 -
 input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml       | 1 +
 .../grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml | 1 -
 .../grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml | 1 -
 .../grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml | 1 -
 .../grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml | 1 -
 .../grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml | 1 -
 .../grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml | 1 -
 .../grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml | 1 -
 .../grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml | 1 -
 input/grid5000/sites/nancy/clusters/grisou/grisou.yaml           | 1 +
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml   | 1 -
 input/grid5000/sites/nancy/clusters/gros/gros.yaml               | 1 +
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml       | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml     | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml       | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml       | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml       | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml       | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml       | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml       | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml       | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml       | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml      | 1 -
 input/grid5000/sites/nancy/clusters/grue/grue.yaml               | 1 +
 input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml       | 1 -
 input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml       | 1 -
 input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml       | 1 -
 input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml       | 1 -
 input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml       | 1 -
 input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml         | 1 +
 input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml  | 1 -
 .../grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml  | 1 -
 input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml | 1 -
 input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml | 1 -
 input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml | 1 -
 input/grid5000/sites/nantes/clusters/econome/econome.yaml        | 1 +
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml  | 1 -
 input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml        | 1 +
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml  | 1 -
 .../grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml  | 1 -
 .../sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml         | 1 -
 .../sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml         | 1 -
 .../sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml         | 1 -
 .../sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml         | 1 -
 .../sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml         | 1 -
 .../sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml         | 1 -
 .../sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml         | 1 -
 .../sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml         | 1 -
 input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml      | 1 +
 .../sites/rennes/clusters/parapide/nodes/parapide-1.yaml         | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-10.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-11.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-12.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-13.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-14.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-15.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-16.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-17.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-18.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-19.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-2.yaml         | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-20.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-21.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-22.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-23.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-24.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-25.yaml        | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-3.yaml         | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-4.yaml         | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-5.yaml         | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-6.yaml         | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-7.yaml         | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-8.yaml         | 1 -
 .../sites/rennes/clusters/parapide/nodes/parapide-9.yaml         | 1 -
 input/grid5000/sites/rennes/clusters/parapide/parapide.yaml      | 1 +
 .../sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml       | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml       | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml       | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml       | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml      | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml       | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml       | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml       | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml       | 1 -
 .../sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml       | 1 -
 input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml    | 1 +
 .../sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml         | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml         | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml        | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml         | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml         | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml         | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml         | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml         | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml         | 1 -
 .../sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml         | 1 -
 input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml      | 1 +
 .../sites/rennes/clusters/paravance/nodes/paravance-1.yaml       | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-10.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-11.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-12.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-13.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-14.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-15.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-16.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-17.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-18.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-19.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-2.yaml       | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-20.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-21.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-22.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-23.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-24.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-25.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-26.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-27.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-28.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-29.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-3.yaml       | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-30.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-31.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-32.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-33.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-34.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-35.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-36.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-37.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-38.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-39.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-4.yaml       | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-40.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-41.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-42.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-43.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-44.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-45.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-46.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-47.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-48.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-49.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-5.yaml       | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-50.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-51.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-52.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-53.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-54.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-55.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-56.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-57.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-58.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-59.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-6.yaml       | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-60.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-61.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-62.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-63.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-64.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-65.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-66.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-67.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-68.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-69.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-7.yaml       | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-70.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-71.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-72.yaml      | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-8.yaml       | 1 -
 .../sites/rennes/clusters/paravance/nodes/paravance-9.yaml       | 1 -
 input/grid5000/sites/rennes/clusters/paravance/paravance.yaml    | 1 +
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml      | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml      | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml      | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml      | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml     | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml      | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml      | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml      | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml      | 1 -
 input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml      | 1 -
 input/grid5000/sites/sophia/clusters/suno/suno.yaml              | 1 +
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml        | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml        | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml        | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml        | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml       | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml        | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml        | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml        | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml        | 1 -
 input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml        | 1 -
 input/grid5000/sites/sophia/clusters/uvb/uvb.yaml                | 1 +
 954 files changed, 36 insertions(+), 918 deletions(-)

diff --git a/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml b/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
index 87d37667676..8768c20b195 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
@@ -12,6 +12,7 @@ nodes:
   dahu-[1-72]:
     processor:
       microarchitecture: Skylake
+      clock_speed: 2100000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
index c23ecceca1c..58876b083c2 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
@@ -67,7 +67,6 @@ dahu-1:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
index 7aeded3c8bd..1e209717309 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
@@ -67,7 +67,6 @@ dahu-10:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
index 38c3ba36d32..0dfc0e5d0c7 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
@@ -67,7 +67,6 @@ dahu-11:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
index 72e272422b2..f3901e22690 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
@@ -67,7 +67,6 @@ dahu-12:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
index 84e867adf3c..413d445a866 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
@@ -67,7 +67,6 @@ dahu-13:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
index 806cc8a1efa..d7a910ea92e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
@@ -67,7 +67,6 @@ dahu-14:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
index 82b75491050..2a81ccdaf2c 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
@@ -67,7 +67,6 @@ dahu-15:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
index 996169ad88d..72b7e409efe 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
@@ -67,7 +67,6 @@ dahu-16:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
index 0173ca3e690..c3b9ceee3b9 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
@@ -67,7 +67,6 @@ dahu-17:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
index c5f89a07d0a..624f30a7fad 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
@@ -67,7 +67,6 @@ dahu-18:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
index c4069cfa7eb..63168889d07 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
@@ -67,7 +67,6 @@ dahu-19:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
index 56812aa2ebc..59e30e7e726 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
@@ -67,7 +67,6 @@ dahu-2:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
index 170b2d8e693..3caa7817352 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
@@ -67,7 +67,6 @@ dahu-20:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
index e011eb46ffa..6048fcf5124 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
@@ -67,7 +67,6 @@ dahu-21:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
index c24189506e0..05c6972cf05 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
@@ -67,7 +67,6 @@ dahu-22:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
index 8b3c099e2a7..da5b662c229 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
@@ -67,7 +67,6 @@ dahu-23:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
index ba2a7fadf38..df5d75c172b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
@@ -67,7 +67,6 @@ dahu-24:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
index 7df2325a6e2..72aa8db8271 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
@@ -67,7 +67,6 @@ dahu-25:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
index 6a6c701cf55..4a40c5d571f 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
@@ -67,7 +67,6 @@ dahu-26:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
index 48521b0e5c1..9b550420a8d 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
@@ -67,7 +67,6 @@ dahu-27:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
index 33e76ac4ff8..a570d227ee9 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
@@ -67,7 +67,6 @@ dahu-28:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
index fb9cf6128d0..7b7e0185b59 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
@@ -67,7 +67,6 @@ dahu-29:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
index dcc1b218044..7c8fa115f80 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
@@ -67,7 +67,6 @@ dahu-3:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
index fabbf71a94d..7779744ce04 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
@@ -67,7 +67,6 @@ dahu-30:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
index 24dcc9f754d..3ccbef9cab7 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
@@ -67,7 +67,6 @@ dahu-31:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
index c8ef4439cb1..bf6b1a8d5ef 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
@@ -67,7 +67,6 @@ dahu-32:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-33.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-33.yaml
index 34d0f4322cb..ae3af2f579f 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-33.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-33.yaml
@@ -66,7 +66,6 @@ dahu-33:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-34.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-34.yaml
index 321d54a4a6f..f2032941df9 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-34.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-34.yaml
@@ -66,7 +66,6 @@ dahu-34:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-35.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-35.yaml
index 50ebb9865df..17c13c63393 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-35.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-35.yaml
@@ -66,7 +66,6 @@ dahu-35:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-36.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-36.yaml
index 297b2f6ee88..d5f36ea9506 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-36.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-36.yaml
@@ -66,7 +66,6 @@ dahu-36:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-37.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-37.yaml
index ebb75ae99b5..cc41f6b6cac 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-37.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-37.yaml
@@ -66,7 +66,6 @@ dahu-37:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-38.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-38.yaml
index a5fa0bbd3a0..0b0491682e6 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-38.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-38.yaml
@@ -66,7 +66,6 @@ dahu-38:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-39.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-39.yaml
index 9e627e697ec..b71f02411a8 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-39.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-39.yaml
@@ -66,7 +66,6 @@ dahu-39:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
index f40d195bf10..7adc5080d48 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
@@ -67,7 +67,6 @@ dahu-4:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-40.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-40.yaml
index 825a8d7ee3e..a19d2cec5f9 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-40.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-40.yaml
@@ -66,7 +66,6 @@ dahu-40:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-41.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-41.yaml
index f7b8784304b..e504229feaa 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-41.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-41.yaml
@@ -66,7 +66,6 @@ dahu-41:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-42.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-42.yaml
index 5e218626fed..51585062b39 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-42.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-42.yaml
@@ -66,7 +66,6 @@ dahu-42:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-43.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-43.yaml
index 01a5bbf3c1c..4851e4ed615 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-43.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-43.yaml
@@ -66,7 +66,6 @@ dahu-43:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-44.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-44.yaml
index 7a1f1991ec6..94480c331c2 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-44.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-44.yaml
@@ -66,7 +66,6 @@ dahu-44:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-45.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-45.yaml
index 09b87352413..9a3f6bffd33 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-45.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-45.yaml
@@ -66,7 +66,6 @@ dahu-45:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-46.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-46.yaml
index ded96b30a59..0e0a0fe1f2d 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-46.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-46.yaml
@@ -66,7 +66,6 @@ dahu-46:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-47.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-47.yaml
index 0b433d035e0..6ddd587ffd6 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-47.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-47.yaml
@@ -66,7 +66,6 @@ dahu-47:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-48.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-48.yaml
index b3f202d510e..e9b08c1e873 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-48.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-48.yaml
@@ -66,7 +66,6 @@ dahu-48:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-49.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-49.yaml
index 2fd705d3e5c..472d8c13285 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-49.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-49.yaml
@@ -66,7 +66,6 @@ dahu-49:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
index 8553c0ca08b..57a7aa4cbbc 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
@@ -67,7 +67,6 @@ dahu-5:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-50.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-50.yaml
index a393bc17e73..6cb010cbac0 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-50.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-50.yaml
@@ -66,7 +66,6 @@ dahu-50:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-51.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-51.yaml
index 67ff07e165d..2a624cc6f49 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-51.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-51.yaml
@@ -66,7 +66,6 @@ dahu-51:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-52.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-52.yaml
index 4dc5aab8644..03a4beab3aa 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-52.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-52.yaml
@@ -66,7 +66,6 @@ dahu-52:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-53.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-53.yaml
index 08bdda6e61f..06c9bbc9fa5 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-53.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-53.yaml
@@ -66,7 +66,6 @@ dahu-53:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-54.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-54.yaml
index 243286aefa3..5217b34d96c 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-54.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-54.yaml
@@ -66,7 +66,6 @@ dahu-54:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-55.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-55.yaml
index fda130091f8..468d06a7da9 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-55.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-55.yaml
@@ -66,7 +66,6 @@ dahu-55:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-56.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-56.yaml
index ad0bbdfaff8..ea28006ecfc 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-56.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-56.yaml
@@ -66,7 +66,6 @@ dahu-56:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-57.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-57.yaml
index 71134e04ad2..7f90efa6bf5 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-57.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-57.yaml
@@ -66,7 +66,6 @@ dahu-57:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-58.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-58.yaml
index 603847f64c5..fe9c0dcd614 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-58.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-58.yaml
@@ -66,7 +66,6 @@ dahu-58:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-59.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-59.yaml
index 603a66a2729..f05976f340f 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-59.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-59.yaml
@@ -66,7 +66,6 @@ dahu-59:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
index 2c820c28623..73c98bb5239 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
@@ -67,7 +67,6 @@ dahu-6:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-60.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-60.yaml
index d22c5a7756e..8bbe427dab2 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-60.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-60.yaml
@@ -66,7 +66,6 @@ dahu-60:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-61.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-61.yaml
index 2e5ae0c02da..01bece49a32 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-61.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-61.yaml
@@ -66,7 +66,6 @@ dahu-61:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-62.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-62.yaml
index 1d0ae8778da..cbc60b186cf 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-62.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-62.yaml
@@ -66,7 +66,6 @@ dahu-62:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-63.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-63.yaml
index 89c473611a4..b560580e613 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-63.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-63.yaml
@@ -66,7 +66,6 @@ dahu-63:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-64.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-64.yaml
index 5d4834bc44f..e1b460c5157 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-64.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-64.yaml
@@ -66,7 +66,6 @@ dahu-64:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-65.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-65.yaml
index 74f91ef7f42..6e021c785a8 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-65.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-65.yaml
@@ -66,7 +66,6 @@ dahu-65:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-66.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-66.yaml
index 49b922757af..449c9b834ff 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-66.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-66.yaml
@@ -66,7 +66,6 @@ dahu-66:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-67.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-67.yaml
index bcda58e8ca7..c2fe4d5b22a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-67.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-67.yaml
@@ -66,7 +66,6 @@ dahu-67:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-68.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-68.yaml
index 605662d161b..4d58d86e2e1 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-68.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-68.yaml
@@ -66,7 +66,6 @@ dahu-68:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-69.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-69.yaml
index 9afce0e5629..14a43a4688e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-69.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-69.yaml
@@ -66,7 +66,6 @@ dahu-69:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
index 5971a34be4f..1030a6adaa1 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
@@ -67,7 +67,6 @@ dahu-7:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-70.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-70.yaml
index 2d670ab9ed5..89a3fdab867 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-70.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-70.yaml
@@ -66,7 +66,6 @@ dahu-70:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-71.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-71.yaml
index 87c93731c6a..272569249c2 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-71.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-71.yaml
@@ -66,7 +66,6 @@ dahu-71:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-72.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-72.yaml
index c26a1ccb317..b60ac33d770 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-72.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-72.yaml
@@ -66,7 +66,6 @@ dahu-72:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x200005e'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
index d38c77af4ef..34b17525581 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
@@ -67,7 +67,6 @@ dahu-8:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
index 513907ae804..74d5589c60e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
@@ -67,7 +67,6 @@ dahu-9:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
index b7a1a7bdcb5..c55cf9dc460 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
@@ -68,7 +68,6 @@ troll-1:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
index 4c36591d970..ddd2bce559a 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
@@ -68,7 +68,6 @@ troll-2:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
index 4f14c719945..ba668177587 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
@@ -68,7 +68,6 @@ troll-3:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
index 0a47ec83d23..8a6b422c437 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
@@ -68,7 +68,6 @@ troll-4:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/grenoble/clusters/troll/troll.yaml b/input/grid5000/sites/grenoble/clusters/troll/troll.yaml
index 7fcf3e0ed3d..0a239744dcf 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/troll.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/troll.yaml
@@ -9,6 +9,7 @@ nodes:
   troll-[1-4]:
     processor:
       microarchitecture: Cascade Lake-SP
+      clock_speed: 2300000000
     software:
       standard-environment: debian10-x64-std
     supported_job_types:
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
index a7c5e5354c7..b0a5e070a1d 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
@@ -85,7 +85,6 @@ yeti-1:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
index c58d2aad007..fc4ff4b90d5 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
@@ -85,7 +85,6 @@ yeti-2:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
index ffc4aa1cfba..c1a638f3099 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
@@ -85,7 +85,6 @@ yeti-3:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
index fc45d437e23..46b79700570 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
@@ -85,7 +85,6 @@ yeti-4:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml b/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml
index 97907d651b1..2522e4514d0 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml
@@ -11,6 +11,7 @@ nodes:
   yeti-[1-4]:
     processor:
       microarchitecture: Skylake
+      clock_speed: 2100000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml b/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml
index e25cd78a570..b929ada6a76 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml
@@ -17,6 +17,7 @@ nodes:
       max_walltime: 0
     processor:
       microarchitecture: Broadwell
+      clock_speed: 2200000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
index a93c26b621b..848910c2c2e 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
@@ -74,7 +74,6 @@ chetemi-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
index 2095661ee11..9cf8b520c5a 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
@@ -74,7 +74,6 @@ chetemi-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
index 7a45cf2f491..0c7c411d249 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
@@ -74,7 +74,6 @@ chetemi-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
index 78bb822374b..8bc809e7ff3 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
@@ -74,7 +74,6 @@ chetemi-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
index 6b9bcf3da19..e4213498111 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
@@ -74,7 +74,6 @@ chetemi-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
index da38a11d8a9..0dec96bcc01 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
@@ -74,7 +74,6 @@ chetemi-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
index 73c0045de80..54bbee91b8d 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
@@ -74,7 +74,6 @@ chetemi-15:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
index 4a296addd1e..3e3c11f439e 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
@@ -74,7 +74,6 @@ chetemi-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
index c0aa0a606d9..d8911f201fa 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
@@ -74,7 +74,6 @@ chetemi-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
index 63ab4189229..0d2bb00496c 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
@@ -74,7 +74,6 @@ chetemi-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
index e1d6a3f89ed..30f5f9df9ea 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
@@ -74,7 +74,6 @@ chetemi-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
index e887ded82d6..758c20e1d12 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
@@ -74,7 +74,6 @@ chetemi-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
index 2e59ca5ef54..915d1fbd461 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
@@ -74,7 +74,6 @@ chetemi-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
index b6b351c49ca..d0d778e5cf8 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
@@ -74,7 +74,6 @@ chetemi-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
index 1aac0d3cf6c..29dcb5af45e 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
@@ -74,7 +74,6 @@ chetemi-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml b/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml
index 950b1b8ab05..ddbf545fa99 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml
@@ -17,6 +17,7 @@ nodes:
       max_walltime: 0
     processor:
       microarchitecture: Zen
+      clock_speed: 2200000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
index a8b1e5122b0..51b9a8e0ded 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
@@ -92,7 +92,6 @@ chiclet-1:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 8388608
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x8001250'
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
index 5b60bd946b3..133c1495131 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
@@ -92,7 +92,6 @@ chiclet-2:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 8388608
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x8001250'
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
index f68da648b64..150656e2606 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
@@ -92,7 +92,6 @@ chiclet-3:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 8388608
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x8001250'
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
index bfee1778b26..ad337ef923a 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
@@ -92,7 +92,6 @@ chiclet-4:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 8388608
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x8001250'
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
index eaa898b4578..ff3552c09dc 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
@@ -92,7 +92,6 @@ chiclet-5:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 8388608
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x8001250'
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
index 117eed4d5c1..dcadab31b4c 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
@@ -92,7 +92,6 @@ chiclet-6:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 8388608
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x8001250'
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
index 5a9002ec85c..3ee0f8d65a5 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
@@ -92,7 +92,6 @@ chiclet-7:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 8388608
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x8001250'
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
index 2598c5193ba..9c64bed57bd 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
@@ -92,7 +92,6 @@ chiclet-8:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 8388608
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x8001250'
diff --git a/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml b/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml
index 87150f45a68..d1de2f2e38f 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml
@@ -17,6 +17,7 @@ nodes:
       max_walltime: 0
     processor:
       microarchitecture: Broadwell
+      clock_speed: 2400000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
index a936d6c42b1..8f0c690382b 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
@@ -91,7 +91,6 @@ chifflet-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 36700160
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
index 24433acea31..312572a1608 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
@@ -91,7 +91,6 @@ chifflet-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 36700160
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
index d41e28aa667..cc10b6141ca 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
@@ -91,7 +91,6 @@ chifflet-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 36700160
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
index 3709778e861..cfbed1842e9 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
@@ -91,7 +91,6 @@ chifflet-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 36700160
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
index 9dd142ccd19..28095f81b47 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
@@ -91,7 +91,6 @@ chifflet-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 36700160
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
index fc495d6e891..c8098c59fd9 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
@@ -91,7 +91,6 @@ chifflet-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 36700160
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
index 23748c89758..4f935ba7be5 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
@@ -91,7 +91,6 @@ chifflet-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 36700160
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
index 107eae972e3..931fcc2bfc3 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
@@ -91,7 +91,6 @@ chifflet-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 36700160
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml b/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml
index e2ffe57eba3..d4ba993d88f 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml
@@ -17,6 +17,7 @@ nodes:
       max_walltime: 0
     processor:
       microarchitecture: Skylake
+      clock_speed: 2600000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
index 6d84a15f2ed..9d7c40c761b 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
@@ -109,7 +109,6 @@ chifflot-1:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 20185088
-    clock_speed: 2600000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
index 0378ec801b1..62fb86e9a35 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
@@ -109,7 +109,6 @@ chifflot-2:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 20185088
-    clock_speed: 2600000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
index 224cfc5bbaf..f7740358295 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
@@ -109,7 +109,6 @@ chifflot-3:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 20185088
-    clock_speed: 2600000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
index 4b9988dc74f..5ce5c227ca4 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
@@ -109,7 +109,6 @@ chifflot-4:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 20185088
-    clock_speed: 2600000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
index af5d54f146a..66358217f31 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
@@ -109,7 +109,6 @@ chifflot-5:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 20185088
-    clock_speed: 2600000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
index cc9d7e55ac7..068dc3e30ec 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
@@ -109,7 +109,6 @@ chifflot-6:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 20185088
-    clock_speed: 2600000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
index a2d1742bc36..736904bfd96 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
@@ -109,7 +109,6 @@ chifflot-7:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 20185088
-    clock_speed: 2600000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
index 20317736f62..6df102c2d09 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
@@ -109,7 +109,6 @@ chifflot-8:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 20185088
-    clock_speed: 2600000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
index 428178a9d15..63b377cb9b9 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
@@ -9,6 +9,7 @@ nodes:
   granduc-[1-22]:
     processor:
       microarchitecture: Clovertown
+      clock_speed: 2000000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
index 2ab533a9a37..1ea7f66710e 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
@@ -75,7 +75,6 @@ granduc-1:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
index c19c5364e4c..153d2158c97 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
@@ -75,7 +75,6 @@ granduc-10:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
index 697aa24a87e..a81e0efbb8c 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
@@ -75,7 +75,6 @@ granduc-11:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
index 649dc008066..105b1f46259 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
@@ -75,7 +75,6 @@ granduc-12:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
index affb9e6758e..444b9031f25 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
@@ -75,7 +75,6 @@ granduc-13:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
index 70fd1c0240f..9a6e64a6549 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
@@ -75,7 +75,6 @@ granduc-14:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
index a1f0d92ae7f..1ff36d45ae7 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
@@ -75,7 +75,6 @@ granduc-15:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
index cf4ea458678..2031ed56331 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
@@ -75,7 +75,6 @@ granduc-16:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
index 35352032a17..0386a87378c 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
@@ -75,7 +75,6 @@ granduc-17:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
index f2afaad3171..6f176558a0e 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
@@ -75,7 +75,6 @@ granduc-18:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
index 2134ddeb97b..1e3af4a20ce 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
@@ -75,7 +75,6 @@ granduc-19:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
index 0d97fab2804..33632ccfb05 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
@@ -75,7 +75,6 @@ granduc-2:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
index f22d02bbc68..ceec70e7384 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
@@ -75,7 +75,6 @@ granduc-20:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
index 0cf70b458e7..dd070f59fc5 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
@@ -75,7 +75,6 @@ granduc-21:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
index d1649294719..c0071b7d43d 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
@@ -75,7 +75,6 @@ granduc-22:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
index dd6ff4abe97..9a94c3540ef 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
@@ -75,7 +75,6 @@ granduc-3:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
index a670a646b6f..96596ba817b 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
@@ -75,7 +75,6 @@ granduc-4:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
index d04baec703b..40d3508260b 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
@@ -75,7 +75,6 @@ granduc-5:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
index 3946ef3b85c..57b9fb3ad3d 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
@@ -75,7 +75,6 @@ granduc-6:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
index 783c0b836cd..f2b68b79bac 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
@@ -75,7 +75,6 @@ granduc-7:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
index 2f720c8a0a8..4380a5ce6c7 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
@@ -75,7 +75,6 @@ granduc-8:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
index d50dc8e338b..d4aefecb625 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
@@ -75,7 +75,6 @@ granduc-9:
     cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xbc'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
index 3a13994ac60..3ad51f7aae1 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
@@ -56,7 +56,6 @@ petitprince-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
index 4251be9768c..b5a66b93ba2 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
@@ -56,7 +56,6 @@ petitprince-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
index 9c5890f7fb8..1ac89304165 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
@@ -56,7 +56,6 @@ petitprince-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
index 26964c7533d..ef92013f8e3 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
@@ -56,7 +56,6 @@ petitprince-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
index 3b826c3a706..fe8e5c4efa8 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
@@ -56,7 +56,6 @@ petitprince-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
index d6bfb1a6426..cd41d3624be 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
@@ -56,7 +56,6 @@ petitprince-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
index 728a2be98f2..85927a6a59b 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
@@ -56,7 +56,6 @@ petitprince-15:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
index 9fb26ee6daa..ff6a9bc35a4 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
@@ -56,7 +56,6 @@ petitprince-16:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
index 0a28bb33971..8f2bc0d7194 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
@@ -56,7 +56,6 @@ petitprince-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
index 8aaf4bf2ee1..c4a7f079f52 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
@@ -56,7 +56,6 @@ petitprince-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
index c4066a337c6..49d1431c9b1 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
@@ -56,7 +56,6 @@ petitprince-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
index 48ac4f843af..751a769cfce 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
@@ -56,7 +56,6 @@ petitprince-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
index 36ac56a9605..b090d720f71 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
@@ -56,7 +56,6 @@ petitprince-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
index 5d24c7342d2..43ca8780e2c 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
@@ -56,7 +56,6 @@ petitprince-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
index 0176beb3840..c1a0430f211 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
@@ -56,7 +56,6 @@ petitprince-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
index 3bd9ffbb8a8..45b3951daa3 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
@@ -56,7 +56,6 @@ petitprince-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
index d74efd7b56f..0da9fe54f6a 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
@@ -9,6 +9,7 @@ nodes:
   petitprince-[1-16]:
     processor:
       microarchitecture: Sandy Bridge
+      clock_speed: 2000000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml b/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml
index c711356b5dd..e3f729da52e 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml
@@ -41,6 +41,7 @@ nodes:
       node_flops: 544510000000
     processor:
       microarchitecture: Broadwell
+      clock_speed: 2200000000
     software:
       standard-environment: debian10-x64-std
     network_adapters:
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
index 064304d443d..d9ee64f4a3e 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
@@ -165,7 +165,6 @@ gemini-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 52428800
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
index fd2b3dc1192..2dbd46f4144 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
@@ -165,7 +165,6 @@ gemini-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 52428800
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
index 5d9b773dfae..550176b91bf 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
@@ -11,6 +11,7 @@ nodes:
   hercule-[1-4]:
     processor:
       microarchitecture: Sandy Bridge
+      clock_speed: 2000000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
index 6e57698c198..9fda225e4f0 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
@@ -73,7 +73,6 @@ hercule-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
index c9ff71afcf1..f546be2d454 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
@@ -73,7 +73,6 @@ hercule-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
index 79bde32aa31..ec20cfc238c 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
@@ -73,7 +73,6 @@ hercule-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
index d7f1db4e0d2..79c1d2f138c 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
@@ -73,7 +73,6 @@ hercule-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
index 02f597c4fd6..5a3f46538fe 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
@@ -91,7 +91,6 @@ nova-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
index a2bce7d9e86..a10baf336c7 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
@@ -91,7 +91,6 @@ nova-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
index 5f0a3a374cf..d5eb093716d 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
@@ -91,7 +91,6 @@ nova-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
index 36481d67b23..6bf09ef177d 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
@@ -91,7 +91,6 @@ nova-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
index aeb925efc49..6b3b4fd870f 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
@@ -91,7 +91,6 @@ nova-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
index 3c985802255..a34c6148db5 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
@@ -91,7 +91,6 @@ nova-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
index f4a06e6a5e7..2605b506b96 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
@@ -91,7 +91,6 @@ nova-15:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
index 3b6437fac28..b9447f49387 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
@@ -91,7 +91,6 @@ nova-16:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
index e09c169b761..4d66f6c0ff4 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
@@ -91,7 +91,6 @@ nova-17:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
index abae295f418..df5740e2378 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
@@ -91,7 +91,6 @@ nova-18:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
index a4f6b18b55b..15ffaf45cc5 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
@@ -91,7 +91,6 @@ nova-19:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
index 382fbc86bef..b97ed1ec1fd 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
@@ -91,7 +91,6 @@ nova-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
index b6de50c442a..ada1ec6887c 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
@@ -91,7 +91,6 @@ nova-20:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
index d8ac9dc2567..78ecf1e443c 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
@@ -91,7 +91,6 @@ nova-21:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
index 27269b65c9e..f7be8916840 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
@@ -91,7 +91,6 @@ nova-22:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
index 46e9607dbeb..2ff94dbefe5 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
@@ -91,7 +91,6 @@ nova-23:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
index c7ece128d7c..834087d7fc7 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
@@ -91,7 +91,6 @@ nova-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
index e43d1b34ffe..09ee6780835 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
@@ -91,7 +91,6 @@ nova-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
index 77ce66822dc..643d47a0367 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
@@ -91,7 +91,6 @@ nova-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
index 1ba6c7e018e..bfba154de6c 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
@@ -91,7 +91,6 @@ nova-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
index 568a87447ff..7acb3f18f0a 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
@@ -91,7 +91,6 @@ nova-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
index cd39ed29513..3e94a1f5c99 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
@@ -91,7 +91,6 @@ nova-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
index 495997c162f..ba061c241e7 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
@@ -91,7 +91,6 @@ nova-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova.yaml b/input/grid5000/sites/lyon/clusters/nova/nova.yaml
index b70301bda87..86abd40d160 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova.yaml
@@ -11,6 +11,7 @@ nodes:
   nova-[1-23]:
     processor:
       microarchitecture: Broadwell
+      clock_speed: 2100000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
index 8ea50f7d5ab..bc575109ead 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
@@ -91,7 +91,6 @@ orion-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
index 7ebab30c568..41820f86893 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
@@ -91,7 +91,6 @@ orion-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
index cbaece9cf04..12e10f0e5a1 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
@@ -91,7 +91,6 @@ orion-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
index d327e2c2047..fbb8d1397a9 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
@@ -91,7 +91,6 @@ orion-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion.yaml b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
index 02e4fa018de..472b72dad0c 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
@@ -10,6 +10,7 @@ nodes:
   orion-[1-4]:
     processor:
       microarchitecture: Sandy Bridge
+      clock_speed: 2300000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
index 551b8c2b992..79e33495961 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
@@ -55,7 +55,6 @@ sagittaire-1:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
index 8cc1cf29f04..938aa84b9a5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
@@ -55,7 +55,6 @@ sagittaire-11:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
index a778ef08fc7..ccbc80ee2b0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
@@ -55,7 +55,6 @@ sagittaire-12:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
index 133fbe6a797..4e432b10d3d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
@@ -55,7 +55,6 @@ sagittaire-13:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
index 51eb94d00df..562ff7a53df 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
@@ -55,7 +55,6 @@ sagittaire-14:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
index 35c016760cd..f003f75acb2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
@@ -55,7 +55,6 @@ sagittaire-15:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
index 4066a2db068..6de5617ed31 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
@@ -55,7 +55,6 @@ sagittaire-16:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
index 5d58dc96afe..a9951a9b387 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
@@ -55,7 +55,6 @@ sagittaire-17:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
index dfd69317ba5..42dbf200ab6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
@@ -55,7 +55,6 @@ sagittaire-18:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
index 1922a242ab6..9f07ef7c119 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
@@ -55,7 +55,6 @@ sagittaire-19:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
index 2c6654614aa..1d81ca0c920 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
@@ -55,7 +55,6 @@ sagittaire-2:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
index 54e5cbe2c47..fea74f9b10d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
@@ -55,7 +55,6 @@ sagittaire-20:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
index e507eae6644..7640d8838ad 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
@@ -55,7 +55,6 @@ sagittaire-24:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
index 6921d5c78fb..a2028b340ca 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
@@ -55,7 +55,6 @@ sagittaire-27:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
index c2385af1d6f..3ab67c44c7e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
@@ -55,7 +55,6 @@ sagittaire-29:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
index a4d0ba29c06..cf120d87b31 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
@@ -55,7 +55,6 @@ sagittaire-3:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
index e31294cab67..7527d01914c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
@@ -55,7 +55,6 @@ sagittaire-30:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
index f96fdc65518..c459c3cbda0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
@@ -55,7 +55,6 @@ sagittaire-31:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
index 47cb9e322e1..8c6b119f554 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
@@ -55,7 +55,6 @@ sagittaire-4:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
index c3f165e237e..f3ed05a1098 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
@@ -55,7 +55,6 @@ sagittaire-5:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
index 8bb69e81d08..8e7ec921c2d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
@@ -55,7 +55,6 @@ sagittaire-6:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
index c75c1ce45c0..2d5dc0b6b8d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
@@ -55,7 +55,6 @@ sagittaire-7:
     cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    clock_speed: 2400000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x3a'
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
index 61896331640..686c6db230b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
@@ -22,6 +22,7 @@ nodes:
   sagittaire-[1-79]:
     processor:
       microarchitecture: K8
+      clock_speed: 2400000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
index 161aa41b0c0..86c3417d0b2 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
@@ -91,7 +91,6 @@ taurus-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
index 0c077a100b2..2aa26bd5c17 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
@@ -91,7 +91,6 @@ taurus-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
index 2ef3ba64908..b720f3b3d4d 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
@@ -91,7 +91,6 @@ taurus-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
index 554c8f734b4..da299d14d4a 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
@@ -91,7 +91,6 @@ taurus-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
index 5322bd45628..934590da9e1 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
@@ -91,7 +91,6 @@ taurus-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
index 8c553dc4925..723e5d1e2b1 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
@@ -91,7 +91,6 @@ taurus-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
index 44a68c83939..4b039860542 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
@@ -91,7 +91,6 @@ taurus-15:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
index 732b0d9bd03..fafb4f09921 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
@@ -91,7 +91,6 @@ taurus-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
index 3cc5987ceaa..81f8c5be78e 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
@@ -91,7 +91,6 @@ taurus-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
index f75d0dc7d52..4479a9c033d 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
@@ -91,7 +91,6 @@ taurus-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
index dfccacb3599..e103cbc3134 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
@@ -91,7 +91,6 @@ taurus-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
index 5bdb1fd53f3..38fb415d733 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
@@ -91,7 +91,6 @@ taurus-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
index f6a0fe8c8bd..0064e72df8a 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
@@ -91,7 +91,6 @@ taurus-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
index 93e74e43ba1..6c3046f4234 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
@@ -91,7 +91,6 @@ taurus-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
index 9a18a31f72c..845638649b9 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
@@ -91,7 +91,6 @@ taurus-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2300000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
index 859b619e077..4b88e5f31d1 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
@@ -10,6 +10,7 @@ nodes:
   taurus-[1-16]:
     processor:
       microarchitecture: Sandy Bridge
+      clock_speed: 2300000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml b/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml
index e2396117168..455a8952c58 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml
@@ -9,6 +9,7 @@ nodes:
   graffiti-[1-13]:
     processor:
       microarchitecture: Skylake
+      clock_speed: 2100000000
     software:
       standard-environment: debian10-x64-std
     supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
index 76bb5c3616e..09eaee5236f 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
@@ -106,7 +106,6 @@ graffiti-1:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 11534336
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
index cba8426bfd1..f5a7896a795 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
@@ -106,7 +106,6 @@ graffiti-10:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 11534336
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
index ced01eb72f5..47f68599829 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
@@ -106,7 +106,6 @@ graffiti-11:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 11534336
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
index 9d5997ceb74..98de45fd479 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
@@ -106,7 +106,6 @@ graffiti-12:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 11534336
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
index 521937ec818..d5957ea92f4 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
@@ -106,7 +106,6 @@ graffiti-13:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 11534336
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
index 93619039dda..d7e9bc92fab 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
@@ -106,7 +106,6 @@ graffiti-2:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 11534336
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
index 159a04490e4..852974f3347 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
@@ -106,7 +106,6 @@ graffiti-3:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 11534336
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
index 1b25e963371..b562100c59a 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
@@ -106,7 +106,6 @@ graffiti-4:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 11534336
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
index 95f553be5fa..0f8c77782f9 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
@@ -106,7 +106,6 @@ graffiti-5:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 11534336
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
index 24ecd0b966c..c67d2674006 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
@@ -106,7 +106,6 @@ graffiti-6:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 11534336
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
index e4af6dda84d..1243ea035c3 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
@@ -106,7 +106,6 @@ graffiti-7:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 11534336
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
index 1eb980129bf..6259c38ee8b 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
@@ -106,7 +106,6 @@ graffiti-8:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 11534336
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
index 6bca309d67f..6ad704a4aa2 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
@@ -106,7 +106,6 @@ graffiti-9:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 11534336
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
index a1458b68ca4..5bfc9a21ca8 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
@@ -12,6 +12,7 @@ nodes:
   graoully-[1-16]:
     processor:
       microarchitecture: Haswell
+      clock_speed: 2400000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
index e229f225170..e912a831b1c 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
@@ -103,7 +103,6 @@ graoully-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
index 4a7b7be2540..108ef56fd4b 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
@@ -103,7 +103,6 @@ graoully-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
index 3217f57a144..c296223f84f 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
@@ -103,7 +103,6 @@ graoully-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
index 1a9a49f2860..e1a991d3a4d 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
@@ -103,7 +103,6 @@ graoully-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
index 30c72de8660..eda1b463b63 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
@@ -103,7 +103,6 @@ graoully-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
index d7b381d76e4..773288ccbb3 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
@@ -103,7 +103,6 @@ graoully-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
index e2a65058e00..ce7431470e1 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
@@ -103,7 +103,6 @@ graoully-15:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
index 87d4b83c108..3be4b926a4b 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
@@ -103,7 +103,6 @@ graoully-16:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
index 6294dd7890a..df432351c18 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
@@ -103,7 +103,6 @@ graoully-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
index 96154a604e3..f56c633cd19 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
@@ -103,7 +103,6 @@ graoully-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
index cfd7af1eb63..f2f3ecd6f1c 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
@@ -103,7 +103,6 @@ graoully-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
index 913e674e20f..b120cd1df4c 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
@@ -103,7 +103,6 @@ graoully-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
index 0c5e4bb783c..525931b7101 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
@@ -103,7 +103,6 @@ graoully-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
index abf61dcb9f9..b500e1e48f6 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
@@ -103,7 +103,6 @@ graoully-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
index 0c8e31bc044..67378041440 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
@@ -103,7 +103,6 @@ graoully-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
index 5e5d7f3add1..905848b2720 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
@@ -103,7 +103,6 @@ graoully-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
index d46d1297965..2ca31371f90 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
@@ -19,6 +19,7 @@ nodes:
       besteffort: true
     processor:
       microarchitecture: Haswell
+      clock_speed: 2400000000
     software:
       standard-environment: debian10-x64-std
     storage_devices:
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
index 85503041703..17f7450c18c 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
@@ -102,7 +102,6 @@ graphique-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
index a1b5272dadd..0c9f992b087 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
@@ -102,7 +102,6 @@ graphique-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
index 37a634a1603..ba646b65b53 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
@@ -102,7 +102,6 @@ graphique-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
index 44cffa954b8..22eedfc0568 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
@@ -102,7 +102,6 @@ graphique-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
index d8fab67dc97..e96988c8fc2 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
@@ -102,7 +102,6 @@ graphique-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
index b877da713cf..228a91f0f75 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
@@ -102,7 +102,6 @@ graphique-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
index 2d7096d1af9..62c81ed850b 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
@@ -16,6 +16,7 @@ nodes:
       node_flops: 187.90e+9
     processor:
       microarchitecture: Sandy Bridge
+      clock_speed: 2000000000
     software:
       standard-environment: debian10-x64-std
     supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
index 883367b42a9..affe980780b 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
@@ -85,7 +85,6 @@ graphite-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
index 72ad201c289..f092a266a6b 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
@@ -85,7 +85,6 @@ graphite-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
index 79ed2a27989..c8907248dfd 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
@@ -85,7 +85,6 @@ graphite-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
index 6cbb19daf5d..f18b9267e7c 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
@@ -85,7 +85,6 @@ graphite-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml b/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml
index b70853b6198..d31799e1e13 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml
@@ -9,6 +9,7 @@ nodes:
   grcinq-[1-48]:
     processor:
       microarchitecture: Sandy Bridge
+      clock_speed: 2000000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
index 176be762d6a..9e9606337f5 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
@@ -67,7 +67,6 @@ grcinq-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
index 2c7e355080a..86135a07b7b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
@@ -67,7 +67,6 @@ grcinq-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
index 472d0796dcb..d2fc43d6e5c 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
@@ -67,7 +67,6 @@ grcinq-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
index 7634779c0ce..9f97b8812c7 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
@@ -67,7 +67,6 @@ grcinq-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
index 0e6ccda86ad..5b6701012d0 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
@@ -67,7 +67,6 @@ grcinq-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
index ddbaa42e8ce..e4f8a01708d 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
@@ -67,7 +67,6 @@ grcinq-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
index 9fbbc7d092e..8253276cf14 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
@@ -67,7 +67,6 @@ grcinq-15:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
index 08365aab8e3..e2a8c74ec7f 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
@@ -67,7 +67,6 @@ grcinq-16:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
index 0e6b3519e3d..32ff53030db 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
@@ -67,7 +67,6 @@ grcinq-17:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
index 915afd52f93..d9910751244 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
@@ -67,7 +67,6 @@ grcinq-18:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
index f3918cbb56c..00c32764555 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
@@ -67,7 +67,6 @@ grcinq-19:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
index 4ff124d3f5c..bfb665e2a90 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
@@ -67,7 +67,6 @@ grcinq-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
index 66eff389765..b7d702d33f8 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
@@ -67,7 +67,6 @@ grcinq-20:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
index 508fd3454e3..c6efb7844d8 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
@@ -67,7 +67,6 @@ grcinq-21:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
index 92fcc229f84..821556f7284 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
@@ -67,7 +67,6 @@ grcinq-22:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
index 8c844cdd588..a20d9117bf5 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
@@ -67,7 +67,6 @@ grcinq-23:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
index 61db6b1f0a8..877f013ab1a 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
@@ -67,7 +67,6 @@ grcinq-24:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
index fb8a66aca85..ec47d6d4d41 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
@@ -67,7 +67,6 @@ grcinq-25:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
index 6a4dd18c3f2..ec4222753a1 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
@@ -67,7 +67,6 @@ grcinq-26:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
index 780d5c8018a..8476864be99 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
@@ -67,7 +67,6 @@ grcinq-27:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
index f5255cd8d6b..6366dd1f286 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
@@ -67,7 +67,6 @@ grcinq-28:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
index c4e795857bd..ba95ff9dbce 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
@@ -67,7 +67,6 @@ grcinq-29:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
index 4452dc82946..97713413aad 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
@@ -67,7 +67,6 @@ grcinq-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
index b41524a30ed..44be04e9323 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
@@ -67,7 +67,6 @@ grcinq-30:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
index 7a00221dc24..a3a8e4dd47b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
@@ -67,7 +67,6 @@ grcinq-31:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
index 778d627e315..c9cc31f94e5 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
@@ -67,7 +67,6 @@ grcinq-32:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
index ce3c69ff5e4..456dfcc55bb 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
@@ -67,7 +67,6 @@ grcinq-33:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
index f6c9a515d83..a69cdbed631 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
@@ -67,7 +67,6 @@ grcinq-34:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
index 709af19d3c3..d88278da52b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
@@ -67,7 +67,6 @@ grcinq-35:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
index 0503c16b39b..0dcc6659e93 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
@@ -67,7 +67,6 @@ grcinq-36:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
index 0c425e044ec..d0dbabb9577 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
@@ -67,7 +67,6 @@ grcinq-37:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
index c2f77f4d7c4..7f44dd5edaa 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
@@ -67,7 +67,6 @@ grcinq-38:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
index 336774881ee..74326152a49 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
@@ -67,7 +67,6 @@ grcinq-39:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
index 37769d0362b..7340b2cbb68 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
@@ -67,7 +67,6 @@ grcinq-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
index 4e47dd3e375..319a71c9749 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
@@ -67,7 +67,6 @@ grcinq-40:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
index 56ce523a0c9..3c89363a7b4 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
@@ -67,7 +67,6 @@ grcinq-41:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
index d21ad79cbb1..49df08f50a8 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
@@ -67,7 +67,6 @@ grcinq-42:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
index 282c42a5bec..bf71e4a2827 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
@@ -67,7 +67,6 @@ grcinq-43:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
index aa36b9a08a6..62d0f234db7 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
@@ -67,7 +67,6 @@ grcinq-44:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
index 27aef9500e7..831be1af458 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
@@ -67,7 +67,6 @@ grcinq-45:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
index 2128f9adddb..241fe6c2726 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
@@ -67,7 +67,6 @@ grcinq-46:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
index a7bd3b32fb1..8b38893cbd8 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
@@ -67,7 +67,6 @@ grcinq-47:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.yaml
index 8c404b098eb..bba927536af 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.yaml
@@ -67,7 +67,6 @@ grcinq-48:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
index 491786d6c77..66c0722c620 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
@@ -67,7 +67,6 @@ grcinq-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
index 61389efe034..09883186126 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
@@ -67,7 +67,6 @@ grcinq-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
index 3ad47219b1f..20fbe4d3691 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
@@ -67,7 +67,6 @@ grcinq-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
index a00e3547409..7ed541ef977 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
@@ -67,7 +67,6 @@ grcinq-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
index 0c9016197b6..3029d946a99 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
@@ -67,7 +67,6 @@ grcinq-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2000000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nancy/clusters/grele/grele.yaml b/input/grid5000/sites/nancy/clusters/grele/grele.yaml
index 09c6f13f690..d11945d3636 100644
--- a/input/grid5000/sites/nancy/clusters/grele/grele.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/grele.yaml
@@ -21,6 +21,7 @@ nodes:
         available: false
     processor:
       microarchitecture: Broadwell
+      clock_speed: 2200000000
     software:
       standard-environment: debian10-x64-std
     network_adapters:
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
index 5aa1636e9f1..a696171eb4b 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
@@ -102,7 +102,6 @@ grele-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 31457280
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
index 1a78ba33ee8..1547db01aa9 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
@@ -102,7 +102,6 @@ grele-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 31457280
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
index c7edeef78e8..17c2277e6cc 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
@@ -102,7 +102,6 @@ grele-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 31457280
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
index 44259456658..02133e8dc8e 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
@@ -102,7 +102,6 @@ grele-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 31457280
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
index 58e197067ec..e4ac3ada558 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
@@ -102,7 +102,6 @@ grele-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 31457280
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
index a3e4b5abafb..68b5b85c979 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
@@ -102,7 +102,6 @@ grele-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 31457280
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
index bfb7bd0cfb1..afbc9b173d9 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
@@ -102,7 +102,6 @@ grele-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 31457280
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
index ff47a8d8903..7a69a855b39 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
@@ -102,7 +102,6 @@ grele-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 31457280
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
index 4ff91df9745..85002539927 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
@@ -102,7 +102,6 @@ grele-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 31457280
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
index e1e536964b3..737be1e52cd 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
@@ -102,7 +102,6 @@ grele-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 31457280
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
index 6810954d101..d25475ee2e0 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
@@ -102,7 +102,6 @@ grele-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 31457280
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
index 7a41bf3f017..61accc721b8 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
@@ -102,7 +102,6 @@ grele-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 31457280
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
index 4114e6e013a..d63330bed27 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
@@ -102,7 +102,6 @@ grele-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 31457280
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
index fa04db5eea1..2be95775012 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
@@ -102,7 +102,6 @@ grele-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 31457280
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml b/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml
index 380db585c69..5a6a3d42ec2 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml
@@ -21,6 +21,7 @@ nodes:
         available: false
     processor:
       microarchitecture: Haswell
+      clock_speed: 1600000000
     software:
       standard-environment: debian10-x64-std
     storage_devices:
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
index fc94c4b8e42..ce8dbbd34d9 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
@@ -102,7 +102,6 @@ grimani-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 1600000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
index 0c5032dd98c..769bb20b002 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
@@ -102,7 +102,6 @@ grimani-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 1600000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
index 620b2d1a73f..01d7c560a7f 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
@@ -102,7 +102,6 @@ grimani-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 1600000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
index c9824e8d6a0..767c9de5785 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
@@ -102,7 +102,6 @@ grimani-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 1600000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
index ccd8e380ed0..19e60e66a23 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
@@ -102,7 +102,6 @@ grimani-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 1600000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
index 13402b70dc4..66b4c3c18f7 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
@@ -102,7 +102,6 @@ grimani-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    clock_speed: 1600000000
     ht_capable: false
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
index 6549ac84ae2..57a6762ffde 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
@@ -12,6 +12,7 @@ nodes:
   grimoire-[1-8]:
     processor:
       microarchitecture: Haswell
+      clock_speed: 2400000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
index 91ec0ff3b08..be95b787123 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
@@ -106,7 +106,6 @@ grimoire-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
index ce4363bb124..41f2316d58d 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
@@ -106,7 +106,6 @@ grimoire-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
index 428ba9f0e95..1082f868112 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
@@ -106,7 +106,6 @@ grimoire-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
index 57d6b0df06a..7c4e727ea54 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
@@ -106,7 +106,6 @@ grimoire-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
index e72f7a5236a..ab5eba03d4e 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
@@ -106,7 +106,6 @@ grimoire-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
index 562e3912b64..dc73cf58728 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
@@ -106,7 +106,6 @@ grimoire-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
index f6c93209549..bdce5a15cfc 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
@@ -106,7 +106,6 @@ grimoire-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
index 69df8956fb9..c231d60dd9d 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
@@ -106,7 +106,6 @@ grimoire-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
index 3aaed371727..76fa6261403 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
@@ -13,6 +13,7 @@ nodes:
   grisou-[1-51]:
     processor:
       microarchitecture: Haswell
+      clock_speed: 2400000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
index 07504dcf675..5622eccc670 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
@@ -95,7 +95,6 @@ grisou-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
index af4f5183b97..46ed401755e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
@@ -95,7 +95,6 @@ grisou-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
index 77ebafe184b..d7749f3d64f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
@@ -95,7 +95,6 @@ grisou-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
index b61bdf2d13d..0aff4590307 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
@@ -95,7 +95,6 @@ grisou-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
index 4fb96f22763..6c3b5726ef3 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
@@ -95,7 +95,6 @@ grisou-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
index 9e4c02eea8e..70edce12c9f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
@@ -95,7 +95,6 @@ grisou-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
index 6e9e18ab909..81e18128b0c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
@@ -95,7 +95,6 @@ grisou-15:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
index 58821fa84ae..4d21af11185 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
@@ -95,7 +95,6 @@ grisou-16:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
index 8c7a52259ae..c2fa24aff67 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
@@ -95,7 +95,6 @@ grisou-17:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
index 636a4df4cf8..fcd8c966adb 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
@@ -95,7 +95,6 @@ grisou-18:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
index 6913353e3da..4604a8e5156 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
@@ -95,7 +95,6 @@ grisou-19:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
index 4d416264d1f..e06058d1785 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
@@ -95,7 +95,6 @@ grisou-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
index d0e01d69ddd..55b4d055eec 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
@@ -95,7 +95,6 @@ grisou-20:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
index f96cc95b65f..6f142c6568a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
@@ -95,7 +95,6 @@ grisou-21:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
index e72e2663898..9954448be60 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
@@ -95,7 +95,6 @@ grisou-22:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
index 4f7d92a46bb..4970546f8ec 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
@@ -95,7 +95,6 @@ grisou-23:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
index 0ac6d2ce6e9..e411b5fc720 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
@@ -95,7 +95,6 @@ grisou-24:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
index 6dead130997..00ab0ce1287 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
@@ -95,7 +95,6 @@ grisou-25:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
index 93f529c1396..1364f77aa28 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
@@ -95,7 +95,6 @@ grisou-26:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
index c07d6b0f756..9f32aee01ef 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
@@ -95,7 +95,6 @@ grisou-27:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
index 624111d8057..4c0ea468c8f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
@@ -95,7 +95,6 @@ grisou-28:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
index b2b623b0a4f..9fd48d36834 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
@@ -95,7 +95,6 @@ grisou-29:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
index 210dbe60650..8859a12547d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
@@ -95,7 +95,6 @@ grisou-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
index 4b3624fbee1..6a0beb9d877 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
@@ -95,7 +95,6 @@ grisou-30:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
index 0860e19f8c8..83da72d4f3a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
@@ -95,7 +95,6 @@ grisou-31:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
index 199998ead87..91d7943850a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
@@ -95,7 +95,6 @@ grisou-32:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
index 0ebe2e58672..0a605d55fca 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
@@ -95,7 +95,6 @@ grisou-33:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
index c1379b8c5f7..4845bca4ab1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
@@ -95,7 +95,6 @@ grisou-34:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
index 38747eb12bc..e381731b1f8 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
@@ -95,7 +95,6 @@ grisou-35:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
index 74f8f0451be..2d7bc2c23fd 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
@@ -95,7 +95,6 @@ grisou-36:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
index 3ff97044abc..65e9422141f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
@@ -95,7 +95,6 @@ grisou-37:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
index a7790df549c..ce080c93ae6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
@@ -95,7 +95,6 @@ grisou-38:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
index 77f4e309f98..20d6dedefb4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
@@ -95,7 +95,6 @@ grisou-39:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
index c272a0b3c31..c7adbf1f85b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
@@ -95,7 +95,6 @@ grisou-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
index c7534031825..1a75726d391 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
@@ -95,7 +95,6 @@ grisou-40:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
index d865d6ade70..0dfc8dc4b0f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
@@ -95,7 +95,6 @@ grisou-41:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
index 864621fdc71..9486cd1a73a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
@@ -95,7 +95,6 @@ grisou-42:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
index 787cf048e49..0a746ffc26f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
@@ -95,7 +95,6 @@ grisou-43:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
index 79aefc338d9..9e6d3492b0a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
@@ -95,7 +95,6 @@ grisou-44:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
index 6ff27fffaed..488470e5d83 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
@@ -95,7 +95,6 @@ grisou-45:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
index f81abe0a54d..c5ed60a6b06 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
@@ -95,7 +95,6 @@ grisou-46:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
index f8cef317c76..afe262379c2 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
@@ -95,7 +95,6 @@ grisou-47:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
index 33205edb282..13a106e2bcd 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
@@ -95,7 +95,6 @@ grisou-48:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
index 3fcbe9a6f3d..4a2ba7922fc 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
@@ -94,7 +94,6 @@ grisou-49:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
index 436cdc11bc3..df9a19ecb16 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
@@ -95,7 +95,6 @@ grisou-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
index 26b5b186cd6..98b857e273f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
@@ -106,7 +106,6 @@ grisou-50:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
index 0721d9ecf1a..a656893355e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
@@ -106,7 +106,6 @@ grisou-51:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
index 86c69b769ca..2f3089476c6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
@@ -95,7 +95,6 @@ grisou-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
index fe8e1ac81c9..698763956e3 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
@@ -95,7 +95,6 @@ grisou-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
index 81e4143f901..27bab7a05e3 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
@@ -95,7 +95,6 @@ grisou-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
index 7b15fbac8e7..b4db394a537 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
@@ -95,7 +95,6 @@ grisou-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/nancy/clusters/gros/gros.yaml b/input/grid5000/sites/nancy/clusters/gros/gros.yaml
index de36c4be563..d4fbaee30e8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/gros.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/gros.yaml
@@ -9,6 +9,7 @@ nodes:
   gros-[1-124]:
     processor:
       microarchitecture: Cascade Lake-SP
+      clock_speed: 2200000000
     software:
       standard-environment: debian10-x64-std
     supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
index 83d4d790a5d..ee0fba5586d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
@@ -56,7 +56,6 @@ gros-1:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
index f309687e1ab..b34ec394f80 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
@@ -56,7 +56,6 @@ gros-10:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
index 21984c340ee..08082e79005 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
@@ -56,7 +56,6 @@ gros-100:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
index 92670dcbc75..0d630bd2012 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
@@ -56,7 +56,6 @@ gros-101:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
index 468d894ce05..80c1f4d2d70 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
@@ -56,7 +56,6 @@ gros-102:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
index adf46d351ac..e101408e9e0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
@@ -56,7 +56,6 @@ gros-103:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
index a553cac89db..7c4b697707a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
@@ -56,7 +56,6 @@ gros-104:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
index bc3a19ae576..9e73c7f0057 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
@@ -56,7 +56,6 @@ gros-105:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
index 8065ecfc836..e96aa2a0992 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
@@ -56,7 +56,6 @@ gros-106:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
index 0eb45d3b51d..846fbad925c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
@@ -56,7 +56,6 @@ gros-107:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
index 1b1add65443..312ac952558 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
@@ -56,7 +56,6 @@ gros-108:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
index 99cd5ba3f0f..0830daa86b5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
@@ -56,7 +56,6 @@ gros-109:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
index a2e7dd1e642..800a251b095 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
@@ -56,7 +56,6 @@ gros-11:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
index fc1d511e862..32416ecf637 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
@@ -56,7 +56,6 @@ gros-110:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
index 24151bb629c..1e6f908d58c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
@@ -56,7 +56,6 @@ gros-111:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
index d43f33c9a99..b713e4fa55d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
@@ -56,7 +56,6 @@ gros-112:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
index df231f7f190..f9350f6bc66 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
@@ -56,7 +56,6 @@ gros-113:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
index 5011fd79661..1cab8f4cec0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
@@ -56,7 +56,6 @@ gros-114:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
index 399b9239823..c752b45e44a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
@@ -56,7 +56,6 @@ gros-115:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
index 22590c9f45a..dee46879689 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
@@ -56,7 +56,6 @@ gros-116:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
index 85a33d5e1a8..c2aabaf4be2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
@@ -56,7 +56,6 @@ gros-117:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
index 3ea5288155b..3cb4b05fe46 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
@@ -56,7 +56,6 @@ gros-118:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
index 50df03a1a48..c48307a84ed 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
@@ -56,7 +56,6 @@ gros-119:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
index a67f8a97020..84c6bcbf70d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
@@ -56,7 +56,6 @@ gros-12:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
index 5d9ebb0bd03..d4ba6369e85 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
@@ -56,7 +56,6 @@ gros-120:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
index 2b739dbac26..0365614e8b4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
@@ -56,7 +56,6 @@ gros-121:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
index 78b231829aa..7ef0228fcd1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
@@ -56,7 +56,6 @@ gros-122:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
index bd47cfa30e0..841075985b5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
@@ -56,7 +56,6 @@ gros-123:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
index b60aaa31d24..3a6ef7c2831 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
@@ -56,7 +56,6 @@ gros-124:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
index 78e3f6221de..53f3f7ac71a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
@@ -56,7 +56,6 @@ gros-13:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
index 99fa95256bc..bebbcdb3e00 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
@@ -56,7 +56,6 @@ gros-14:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
index d4acb6c1615..1ee9149339b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
@@ -56,7 +56,6 @@ gros-15:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
index 90a261193e8..3b0d2c954b6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
@@ -56,7 +56,6 @@ gros-16:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
index 64466cc2296..e58d737a011 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
@@ -56,7 +56,6 @@ gros-17:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
index 98a79a6ce25..b2331262fa8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
@@ -56,7 +56,6 @@ gros-18:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
index 4665c17a047..cf04b91cf51 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
@@ -56,7 +56,6 @@ gros-19:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
index 17f127f5900..63dfc313e97 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
@@ -56,7 +56,6 @@ gros-2:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
index b0d0b251d95..019089a4c0c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
@@ -56,7 +56,6 @@ gros-20:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
index e303558edef..4c5a29d4b33 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
@@ -56,7 +56,6 @@ gros-21:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
index 4668d841de3..040bfea9c55 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
@@ -56,7 +56,6 @@ gros-22:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
index 097cdb6d22f..9ea050f2424 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
@@ -56,7 +56,6 @@ gros-23:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
index 6f8d496f439..4fe654b9d19 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
@@ -56,7 +56,6 @@ gros-24:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
index 9e285ca3c8a..d227ce421a0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
@@ -56,7 +56,6 @@ gros-25:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
index c0fcd09435d..dd1ddd51c62 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
@@ -56,7 +56,6 @@ gros-26:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
index fe8dfd6cf8f..a8a11a6a644 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
@@ -56,7 +56,6 @@ gros-27:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
index 1b946b12462..bc60db42430 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
@@ -56,7 +56,6 @@ gros-28:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
index b25a25a98aa..4a4e78db652 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
@@ -56,7 +56,6 @@ gros-29:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
index e20a1685c9d..8bed6dff844 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
@@ -56,7 +56,6 @@ gros-3:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
index fe059e7ff88..f46fbbfe48c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
@@ -56,7 +56,6 @@ gros-30:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
index afaf9dc10f7..f7d9e2d8e51 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
@@ -56,7 +56,6 @@ gros-31:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
index 5eeff52e1e4..b72bd189c66 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
@@ -56,7 +56,6 @@ gros-32:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
index ce43398113c..0036d66d2dd 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
@@ -56,7 +56,6 @@ gros-33:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
index cd5da80694e..18f92cb3bb7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
@@ -56,7 +56,6 @@ gros-34:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
index 451e34f8c7d..d2bf2ef7d50 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
@@ -56,7 +56,6 @@ gros-35:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
index 8022aef2eb5..0a36cab62d3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
@@ -56,7 +56,6 @@ gros-36:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
index 2e1bbe686c7..a93ce985972 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
@@ -56,7 +56,6 @@ gros-37:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
index 259e852e108..1a4ded43859 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
@@ -56,7 +56,6 @@ gros-38:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
index 278a75a4cf4..e42af2003d8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
@@ -56,7 +56,6 @@ gros-39:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
index 911a135d533..3c612d26fec 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
@@ -56,7 +56,6 @@ gros-4:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
index 7038df60b8c..f27e6f71352 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
@@ -56,7 +56,6 @@ gros-40:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
index bbaebe0ef2b..073f841672a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
@@ -56,7 +56,6 @@ gros-41:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
index ca269de71d8..761ebd53a4f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
@@ -56,7 +56,6 @@ gros-42:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
index 0c722533206..b05f6e47e76 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
@@ -56,7 +56,6 @@ gros-43:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
index 30bded36d37..0189873aedf 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
@@ -56,7 +56,6 @@ gros-44:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
index 108f96c1826..7c5395ef042 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
@@ -56,7 +56,6 @@ gros-45:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
index bfe851bec59..caff2014b13 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
@@ -56,7 +56,6 @@ gros-46:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
index 3833f4df396..1c445cc9b96 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
@@ -56,7 +56,6 @@ gros-47:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
index b04886e1bc1..942f3fd2a98 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
@@ -56,7 +56,6 @@ gros-48:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
index 61e5ac7fcaa..1b96fedcf71 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
@@ -56,7 +56,6 @@ gros-49:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
index b141cd2c88d..5ff14ffd68b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
@@ -56,7 +56,6 @@ gros-5:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
index 0df481277b6..c12bdac99ed 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
@@ -56,7 +56,6 @@ gros-50:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
index c91386746ef..ee935ec814b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
@@ -56,7 +56,6 @@ gros-51:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
index e7abf8275cf..0ae09986017 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
@@ -56,7 +56,6 @@ gros-52:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
index c799c392739..7a46b96b993 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
@@ -56,7 +56,6 @@ gros-53:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
index fdccd16ef4b..67366ac0d81 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
@@ -56,7 +56,6 @@ gros-54:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
index a5336951f26..fa2b9977f0f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
@@ -56,7 +56,6 @@ gros-55:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
index a3521d0f715..8f5beeb1ae7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
@@ -56,7 +56,6 @@ gros-56:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
index a0b78893664..1592e7d8e28 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
@@ -56,7 +56,6 @@ gros-57:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
index cba9c7d5d7d..5c643de829d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
@@ -56,7 +56,6 @@ gros-58:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
index 13f4610acd3..a48152f3301 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
@@ -56,7 +56,6 @@ gros-59:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
index 367c681e72e..04c638608f1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
@@ -56,7 +56,6 @@ gros-6:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
index 2a4b2a2f22a..882b9e17801 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
@@ -56,7 +56,6 @@ gros-60:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
index 9a548cf3790..2200c291002 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
@@ -56,7 +56,6 @@ gros-61:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
index 55d19d945a8..cce67be1634 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
@@ -56,7 +56,6 @@ gros-62:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
index 8aa300d33b8..71809ec087d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
@@ -56,7 +56,6 @@ gros-63:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
index 3ff38ff13a8..9b5e8232459 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
@@ -56,7 +56,6 @@ gros-64:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
index fd045ff55cb..e25fbf45e95 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
@@ -56,7 +56,6 @@ gros-65:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
index 698a68b346a..cb5f3414e44 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
@@ -56,7 +56,6 @@ gros-66:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
index b6105798b7b..537e8a38186 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
@@ -56,7 +56,6 @@ gros-67:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
index e34de3927be..6fd3db33ef8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
@@ -56,7 +56,6 @@ gros-68:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
index 57f6eed735c..34b511e86b6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
@@ -56,7 +56,6 @@ gros-69:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
index ec16feac135..a6ed0243ee0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
@@ -56,7 +56,6 @@ gros-7:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
index f8b6c33040f..60bd04f07ea 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
@@ -56,7 +56,6 @@ gros-70:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
index 5b241caa5d6..e408a31c808 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
@@ -56,7 +56,6 @@ gros-71:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
index a1cd7f6380b..5331a2b1cc5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
@@ -56,7 +56,6 @@ gros-72:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
index f82dcb71fa4..e9242c3eefa 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
@@ -56,7 +56,6 @@ gros-73:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
index a66e15e5e6d..36bc456e9b2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
@@ -56,7 +56,6 @@ gros-74:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
index eb904f2f96a..bb281546625 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
@@ -56,7 +56,6 @@ gros-75:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
index 5e0187a7c09..fdbe802a0b3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
@@ -56,7 +56,6 @@ gros-76:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
index 9f7497086a1..86fcd6a729d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
@@ -56,7 +56,6 @@ gros-77:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
index 7c03c2c21cd..8da74ee8054 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
@@ -56,7 +56,6 @@ gros-78:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
index 38f5a047e34..dac99da57a8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
@@ -56,7 +56,6 @@ gros-79:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
index d4199bafde1..07fc71e9290 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
@@ -56,7 +56,6 @@ gros-8:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
index a27bda2f608..f8124fab40f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
@@ -56,7 +56,6 @@ gros-80:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
index 58e98132be2..632e286650a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
@@ -56,7 +56,6 @@ gros-81:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
index 40b08d10d20..e643675d59d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
@@ -56,7 +56,6 @@ gros-82:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
index de576263675..302a989371b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
@@ -56,7 +56,6 @@ gros-83:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
index 2163616e606..c4d72ba1cde 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
@@ -56,7 +56,6 @@ gros-84:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
index 9d4ae27fc08..8e4f2b702f9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
@@ -56,7 +56,6 @@ gros-85:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
index ffb5da15bc6..89363ce9840 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
@@ -56,7 +56,6 @@ gros-86:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
index e758b3ade50..1de3cb46e97 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
@@ -56,7 +56,6 @@ gros-87:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
index 03ce5ffa00b..e4205f8ab61 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
@@ -56,7 +56,6 @@ gros-88:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
index 4465387bc27..f3f2fcf0724 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
@@ -56,7 +56,6 @@ gros-89:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
index ed75dbb08f7..9c0b8cf9c79 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
@@ -56,7 +56,6 @@ gros-9:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
index 56c9081813d..24872694e09 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
@@ -56,7 +56,6 @@ gros-90:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
index 52a993bf472..d4c849c0284 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
@@ -56,7 +56,6 @@ gros-91:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
index 80ae92492fd..d940cd98e3c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
@@ -56,7 +56,6 @@ gros-92:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
index e712772c470..2efeedd968b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
@@ -56,7 +56,6 @@ gros-93:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
index 10ad6ad8602..6a0526235ee 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
@@ -56,7 +56,6 @@ gros-94:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
index a3f6ea4ee53..d0349cac81c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
@@ -56,7 +56,6 @@ gros-95:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
index d1b1a79518d..1d99e78e65d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
@@ -56,7 +56,6 @@ gros-96:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
index 0700a842f10..58b2837e7a3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
@@ -56,7 +56,6 @@ gros-97:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
index 5cadf49fbf6..59ccb4d6356 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
@@ -56,7 +56,6 @@ gros-98:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
index 1a3c80535e7..effc9f4ceea 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
@@ -56,7 +56,6 @@ gros-99:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 25952256
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x500002c'
diff --git a/input/grid5000/sites/nancy/clusters/grue/grue.yaml b/input/grid5000/sites/nancy/clusters/grue/grue.yaml
index 5e1c77c2eb1..2ed2134d7fb 100644
--- a/input/grid5000/sites/nancy/clusters/grue/grue.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/grue.yaml
@@ -14,6 +14,7 @@
       node_flops: 430760000000
      processor:
        microarchitecture: Zen
+       clock_speed: 2400000000
      software:
        standard-environment: debian10-x64-std
      network_adapters:
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
index a8e3d001998..5995e96d619 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
@@ -106,7 +106,6 @@ grue-1:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 8388608
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x8001250'
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
index 91a41e58c16..1342cbcfe52 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
@@ -106,7 +106,6 @@ grue-2:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 8388608
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x8001250'
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
index a428c2cd194..7b7f0d93085 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
@@ -106,7 +106,6 @@ grue-3:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 8388608
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x8001250'
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
index cd0aa701aa4..14a4111d3dc 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
@@ -106,7 +106,6 @@ grue-4:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 8388608
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x8001250'
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
index ebef391bcaf..ae78125d475 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
@@ -106,7 +106,6 @@ grue-5:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 8388608
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x8001250'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml b/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml
index acad54c063f..026db2881e5 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml
@@ -10,6 +10,7 @@ nodes:
   grvingt-[1-64]:
     processor:
       microarchitecture: Skylake
+      clock_speed: 2100000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
index d30161243c0..97ec2f5389c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
@@ -67,7 +67,6 @@ grvingt-1:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
index 7904943233e..b22796b2716 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
@@ -67,7 +67,6 @@ grvingt-10:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
index 4e8e9a250b4..48cec81aa0b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
@@ -67,7 +67,6 @@ grvingt-11:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
index ebce9f56aa4..e31d8cdf692 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
@@ -67,7 +67,6 @@ grvingt-12:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
index 997bd75d956..ba580d34013 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
@@ -67,7 +67,6 @@ grvingt-13:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
index 1b5f856ac78..812c6a80e30 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
@@ -67,7 +67,6 @@ grvingt-14:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
index 40f534279fb..12c78cf520a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
@@ -67,7 +67,6 @@ grvingt-15:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
index 5b6a49885e7..ea2ea5af667 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
@@ -67,7 +67,6 @@ grvingt-16:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
index 8f2370d9269..586923b7df7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
@@ -67,7 +67,6 @@ grvingt-17:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
index 7713c94ee08..971e5f090b2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
@@ -67,7 +67,6 @@ grvingt-18:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
index d3c39a9406f..80217eefbb9 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
@@ -67,7 +67,6 @@ grvingt-19:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
index cac6a874b83..4f831eea490 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
@@ -67,7 +67,6 @@ grvingt-2:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
index e2d5ff7f90e..0d9d920ac16 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
@@ -67,7 +67,6 @@ grvingt-20:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
index 4cd47b65801..adbad8aa944 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
@@ -67,7 +67,6 @@ grvingt-21:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
index 5a04eb1544b..fff9f9a14f7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
@@ -67,7 +67,6 @@ grvingt-22:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
index 4ef15bb0441..11bd498e6c3 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
@@ -67,7 +67,6 @@ grvingt-23:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
index b43ce332508..71d34d0ae4b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
@@ -67,7 +67,6 @@ grvingt-24:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
index df9afdc7ed3..5314d782654 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
@@ -67,7 +67,6 @@ grvingt-25:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
index 1edd6c700b0..bd148a6b25a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
@@ -67,7 +67,6 @@ grvingt-26:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
index fd3f83ba075..fde4699e46d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
@@ -67,7 +67,6 @@ grvingt-27:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
index a5c9d9fad2a..8368ff23a90 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
@@ -67,7 +67,6 @@ grvingt-28:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
index 48a0f20d6fb..64b091f208f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
@@ -67,7 +67,6 @@ grvingt-29:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
index cf45dc4d74d..0a5986f5d8e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
@@ -67,7 +67,6 @@ grvingt-3:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
index 8e2941df88f..263492923ff 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
@@ -67,7 +67,6 @@ grvingt-30:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
index 08299abd981..fc58e62a145 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
@@ -67,7 +67,6 @@ grvingt-31:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
index 9cf160e2576..0ceffb2a25e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
@@ -67,7 +67,6 @@ grvingt-32:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
index 6c4409778b7..642f9731f7b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
@@ -67,7 +67,6 @@ grvingt-33:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
index b1b61e28817..297275959c6 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
@@ -67,7 +67,6 @@ grvingt-34:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
index 911f557a49d..a87583c1aad 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
@@ -67,7 +67,6 @@ grvingt-35:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
index 00f52eff5dc..da88a4851b3 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
@@ -67,7 +67,6 @@ grvingt-36:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
index c6c407c36ca..db99c98dcb6 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
@@ -67,7 +67,6 @@ grvingt-37:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
index 86ffdc94943..681745a2f6e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
@@ -67,7 +67,6 @@ grvingt-38:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
index c371624d1eb..cfc761c7689 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
@@ -67,7 +67,6 @@ grvingt-39:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
index 776e4e1eff6..b674f064af4 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
@@ -67,7 +67,6 @@ grvingt-4:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
index d4f29edc5a2..d56fd105d08 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
@@ -67,7 +67,6 @@ grvingt-40:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
index 9666f4f0d18..c9918ff6c73 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
@@ -67,7 +67,6 @@ grvingt-41:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
index 060d95dabd3..d0d472dac34 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
@@ -67,7 +67,6 @@ grvingt-42:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
index 5eec0d5c51d..d55d97a3a31 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
@@ -67,7 +67,6 @@ grvingt-43:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
index b3b093469b0..7db605f5866 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
@@ -67,7 +67,6 @@ grvingt-44:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
index 982978346c3..2c9eff9c351 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
@@ -67,7 +67,6 @@ grvingt-45:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
index 5d00df63c11..043cb849fce 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
@@ -67,7 +67,6 @@ grvingt-46:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
index 4b520fac1ca..11e88623a23 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
@@ -67,7 +67,6 @@ grvingt-47:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
index b16712c6cd9..ba692b33c35 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
@@ -67,7 +67,6 @@ grvingt-48:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
index e7680e9c0cc..bb88d0c869b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
@@ -67,7 +67,6 @@ grvingt-49:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
index db559c85d67..1fa7a4cfdad 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
@@ -67,7 +67,6 @@ grvingt-5:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
index 15526ddd633..02cd22973b3 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
@@ -67,7 +67,6 @@ grvingt-50:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
index b635b85d5e5..14419a1d2ce 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
@@ -67,7 +67,6 @@ grvingt-51:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
index 2a46a8a9cde..c056e15eba4 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
@@ -67,7 +67,6 @@ grvingt-52:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
index 16c687a9263..17b68cdd758 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
@@ -67,7 +67,6 @@ grvingt-53:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
index 2345166e9a3..c29a0987dce 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
@@ -67,7 +67,6 @@ grvingt-54:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
index 81715db2941..74aafc9af8b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
@@ -67,7 +67,6 @@ grvingt-55:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
index 8e596298840..3784a22feb9 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
@@ -67,7 +67,6 @@ grvingt-56:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
index 7a690603ad0..021df50fc97 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
@@ -67,7 +67,6 @@ grvingt-57:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
index 1d966b5aced..8f9e0a4f4b6 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
@@ -67,7 +67,6 @@ grvingt-58:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
index 464a753a333..53a1bb38fa5 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
@@ -67,7 +67,6 @@ grvingt-59:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
index 21cb0c0452c..1e4f9828d55 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
@@ -67,7 +67,6 @@ grvingt-6:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
index 72f17f757ec..ea69d8fc1e6 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
@@ -67,7 +67,6 @@ grvingt-60:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
index 79dd73a7177..2a19e0ff6cd 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
@@ -67,7 +67,6 @@ grvingt-61:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
index d91bd926b97..ccca1fe30e2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
@@ -67,7 +67,6 @@ grvingt-62:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
index 3693514caaa..e6ef4722e63 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
@@ -67,7 +67,6 @@ grvingt-63:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
index 2dde2544a23..41a23043062 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
@@ -67,7 +67,6 @@ grvingt-64:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
index 312fc89bc1b..17c9750f4c2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
@@ -67,7 +67,6 @@ grvingt-7:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
index 443d9677209..5fc5821e7e1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
@@ -67,7 +67,6 @@ grvingt-8:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
index c4075a8e053..356201927c1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
@@ -67,7 +67,6 @@ grvingt-9:
     cache_l1i: 32768
     cache_l2: 1048576
     cache_l3: 23068672
-    clock_speed: 2100000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x2000065'
diff --git a/input/grid5000/sites/nantes/clusters/econome/econome.yaml b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
index 0caf0505540..53975027fb9 100644
--- a/input/grid5000/sites/nantes/clusters/econome/econome.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
@@ -10,6 +10,7 @@ nodes:
   econome-[1-22]:
     processor:
       microarchitecture: Sandy Bridge
+      clock_speed: 2200000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
index 134a87cb7b4..dbd9944298e 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
@@ -73,7 +73,6 @@ econome-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
index bc22af552af..e4a658934f7 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
@@ -73,7 +73,6 @@ econome-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
index 440d877f7ea..86394c444d6 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
@@ -73,7 +73,6 @@ econome-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
index 7b438cff2b0..86d5f3b3d7c 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
@@ -73,7 +73,6 @@ econome-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
index 79955404051..8621aaf1c30 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
@@ -73,7 +73,6 @@ econome-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
index 234d96a16f5..69c86f09942 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
@@ -73,7 +73,6 @@ econome-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
index 13e9ddb8db2..2816fe64236 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
@@ -74,7 +74,6 @@ econome-15:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
index 937898e0e23..ed073bfdf8a 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
@@ -73,7 +73,6 @@ econome-16:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
index dd5db2a409c..c05ee9550f3 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
@@ -73,7 +73,6 @@ econome-17:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
index 68cb92eb737..19b04bc38f5 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
@@ -73,7 +73,6 @@ econome-18:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
index 744e4574ba9..573bb4bbf07 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
@@ -73,7 +73,6 @@ econome-19:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
index 249bd86f308..03e3ed011cb 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
@@ -73,7 +73,6 @@ econome-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
index 377aafea17b..a1c971dbcac 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
@@ -73,7 +73,6 @@ econome-20:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
index 0581dcf3a03..11e26775f2d 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
@@ -73,7 +73,6 @@ econome-21:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
index c78f9ee31f1..2c91adb4d54 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
@@ -73,7 +73,6 @@ econome-22:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
index 8ae68fbebe8..5735973836e 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
@@ -73,7 +73,6 @@ econome-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
index 7741f8c9df9..8e92b3fafb9 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
@@ -73,7 +73,6 @@ econome-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
index b129b13355f..7094e334164 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
@@ -73,7 +73,6 @@ econome-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
index 05564771dae..7ba8575c087 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
@@ -73,7 +73,6 @@ econome-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
index 08abd9932ea..00c7dc2314d 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
@@ -73,7 +73,6 @@ econome-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
index 897aecae18a..84ae56fe04a 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
@@ -73,7 +73,6 @@ econome-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
index de907b06d1b..47a1ca242b1 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
@@ -73,7 +73,6 @@ econome-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x718'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml b/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
index aa366a912cb..0dd1087f90a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
@@ -11,6 +11,7 @@ nodes:
   ecotype-[1-48]:
     processor:
       microarchitecture: Broadwell
+      clock_speed: 1800000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
index 9de10b33505..2e4c96e854e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
@@ -74,7 +74,6 @@ ecotype-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
index 5787ca37b02..af6f1a6226a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
@@ -74,7 +74,6 @@ ecotype-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
index cc56d827126..9b4784e8c2a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
@@ -74,7 +74,6 @@ ecotype-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
index 66ae8db10af..2e3629d940b 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
@@ -74,7 +74,6 @@ ecotype-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
index be7394a7e23..c0c92a1be9e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
@@ -74,7 +74,6 @@ ecotype-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
index 1d96cb3b1ea..23ac5ceeffe 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
@@ -74,7 +74,6 @@ ecotype-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
index 93677d7cf0e..b362080c9c8 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
@@ -74,7 +74,6 @@ ecotype-15:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
index 211fc5b8209..6ee55c9d703 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
@@ -74,7 +74,6 @@ ecotype-16:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
index d3fc1d9e9d6..e44dfd844ca 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
@@ -74,7 +74,6 @@ ecotype-17:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
index f76c0a502f8..b7648ebce8c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
@@ -74,7 +74,6 @@ ecotype-18:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
index b30328f870e..dfa733e329a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
@@ -74,7 +74,6 @@ ecotype-19:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
index 30946662092..52fc06cef28 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
@@ -74,7 +74,6 @@ ecotype-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
index ec4c3c9e084..fdc7266bca0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
@@ -74,7 +74,6 @@ ecotype-20:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
index 0bdacce6262..61ba2f4b9bb 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
@@ -74,7 +74,6 @@ ecotype-21:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
index 457ef01c987..1fefa7e02c4 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
@@ -74,7 +74,6 @@ ecotype-22:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
index 7b3de2c152a..7d0208b6ef3 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
@@ -74,7 +74,6 @@ ecotype-23:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
index 9a5eec70334..dde040fe6a7 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
@@ -74,7 +74,6 @@ ecotype-24:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
index bdf799520d7..7ccca0eaccd 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
@@ -74,7 +74,6 @@ ecotype-25:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
index 7e75aa9b004..85a682322a8 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
@@ -74,7 +74,6 @@ ecotype-26:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
index 58e1cb12d8b..caae84a2557 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
@@ -74,7 +74,6 @@ ecotype-27:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
index e2e0587f1f3..c64654ecbfe 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
@@ -74,7 +74,6 @@ ecotype-28:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
index 39e09432031..bd2bc694a83 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
@@ -74,7 +74,6 @@ ecotype-29:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
index 8f88a2c02ed..5fec4e12d4d 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
@@ -74,7 +74,6 @@ ecotype-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
index 252ef722d08..4c7d9054cc6 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
@@ -74,7 +74,6 @@ ecotype-30:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
index c69ab62b07d..f2e55e696bd 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
@@ -74,7 +74,6 @@ ecotype-31:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
index a61c82494bf..012849f24ef 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
@@ -74,7 +74,6 @@ ecotype-32:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
index eb35ff8fe3e..a301a016685 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
@@ -74,7 +74,6 @@ ecotype-33:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
index d96310ad3d0..b808fb4ca27 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
@@ -74,7 +74,6 @@ ecotype-34:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
index 9c9662af408..2240f3cb941 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
@@ -74,7 +74,6 @@ ecotype-35:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
index 0bf135e07c8..5586d4adea1 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
@@ -74,7 +74,6 @@ ecotype-36:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
index a44315de80b..ce897ba363d 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
@@ -74,7 +74,6 @@ ecotype-37:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
index 1c056484633..f634c0ecfab 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
@@ -74,7 +74,6 @@ ecotype-38:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
index c4809ddee5f..8741e1d40ef 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
@@ -74,7 +74,6 @@ ecotype-39:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
index e49295362f7..d01ef8fe66f 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
@@ -74,7 +74,6 @@ ecotype-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
index b5357808ef7..105f2512955 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
@@ -74,7 +74,6 @@ ecotype-40:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
index 4bc0f50f340..e28ee4e95df 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
@@ -74,7 +74,6 @@ ecotype-41:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
index 57c7d958597..386fa89d3b2 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
@@ -74,7 +74,6 @@ ecotype-42:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
index 6e2b2843264..5f1d7850508 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
@@ -74,7 +74,6 @@ ecotype-43:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
index 1eb919111ab..755603c194e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
@@ -74,7 +74,6 @@ ecotype-44:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
index b698ed53bf5..4493902eedd 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
@@ -74,7 +74,6 @@ ecotype-45:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
index 8e0ccff1ab7..3d1ee4d9c3f 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
@@ -74,7 +74,6 @@ ecotype-46:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
index 8beb25f776e..41362ddf0b8 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
@@ -74,7 +74,6 @@ ecotype-47:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
index dc3094597ae..42c9874f243 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
@@ -74,7 +74,6 @@ ecotype-48:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
index 0c5485c820b..e68c73e5395 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
@@ -74,7 +74,6 @@ ecotype-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
index 66c18ce3bf7..f377451c939 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
@@ -74,7 +74,6 @@ ecotype-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
index 20068518016..e9d1d662255 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
@@ -74,7 +74,6 @@ ecotype-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
index 74cb3e608ae..6b588baa7d0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
@@ -74,7 +74,6 @@ ecotype-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
index 0a8941fa3e7..b115d242e06 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
@@ -74,7 +74,6 @@ ecotype-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 1800000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0xb000038'
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
index 9fafdd206b5..6925b7d7427 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
@@ -75,7 +75,6 @@ paranoia-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x42e'
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
index bc003f1d81a..f975cba76f0 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
@@ -75,7 +75,6 @@ paranoia-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x42e'
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
index cd2be94fa63..9a102fe7193 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
@@ -75,7 +75,6 @@ paranoia-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x42e'
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
index 864b3fc756b..6e42bf1f30e 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
@@ -75,7 +75,6 @@ paranoia-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x42e'
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
index 2ddab4d1fe5..02f3ed7913d 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
@@ -75,7 +75,6 @@ paranoia-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x42e'
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
index 7346decbe8c..0a655c8d286 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
@@ -75,7 +75,6 @@ paranoia-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x42e'
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
index cf65f83c39c..951996cea22 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
@@ -75,7 +75,6 @@ paranoia-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x42e'
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
index 66a835a1c21..bc2fe33b0be 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
@@ -75,7 +75,6 @@ paranoia-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 26214400
-    clock_speed: 2200000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x42e'
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
index 42c286d9fab..fd6d1749121 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
@@ -10,6 +10,7 @@ nodes:
   paranoia-[1-8]:
     processor:
       microarchitecture: Sandy Bridge
+      clock_speed: 2200000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
index 9b805227406..294f7b025b1 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
@@ -78,7 +78,6 @@ parapide-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
index bb3303b4137..d719467d275 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
@@ -78,7 +78,6 @@ parapide-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
index 74d950b10c3..b81e4f5b261 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
@@ -78,7 +78,6 @@ parapide-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
index cd79a976b6f..26fdfe263d8 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
@@ -78,7 +78,6 @@ parapide-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
index a385d39b46f..758f39ee0a3 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
@@ -78,7 +78,6 @@ parapide-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
index 78d75443f39..cf3003ff8d5 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
@@ -75,7 +75,6 @@ parapide-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
index ecf75794f1e..0161ce7a0ba 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
@@ -78,7 +78,6 @@ parapide-15:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
index ac244ff160b..acfd8813618 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
@@ -78,7 +78,6 @@ parapide-16:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
index 0da13c17780..4800cc0c9f2 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
@@ -73,7 +73,6 @@ parapide-17:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
index 799fc3f6715..284fcc02a5b 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
@@ -78,7 +78,6 @@ parapide-18:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
index 2bb24ef9945..6fa367aca4a 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
@@ -78,7 +78,6 @@ parapide-19:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
index 9e33d081741..da160aee8e3 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
@@ -78,7 +78,6 @@ parapide-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
index 88b6c586860..92568e3441d 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
@@ -78,7 +78,6 @@ parapide-20:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
index bef245e6f81..d9b07dfdb50 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
@@ -78,7 +78,6 @@ parapide-21:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
index a9acf3d0c65..33b0154ed3a 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
@@ -75,7 +75,6 @@ parapide-22:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
index 841fb5f3e55..9e8ab708495 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
@@ -68,7 +68,6 @@ parapide-23:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
index 92e4b287dd0..0634af6f83c 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
@@ -78,7 +78,6 @@ parapide-24:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
index 8a3f85c1535..3770ca2169f 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
@@ -78,7 +78,6 @@ parapide-25:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
index 72485f408fb..9796921ff96 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
@@ -78,7 +78,6 @@ parapide-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
index 6dc6ca826cb..46fc6a78313 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
@@ -78,7 +78,6 @@ parapide-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
index eb3ad9d3ecb..d23525ccedb 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
@@ -78,7 +78,6 @@ parapide-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
index 2010c60c29e..05d81eb08ec 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
@@ -78,7 +78,6 @@ parapide-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
index c0dfa359ea4..f483b55c370 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
@@ -78,7 +78,6 @@ parapide-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
index f44e86bccb5..2e98bfe3b88 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
@@ -78,7 +78,6 @@ parapide-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
index d4b90f83f67..3b9d80e3e6d 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
@@ -78,7 +78,6 @@ parapide-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
index a73acfb30ff..be98a1acf6d 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
@@ -26,6 +26,7 @@ nodes:
               ambient: /MB/T_AMB  
     processor:
       microarchitecture: Nehalem
+      clock_speed: 2950000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
index ab6cbb205e1..805202066f2 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
@@ -97,7 +97,6 @@ parapluie-1:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
index 6ba633a517a..f6ba782fbf7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
@@ -90,7 +90,6 @@ parapluie-10:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
index b32cc865077..d47ef4a3cc2 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
@@ -97,7 +97,6 @@ parapluie-11:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
index 941dc64c0dd..111a2d18731 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
@@ -97,7 +97,6 @@ parapluie-12:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
index c7dc21d7683..60e3fb7cf01 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
@@ -97,7 +97,6 @@ parapluie-13:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
index 0e86c252c6d..dfa846b41d1 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
@@ -90,7 +90,6 @@ parapluie-14:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
index cd2c6b36c9d..2d801778d96 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
@@ -97,7 +97,6 @@ parapluie-15:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
index 07076766276..91c6762489a 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
@@ -97,7 +97,6 @@ parapluie-16:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
index 0fbb40c7d07..9eb7b61e463 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
@@ -90,7 +90,6 @@ parapluie-17:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
index ceab6c22f8e..42997aae855 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
@@ -90,7 +90,6 @@ parapluie-18:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
index 0dff3ba02be..7a1ff101b2b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
@@ -97,7 +97,6 @@ parapluie-19:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
index c2cf5d821ae..9e6eebf8088 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
@@ -97,7 +97,6 @@ parapluie-2:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
index 551ec1b0a0e..7c8c7929c6d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
@@ -97,7 +97,6 @@ parapluie-20:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
index 0214eeee207..487f0fc7e77 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
@@ -97,7 +97,6 @@ parapluie-21:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
index 582941c4e2e..9f070cd75eb 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
@@ -97,7 +97,6 @@ parapluie-22:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
index c3671692cee..14c86bf6f82 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
@@ -90,7 +90,6 @@ parapluie-23:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
index 73d4740dc65..0bedbbec587 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
@@ -90,7 +90,6 @@ parapluie-24:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
index 0b509bb8bea..5c56f2d4048 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
@@ -97,7 +97,6 @@ parapluie-25:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
index 73e441670a1..84c48b27a80 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
@@ -90,7 +90,6 @@ parapluie-26:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
index e601fbdf0d7..21138693c46 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
@@ -90,7 +90,6 @@ parapluie-27:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
index cb8ce217cc5..c07e4b186c6 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
@@ -97,7 +97,6 @@ parapluie-28:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
index e5310124512..ca3f812a5cd 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
@@ -90,7 +90,6 @@ parapluie-29:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
index 1b59baa5d0e..2bec999a502 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
@@ -90,7 +90,6 @@ parapluie-3:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
index 0db0aec9473..013db5a3b8c 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
@@ -90,7 +90,6 @@ parapluie-30:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
index 37f481af66f..eca0f055c62 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
@@ -97,7 +97,6 @@ parapluie-31:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
index a0b5af3716d..6b976a691bf 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
@@ -97,7 +97,6 @@ parapluie-32:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
index f63d19f865b..15fa777ef93 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
@@ -90,7 +90,6 @@ parapluie-33:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
index 6de1369d3f5..fd1a9fa3d73 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
@@ -90,7 +90,6 @@ parapluie-34:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
index a624ba5cf7a..47fd54d93cb 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
@@ -97,7 +97,6 @@ parapluie-35:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
index 0fcb4870300..b934a4925a9 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
@@ -90,7 +90,6 @@ parapluie-36:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
index ef9037dca84..f8d2bd70d28 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
@@ -90,7 +90,6 @@ parapluie-37:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
index 47bb5c3ee89..f2dcb4b015f 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
@@ -97,7 +97,6 @@ parapluie-38:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
index 4816b09aae5..526c915c7f4 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
@@ -90,7 +90,6 @@ parapluie-39:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
index 6fc92617cab..7d954257ebf 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
@@ -90,7 +90,6 @@ parapluie-4:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
index af8356da87d..bd5373aa922 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
@@ -90,7 +90,6 @@ parapluie-40:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
index f6fd1b12f4b..7afdc402611 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
@@ -90,7 +90,6 @@ parapluie-5:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
index 8c1157cf1e2..3b79919039b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
@@ -90,7 +90,6 @@ parapluie-6:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
index a05387c80fa..62da3af7a03 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
@@ -90,7 +90,6 @@ parapluie-7:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
index e1d3b6c6b3b..a9dba9c67a5 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
@@ -97,7 +97,6 @@ parapluie-8:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
index c612c8cf19f..f260c776dd9 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
@@ -97,7 +97,6 @@ parapluie-9:
     cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    clock_speed: 1700000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x10000d9'
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
index ceecd360afa..9fe65573657 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
@@ -10,6 +10,7 @@ nodes:
   parapluie-[1-40]:
     processor:
       microarchitecture: K10
+      clock_speed: 1700000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
index fc713013a7a..cd6031fc596 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
@@ -74,7 +74,6 @@ parasilo-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
index 59dc9436b22..472cc5b88ef 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
@@ -74,7 +74,6 @@ parasilo-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
index 066608a3027..f69a1c3515e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
@@ -74,7 +74,6 @@ parasilo-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
index 4a346fe5802..4e38d2a2d6b 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
@@ -74,7 +74,6 @@ parasilo-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
index d7a73973e62..1a204678f3e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
@@ -74,7 +74,6 @@ parasilo-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
index fdf532423e3..173d0e501e6 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
@@ -74,7 +74,6 @@ parasilo-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
index 9b8dfe81d27..cd529f9acc6 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
@@ -74,7 +74,6 @@ parasilo-15:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
index 1c82a8fe843..4bc914d3218 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
@@ -74,7 +74,6 @@ parasilo-16:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
index 023f8ff95b8..919b2bcbd6c 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
@@ -74,7 +74,6 @@ parasilo-17:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
index f92ce05a9dc..3ff5d31dec6 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
@@ -74,7 +74,6 @@ parasilo-18:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
index 82c1a3ead42..f49f60242f7 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
@@ -74,7 +74,6 @@ parasilo-19:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
index 0c133dbb146..efb1d9113cc 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
@@ -74,7 +74,6 @@ parasilo-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
index e1998b61e1a..f311a657ea1 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
@@ -74,7 +74,6 @@ parasilo-20:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
index 73e9db33d64..f9aaba28bfe 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
@@ -74,7 +74,6 @@ parasilo-21:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
index 09a57fc91a4..06080726c21 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
@@ -74,7 +74,6 @@ parasilo-22:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
index 696550960ea..f9e79fff5a8 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
@@ -74,7 +74,6 @@ parasilo-23:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
index 400e41f167f..3c28131fb87 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
@@ -74,7 +74,6 @@ parasilo-24:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
index 798733df86f..149affb6ed7 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
@@ -74,7 +74,6 @@ parasilo-25:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
index 4d6457698a5..fd7d180d31f 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
@@ -74,7 +74,6 @@ parasilo-26:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
index b1b5c7e92f7..ee2d47992d5 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
@@ -74,7 +74,6 @@ parasilo-27:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
index 32aa61006b8..002598accc3 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
@@ -74,7 +74,6 @@ parasilo-28:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
index bca504a3b12..9e285cd7780 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
@@ -74,7 +74,6 @@ parasilo-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
index a3ccc880a70..27bef55336b 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
@@ -74,7 +74,6 @@ parasilo-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
index 28c37214a8f..7f374c370b6 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
@@ -74,7 +74,6 @@ parasilo-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
index f06e452eb0e..198f134b090 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
@@ -74,7 +74,6 @@ parasilo-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
index cb9f66e82fa..6ce471f9421 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
@@ -74,7 +74,6 @@ parasilo-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
index d0e25cedd02..e7b5eb86506 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
@@ -74,7 +74,6 @@ parasilo-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
index 0b0e32f31c0..99b7295b8ee 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
@@ -74,7 +74,6 @@ parasilo-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
index 03064508576..f0d3d2a9719 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
@@ -10,6 +10,7 @@ nodes:
   parasilo-[1-28]:
     processor:
       microarchitecture: Haswell
+      clock_speed: 2400000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
index 273caa1ab0e..a6c6a96386d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
@@ -74,7 +74,6 @@ paravance-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
index 3d467525502..c7d768989e5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
@@ -74,7 +74,6 @@ paravance-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
index c7cdbdb6ca8..b158ad42dc5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
@@ -74,7 +74,6 @@ paravance-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
index 824746a652a..df549285cb9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
@@ -74,7 +74,6 @@ paravance-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
index a897a42c899..71b5f908626 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
@@ -74,7 +74,6 @@ paravance-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
index 1c93b982a8b..be44e23620c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
@@ -74,7 +74,6 @@ paravance-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
index 98a7d4bbed2..d723f79547e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
@@ -74,7 +74,6 @@ paravance-15:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
index 49735c768bf..b9636f62665 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
@@ -74,7 +74,6 @@ paravance-16:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
index a4c4ef478cc..9aad3d8feed 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
@@ -74,7 +74,6 @@ paravance-17:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
index 28338ab49e5..de194876e79 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
@@ -74,7 +74,6 @@ paravance-18:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
index ab7bffcbf9d..819b9dff885 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
@@ -74,7 +74,6 @@ paravance-19:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
index ee8c0e7729b..0c78c028700 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
@@ -74,7 +74,6 @@ paravance-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
index f8f024a0fa4..c0810c17a3b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
@@ -74,7 +74,6 @@ paravance-20:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
index 8498c53e616..95a7bd6583e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
@@ -74,7 +74,6 @@ paravance-21:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
index 3c8d912ef9b..e6d76774334 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
@@ -74,7 +74,6 @@ paravance-22:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
index 329f9721a01..800ceb20031 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
@@ -74,7 +74,6 @@ paravance-23:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
index fd4bd37e2b5..254c4aa2a9e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
@@ -74,7 +74,6 @@ paravance-24:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
index 6edaca102d1..7a9e548b896 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
@@ -74,7 +74,6 @@ paravance-25:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
index 73bffccb4a6..c44cbc63115 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
@@ -74,7 +74,6 @@ paravance-26:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
index baee58df9e1..339b4e34f69 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
@@ -74,7 +74,6 @@ paravance-27:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
index b9e981a9d46..fbdb067fa51 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
@@ -74,7 +74,6 @@ paravance-28:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
index fbe38cff028..af703df8a41 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
@@ -74,7 +74,6 @@ paravance-29:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
index ce182500494..4798b56398b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
@@ -74,7 +74,6 @@ paravance-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
index 346cf9fcef3..b82dc83a626 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
@@ -74,7 +74,6 @@ paravance-30:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
index 5396f4cce7e..85fc7aa87d7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
@@ -74,7 +74,6 @@ paravance-31:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
index c889493a134..282a2e3ee12 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
@@ -74,7 +74,6 @@ paravance-32:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
index 66b786c885f..ab617372b25 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
@@ -74,7 +74,6 @@ paravance-33:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
index aeb7c7482ea..da56367081b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
@@ -74,7 +74,6 @@ paravance-34:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
index 889c6ce1bc6..fc1e086938c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
@@ -74,7 +74,6 @@ paravance-35:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
index b319f432c7b..91cb94bce90 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
@@ -74,7 +74,6 @@ paravance-36:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
index ea5eddcb048..6819264e3c2 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
@@ -74,7 +74,6 @@ paravance-37:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
index 7bb9c1bc4cc..bce94b8e9a7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
@@ -74,7 +74,6 @@ paravance-38:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
index d13ecfbf344..2d8444e0c54 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
@@ -74,7 +74,6 @@ paravance-39:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
index f33da111bfa..d386f5d5a47 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
@@ -74,7 +74,6 @@ paravance-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
index c7fc1d823a8..3e2a9f88e0d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
@@ -74,7 +74,6 @@ paravance-40:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
index b2d683b5362..8defe3dc5bf 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
@@ -74,7 +74,6 @@ paravance-41:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
index aac80bfc0d1..5b17fa103fe 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
@@ -74,7 +74,6 @@ paravance-42:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
index f8af11f3e52..626633e5326 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
@@ -74,7 +74,6 @@ paravance-43:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
index 865f88541b3..2b46db2697c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
@@ -74,7 +74,6 @@ paravance-44:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
index 986031b6f0c..8f8349d9459 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
@@ -74,7 +74,6 @@ paravance-45:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
index 9fe4ab5c55d..55e45002ef9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
@@ -74,7 +74,6 @@ paravance-46:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
index f25586f3cc6..9fa21af534f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
@@ -74,7 +74,6 @@ paravance-47:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
index 0edaac7a760..bb34cd7bb40 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
@@ -74,7 +74,6 @@ paravance-48:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
index 589774e4631..9926de704c3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
@@ -74,7 +74,6 @@ paravance-49:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
index c8c1eb967c5..0eaa6212622 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
@@ -74,7 +74,6 @@ paravance-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
index a5e19b28e73..d2638b842c4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
@@ -74,7 +74,6 @@ paravance-50:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
index 7b37a761764..133a6b1c255 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
@@ -74,7 +74,6 @@ paravance-51:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
index 577a7fb0180..2d79c006140 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
@@ -74,7 +74,6 @@ paravance-52:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
index a2940c1f725..c63d71f6d46 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
@@ -74,7 +74,6 @@ paravance-53:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
index 57d37411f91..cd0714f903a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
@@ -74,7 +74,6 @@ paravance-54:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
index 4713cd7a43b..0a3eec111a3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
@@ -74,7 +74,6 @@ paravance-55:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
index 5f1f3227204..1ad74306383 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
@@ -74,7 +74,6 @@ paravance-56:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
index fda5dd362ce..cbf18ca6b08 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
@@ -74,7 +74,6 @@ paravance-57:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
index b2fb19fc440..a28da29d816 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
@@ -74,7 +74,6 @@ paravance-58:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
index 52001c7f2b3..c57f2f657f0 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
@@ -74,7 +74,6 @@ paravance-59:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
index 5693d8254d3..7c9ce3616c6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
@@ -74,7 +74,6 @@ paravance-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
index 186595c1357..d321f1ffda8 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
@@ -74,7 +74,6 @@ paravance-60:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
index dc8dbf2d8f5..ee9aafb6dfc 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
@@ -74,7 +74,6 @@ paravance-61:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
index ccd638b9722..06b1209d6b4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
@@ -74,7 +74,6 @@ paravance-62:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
index 71292c7cfea..8a4ca118532 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
@@ -74,7 +74,6 @@ paravance-63:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
index 9f68387da2d..42704fd6a4b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
@@ -74,7 +74,6 @@ paravance-64:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
index b49b0327290..623224b704b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
@@ -74,7 +74,6 @@ paravance-65:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
index 82e2b76ef1f..69145151d23 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
@@ -74,7 +74,6 @@ paravance-66:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
index 647091bcbc7..16c27ca5d5c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
@@ -74,7 +74,6 @@ paravance-67:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
index d3397073bea..d9cb822c79c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
@@ -74,7 +74,6 @@ paravance-68:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
index 88750304acd..33218cf3f0d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
@@ -74,7 +74,6 @@ paravance-69:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
index 751d18d6a0b..9aa3fc78865 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
@@ -74,7 +74,6 @@ paravance-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
index c99bc1317ae..01de2d7e681 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
@@ -74,7 +74,6 @@ paravance-70:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
index 8f188824193..80b90e44591 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
@@ -74,7 +74,6 @@ paravance-71:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
index f974784d8fb..d8836ba29a9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
@@ -74,7 +74,6 @@ paravance-72:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
index b9057f0949e..05dc2e8beaf 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
@@ -74,7 +74,6 @@ paravance-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
index 2ad1f964251..05ae428267b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
@@ -74,7 +74,6 @@ paravance-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 20971520
-    clock_speed: 2400000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x43'
diff --git a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml b/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
index 25f25511cfd..7554262f417 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
@@ -10,6 +10,7 @@ nodes:
   paravance-[1-72]:
     processor:
       microarchitecture: Haswell
+      clock_speed: 2400000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
index fb98b1ff62a..445c9013975 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
@@ -55,7 +55,6 @@ suno-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
index 50417c58c25..47a61cd9e66 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
@@ -53,7 +53,6 @@ suno-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
index c84a3c7ef9a..3226f4998f1 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
@@ -55,7 +55,6 @@ suno-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
index 6dbfd8145c6..12b1617505d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
@@ -55,7 +55,6 @@ suno-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
index 1ed8335102d..99eb51927f5 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
@@ -55,7 +55,6 @@ suno-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
index 2ecd24d3a33..7b44cc8f965 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
@@ -55,7 +55,6 @@ suno-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
index a76d767888c..bf68c87bec4 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
@@ -55,7 +55,6 @@ suno-15:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
index 4969344e723..513220bc711 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
@@ -54,7 +54,6 @@ suno-16:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
index f631116d1f4..e8bac382247 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
@@ -53,7 +53,6 @@ suno-17:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
index bac014e8061..e6b04868876 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
@@ -55,7 +55,6 @@ suno-18:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
index 43e3b641482..cd184092ea5 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
@@ -55,7 +55,6 @@ suno-19:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
index 4eaa6852137..12e67caddd9 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
@@ -55,7 +55,6 @@ suno-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
index 60089835b0b..4e50de609c4 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
@@ -55,7 +55,6 @@ suno-20:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
index df5b8338a5a..08dc7fe5caa 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
@@ -53,7 +53,6 @@ suno-21:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
index 1af2ed863e7..1c5929adf34 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
@@ -55,7 +55,6 @@ suno-22:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
index e7f36e4f873..9248d05e75c 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
@@ -55,7 +55,6 @@ suno-23:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
index dab81843470..55a5caf3258 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
@@ -55,7 +55,6 @@ suno-24:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
index 8e359756ca3..63b9573cd57 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
@@ -55,7 +55,6 @@ suno-25:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
index 97bde001c06..af4fc5ee02b 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
@@ -55,7 +55,6 @@ suno-26:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
index f1cc6979ac7..782c992b73d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
@@ -55,7 +55,6 @@ suno-27:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
index bab4a101896..77f52fe9d08 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
@@ -55,7 +55,6 @@ suno-28:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
index 0d8f602c688..d9834040f69 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
@@ -55,7 +55,6 @@ suno-29:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
index 407e57f04e2..3567c0950f6 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
@@ -53,7 +53,6 @@ suno-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
index f266034c3e2..64718722aef 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
@@ -55,7 +55,6 @@ suno-30:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
index 25e160bfc9a..c3b56cc4304 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
@@ -55,7 +55,6 @@ suno-31:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
index 4ca3882d283..41c00d788be 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
@@ -55,7 +55,6 @@ suno-32:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
index f41ddf299e4..c3bb26453a4 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
@@ -55,7 +55,6 @@ suno-33:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
index fa5ec45a4cf..f9303bf5c5b 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
@@ -55,7 +55,6 @@ suno-34:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
index 4de11e596bf..6a784c8cd9e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
@@ -55,7 +55,6 @@ suno-35:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
index e8bfd3fd458..cdbe6c453e3 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
@@ -55,7 +55,6 @@ suno-36:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
index 9653ceee22d..09414c9f55f 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
@@ -55,7 +55,6 @@ suno-37:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
index 039a07f2fb5..ad0a18f54f7 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
@@ -53,7 +53,6 @@ suno-38:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
index ab7e328435b..5d6974a1fed 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
@@ -53,7 +53,6 @@ suno-39:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
index 0b03ed50da2..a12e3b653d3 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
@@ -55,7 +55,6 @@ suno-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
index 8918383e278..c788e688f6a 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
@@ -53,7 +53,6 @@ suno-40:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
index 3e392b2a89c..f43ea9fedf4 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
@@ -53,7 +53,6 @@ suno-41:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
index 99f8f16cc20..04349c0bd63 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
@@ -55,7 +55,6 @@ suno-42:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
index b39bbc398b0..fe3c5014ef3 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
@@ -55,7 +55,6 @@ suno-43:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
index 7ec7ef5de55..c79be4e9421 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
@@ -55,7 +55,6 @@ suno-44:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
index dc5116ea878..861570f7262 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
@@ -53,7 +53,6 @@ suno-45:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
index 96a76317b32..ac02996bd13 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
@@ -53,7 +53,6 @@ suno-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
index 158df45d3e3..a4cb3d0e34b 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
@@ -53,7 +53,6 @@ suno-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
index e2cf404be08..f22f34ce422 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
@@ -55,7 +55,6 @@ suno-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
index 96df1468cb8..c8b6c6243b3 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
@@ -55,7 +55,6 @@ suno-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
index 369b7f60a86..3f94636ccb5 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
@@ -55,7 +55,6 @@ suno-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    clock_speed: 2250000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1d'
diff --git a/input/grid5000/sites/sophia/clusters/suno/suno.yaml b/input/grid5000/sites/sophia/clusters/suno/suno.yaml
index 7e39caab9c0..4535246689d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/suno.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/suno.yaml
@@ -10,6 +10,7 @@ nodes:
   suno-[1-45]:
     processor:
       microarchitecture: Nehalem
+      clock_speed: 2250000000
     software:
       standard-environment: debian10-x64-std
     performance:
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
index 4699ec45d8e..c7a1247c181 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
@@ -78,7 +78,6 @@ uvb-1:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
index 5332f914248..0930606840f 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
@@ -78,7 +78,6 @@ uvb-10:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
index 877dc6d7d85..fb64725a267 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
@@ -78,7 +78,6 @@ uvb-11:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
index 52405e8d059..393d990a4c2 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
@@ -78,7 +78,6 @@ uvb-12:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.yaml
index e1db4533ea6..d1f6fc1f7ad 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-13.yaml
@@ -78,7 +78,6 @@ uvb-13:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
index 8b64205d36e..214e1d08684 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
@@ -78,7 +78,6 @@ uvb-14:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
index e5b07d405b5..3670f65b745 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
@@ -78,7 +78,6 @@ uvb-15:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
index 2d18c43ec19..cf560589d0c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
@@ -78,7 +78,6 @@ uvb-16:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
index 38dca0b1a6d..2d167df4b69 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
@@ -78,7 +78,6 @@ uvb-17:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
index 4442df83405..1ef2a668f43 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
@@ -78,7 +78,6 @@ uvb-18:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
index d7deca9fb26..396670f7211 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
@@ -78,7 +78,6 @@ uvb-19:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
index 96dff17a3c2..f17bc187cea 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
@@ -78,7 +78,6 @@ uvb-2:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
index 20d1fdea950..f86269ee7ab 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
@@ -78,7 +78,6 @@ uvb-20:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
index 66fdd7e00b5..618deecd516 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
@@ -78,7 +78,6 @@ uvb-21:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
index 519d5a0b45e..fc2ed4d0393 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
@@ -78,7 +78,6 @@ uvb-22:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
index 1b95f22fbde..e1126b6fbcc 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
@@ -78,7 +78,6 @@ uvb-23:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
index ee1747509ec..097ef9cc687 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
@@ -78,7 +78,6 @@ uvb-24:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
index 42cf8e2eaa6..9926c778254 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
@@ -78,7 +78,6 @@ uvb-25:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
index 684f3b156b7..a7be5941c94 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
@@ -78,7 +78,6 @@ uvb-26:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
index 0f85db3ee42..35884420c33 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
@@ -78,7 +78,6 @@ uvb-27:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
index 7b412fc1bc5..377df1c00c2 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
@@ -78,7 +78,6 @@ uvb-28:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
index 38f62412a8a..b1f008b3e4b 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
@@ -78,7 +78,6 @@ uvb-29:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
index f77c2b6572b..5889069d522 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
@@ -75,7 +75,6 @@ uvb-3:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
index e16222d84ea..e2253bcd50e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
@@ -78,7 +78,6 @@ uvb-30:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
index ae4156bfc15..ea04d87dc85 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
@@ -78,7 +78,6 @@ uvb-31:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
index 94220798eec..8b3ab3a8dcd 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
@@ -76,7 +76,6 @@ uvb-32:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
index 2bc48b09b0c..60184ccc602 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
@@ -78,7 +78,6 @@ uvb-33:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
index 6525bd0bb05..84308a307e9 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
@@ -78,7 +78,6 @@ uvb-34:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
index 5485ce003a9..474405e8bc9 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
@@ -78,7 +78,6 @@ uvb-35:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
index a670c6fedfa..14970d7413f 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
@@ -78,7 +78,6 @@ uvb-36:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
index 8824e3fdb3c..4785dc4fa11 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
@@ -78,7 +78,6 @@ uvb-37:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
index a7f1670324f..7f6a77c0da1 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
@@ -78,7 +78,6 @@ uvb-38:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
index 8d16e2b67b9..554c0cf6773 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
@@ -78,7 +78,6 @@ uvb-39:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
index 61a654e2e36..8a39ff52d5a 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
@@ -78,7 +78,6 @@ uvb-4:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
index e9fd76228d4..3c6246bf694 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
@@ -78,7 +78,6 @@ uvb-40:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
index 577b3448147..d0e52d279c1 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
@@ -78,7 +78,6 @@ uvb-41:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
index 5fd33497c1b..712d734c483 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
@@ -78,7 +78,6 @@ uvb-42:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
index 1a4af5e4692..5c63d700f88 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
@@ -78,7 +78,6 @@ uvb-43:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
index 002b9de1ed5..bff6dcf9c3e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
@@ -78,7 +78,6 @@ uvb-44:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
index ba2c0a63abf..4b8283fb2cb 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
@@ -78,7 +78,6 @@ uvb-5:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
index 45184366e51..14343fbdfd6 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
@@ -78,7 +78,6 @@ uvb-6:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
index 32c18212dbf..943328fe5aa 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
@@ -75,7 +75,6 @@ uvb-7:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
index f0c24a42473..c5837752e54 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
@@ -78,7 +78,6 @@ uvb-8:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
index 6f9d266f595..421ce7ea0fb 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
@@ -78,7 +78,6 @@ uvb-9:
     cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    clock_speed: 2950000000
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x1f'
diff --git a/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml b/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml
index 441e2405c6b..4510a3b87f7 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml
@@ -10,6 +10,7 @@ nodes:
   uvb-[1-44]:
     processor:
       microarchitecture: Westmere
+      clock_speed: 2950000000
     software:
       standard-environment: debian10-x64-std
     performance:
-- 
GitLab