diff --git a/data/grid5000/sites/lyon/clusters/gemini/gemini.json b/data/grid5000/sites/lyon/clusters/gemini/gemini.json
index ce7585c1caf8cbd0889927d4f578edeb7bc534e2..5fa60f406748d630fe3f7b55c7fbc1c52333a4f8 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/gemini.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/gemini.json
@@ -4,18 +4,6 @@
   "exotic": true,
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Power consumption of node reported by wattmetre, in watt",
-      "name": "wattmetre_power_watt",
-      "only_for": [
-        "gemini-2"
-      ],
-      "optional_period": 10,
-      "period": 1000,
-      "source": {
-        "protocol": "wattmetre"
-      }
-    },
     {
       "description": "Front node ambient temperature reported by BMC, in celsius",
       "name": "bmc_ambient_temp_celsius",
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
index 7e5e630a8778774518ff8d22dfec2936cee3b316..2d52313e45c06be5c75453dd5b5eeb4358a3ed29 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
@@ -442,26 +442,6 @@
     {
       "port": "c4",
       "uid": "pdu3b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 24,
-      "uid": "wattmetrev3-1"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 25,
-      "uid": "wattmetrev3-1"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 26,
-      "uid": "wattmetrev3-1"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 27,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/neowise.json b/data/grid5000/sites/lyon/clusters/neowise/neowise.json
index 014465b11d06e103be2660e91e77e002f3498be1..5c31d730d7b6e220dc3a8b9a3c4cea3dbc9474ac 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/neowise.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/neowise.json
@@ -4,15 +4,6 @@
   "exotic": true,
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Power consumption of node reported by wattmetre, in watt",
-      "name": "wattmetre_power_watt",
-      "optional_period": 10,
-      "period": 1000,
-      "source": {
-        "protocol": "wattmetre"
-      }
-    },
     {
       "description": "Front node ambient temperature reported by BMC, in celsius",
       "name": "bmc_ambient_temp_celsius",
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
index f9cb5bc07f44f4b96f5176aa42133e126dba1ca8..094a6d8ca761925b591be69f93f1f01d27a5781c 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
@@ -365,16 +365,6 @@
     {
       "port": 14,
       "uid": "pdu1b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 6,
-      "uid": "wattmetrev3-1"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 12,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
index 49a69022b392a708ee61f4a1169c2bc445b51549..6d92212125a701e1af9545008a1fd2d12c5f2038 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
@@ -365,16 +365,6 @@
     {
       "port": 28,
       "uid": "pdu2b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 4,
-      "uid": "wattmetrev3-2"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 10,
-      "uid": "wattmetrev3-2"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
index d8953f06c90f23b7dbf7020bc4985ef66e7c39e6..fd4a63fb3b72a006ec45ad0f9baf2f0fbcbb1622 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
@@ -365,16 +365,6 @@
     {
       "port": 15,
       "uid": "pdu1b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 7,
-      "uid": "wattmetrev3-1"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 13,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
index c7fe0bd1541d2cb8e7a07eb0f2bd0315fd9f60cb..2ef103003b4c6281e2ac1d914dcd1d2a760ee1fb 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
@@ -365,16 +365,6 @@
     {
       "port": 20,
       "uid": "pdu1b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 8,
-      "uid": "wattmetrev3-1"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 14,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
index 0ce8c8a1e820cb8b935d219bf65d2c49f9a42e75..d5e82fa9d3258a2b66aca524f53bb1a58ac116ea 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
@@ -365,16 +365,6 @@
     {
       "port": 35,
       "uid": "pdu1b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 9,
-      "uid": "wattmetrev3-1"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 15,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
index 9ab38e122e3c5ec7a54b3c6344168bd19ab8b121..e27f6f80f727e3cd44c2f03fb7ada0a906cf3137 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
@@ -365,16 +365,6 @@
     {
       "port": 34,
       "uid": "pdu1b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 10,
-      "uid": "wattmetrev3-1"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 16,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
index 5114a7bc8997089a7587d0c3bd4ecbec0a2fc2de..a0e81ca80428253b1e5c0e9b0b50799b22730aeb 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
@@ -365,16 +365,6 @@
     {
       "port": 14,
       "uid": "pdu2b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 0,
-      "uid": "wattmetrev3-2"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 6,
-      "uid": "wattmetrev3-2"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
index 3e3ff4bf22e516b6af4d018258e754f9fae7c9bf..de96f40e30622106e96638e4e7c4635cd65fd527 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
@@ -365,16 +365,6 @@
     {
       "port": 15,
       "uid": "pdu2b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 1,
-      "uid": "wattmetrev3-2"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 7,
-      "uid": "wattmetrev3-2"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json
index 555d66be059d804f479d050d5f9b9158dc191d88..042b8a62ffc4290ae418838e74c2300a63b1bc2a 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json
@@ -365,16 +365,6 @@
     {
       "port": 20,
       "uid": "pdu2b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 2,
-      "uid": "wattmetrev3-2"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 8,
-      "uid": "wattmetrev3-2"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
index 92379fba3b5399e9d44a4bb5de762c1ad68c4d94..608345d648360afe95897dd3d220322fb780744e 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
@@ -365,16 +365,6 @@
     {
       "port": 21,
       "uid": "pdu2b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 3,
-      "uid": "wattmetrev3-2"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 9,
-      "uid": "wattmetrev3-2"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
index 14ed828012ec0d344b4b2c2a597d07335b7fcb4a..35efcdf927c6b58eafbf6d8841623dd87b947843 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
@@ -239,11 +239,6 @@
     {
       "port": "c2",
       "uid": "pdu3a"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 28,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
index d6bbe83d739f0d0b6fc2f0e15a2e7882550e9fe3..e27dfbb2ffd7d3c3194a7b9fca1133a60233c6ef 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
@@ -239,11 +239,6 @@
     {
       "port": "b7",
       "uid": "pdu3a"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 29,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json b/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
index 74f8d46868c41ea1095377f93fd7bfa25d1c6ed9..79f1dc2f85944afacbc0fea04e23bbc58a1a7bf0 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
@@ -4,19 +4,6 @@
   "exotic": true,
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Power consumption of node reported by wattmetre, in watt",
-      "name": "wattmetre_power_watt",
-      "only_for": [
-        "pyxis-3",
-        "pyxis-4"
-      ],
-      "optional_period": 10,
-      "period": 1000,
-      "source": {
-        "protocol": "wattmetre"
-      }
-    },
     {
       "description": "Front node ambient temperature reported by BMC, in celsius",
       "name": "bmc_ambient_temp_celsius",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
index d5042e658d5bcbbf89906de20c1f1f33f545dcd0..ee915db74c55fccba66bcb53fa4cf44bd04dd3c5 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
@@ -163,11 +163,6 @@
     {
       "port": "a1",
       "uid": "pdu3b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 30,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
index beb6f6e3fc184f8e83f8f0aab75dc161ba7bf2ca..2ede6ad7a63ec518a429c98c7af4005df0fa28cd 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
@@ -163,11 +163,6 @@
     {
       "port": "a2",
       "uid": "pdu3b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 31,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
index ce8100b8975ce8dec964534dee20300c46b6fddb..3c6616a787865b313c9ca7d70e145ede95103ba6 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
@@ -163,11 +163,6 @@
     {
       "port": "a3",
       "uid": "pdu3b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 32,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
index 79df2f686f6bf42e69b616a268688dc089f67098..a2913b224f0f6d661d07b2973b0e77289f3e9128 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
@@ -163,11 +163,6 @@
     {
       "port": "a4",
       "uid": "pdu3b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 33,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
index f1a598e83c71d55b5671d3e8af799faed1d262cc..884128da0ab2cf35a064ecb3b9eee7b59370def4 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
@@ -163,11 +163,6 @@
     {
       "port": "a5",
       "uid": "pdu3b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 34,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
index b75414bb1da9222a9a8c9a44b04287a8421c5b19..6532d99e8fe950bc4616bd044c2be913fcab79a7 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
@@ -163,11 +163,6 @@
     {
       "port": "a6",
       "uid": "pdu3b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 35,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
index 60a292c122b259aad3f3c37527486f6bcb56d189..213603b87a1063633beb680077b6db2707f556d0 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
@@ -163,11 +163,6 @@
     {
       "port": "a1",
       "uid": "pdu3a"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 18,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
index be22110eb1236ed9dd30fd0cd7fb018a8a1a9c8f..796397204973431f9c82c6033e139f6f6d126b49 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
@@ -163,11 +163,6 @@
     {
       "port": "a2",
       "uid": "pdu3a"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 19,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
index 8ce89e8717efffa7281013389cac7a21737035d5..41027debb811144b77aa8a981b8b9bbbcc00c592 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
@@ -163,11 +163,6 @@
     {
       "port": "a3",
       "uid": "pdu3a"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 20,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
index ab2e4fdb8883c6a757831debfd670ad0502968af..1150c09b876b9543735f66304f4cfc3c8d6504e6 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
@@ -163,11 +163,6 @@
     {
       "port": "a4",
       "uid": "pdu3a"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 21,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json b/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
index ce2ad9b2ada04b9d2a7c28bab51d9b81a73c94bb..d085680ca4819ac895603b85c9ef49a999bf04f6 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
@@ -4,15 +4,6 @@
   "exotic": false,
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Power consumption of node reported by wattmetre, in watt",
-      "name": "wattmetre_power_watt",
-      "optional_period": 10,
-      "period": 1000,
-      "source": {
-        "protocol": "wattmetre"
-      }
-    },
     {
       "description": "Default subset of metrics from Prometheus Node Exporter",
       "name": "prom_default_metrics",
diff --git a/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json b/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json
index f168e129cadd964dcb5205cb071fb5531ac1766d..2cf4d122838971e7b236e93e38f760ead3b4ffb3 100644
--- a/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json
+++ b/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json
@@ -547,36 +547,6 @@
     {
       "port": "c8",
       "uid": "pdu3b"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 0,
-      "uid": "wattmetrev3-1"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 1,
-      "uid": "wattmetrev3-1"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 2,
-      "uid": "wattmetrev3-1"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 3,
-      "uid": "wattmetrev3-1"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 4,
-      "uid": "wattmetrev3-1"
-    },
-    {
-      "kind": "wattmetre-only",
-      "port": 5,
-      "uid": "wattmetrev3-1"
     }
   ],
   "performance": {
diff --git a/data/grid5000/sites/lyon/clusters/sirius/sirius.json b/data/grid5000/sites/lyon/clusters/sirius/sirius.json
index 8952ca72be94330902de81af890b53f837ac1798..5363cf70503839ef7b9a23f04c63e12c254934ce 100644
--- a/data/grid5000/sites/lyon/clusters/sirius/sirius.json
+++ b/data/grid5000/sites/lyon/clusters/sirius/sirius.json
@@ -4,15 +4,6 @@
   "exotic": true,
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Power consumption of node reported by wattmetre, in watt",
-      "name": "wattmetre_power_watt",
-      "optional_period": 10,
-      "period": 1000,
-      "source": {
-        "protocol": "wattmetre"
-      }
-    },
     {
       "description": "Front node ambient temperature reported by BMC, in celsius",
       "name": "bmc_ambient_temp_celsius",
diff --git a/data/grid5000/sites/lyon/pdus/pdu1a.json b/data/grid5000/sites/lyon/pdus/pdu1a.json
index d75eb2c7d5ffaca9b4613c6641052bc1da861757..676473bc055bdb9080e9d994d1d428d62896104a 100644
--- a/data/grid5000/sites/lyon/pdus/pdu1a.json
+++ b/data/grid5000/sites/lyon/pdus/pdu1a.json
@@ -3,11 +3,21 @@
   "mac": "28:29:86:1D:00:29",
   "model": "AP8886",
   "ports": {
-    "14": "neowise-1",
-    "15": "neowise-2",
-    "20": "neowise-3",
-    "21": "neowise-4",
-    "34": "neowise-5"
+    "14": {
+      "uid": "neowise-1"
+    },
+    "15": {
+      "uid": "neowise-2"
+    },
+    "20": {
+      "uid": "neowise-3"
+    },
+    "21": {
+      "uid": "neowise-4"
+    },
+    "34": {
+      "uid": "neowise-5"
+    }
   },
   "type": "pdu",
   "uid": "pdu1a",
diff --git a/data/grid5000/sites/lyon/pdus/pdu1b.json b/data/grid5000/sites/lyon/pdus/pdu1b.json
index 2489c072403bdebe3748b386a0e0ff3107ff792e..566bf44c4daeec0d2fb90ff12b4bf06697e34772 100644
--- a/data/grid5000/sites/lyon/pdus/pdu1b.json
+++ b/data/grid5000/sites/lyon/pdus/pdu1b.json
@@ -3,11 +3,21 @@
   "mac": "28:29:86:1D:00:20",
   "model": "AP8886",
   "ports": {
-    "14": "neowise-1",
-    "15": "neowise-2",
-    "20": "neowise-3",
-    "34": "neowise-5",
-    "35": "neowise-4"
+    "14": {
+      "uid": "neowise-1"
+    },
+    "15": {
+      "uid": "neowise-2"
+    },
+    "20": {
+      "uid": "neowise-3"
+    },
+    "34": {
+      "uid": "neowise-5"
+    },
+    "35": {
+      "uid": "neowise-4"
+    }
   },
   "type": "pdu",
   "uid": "pdu1b",
diff --git a/data/grid5000/sites/lyon/pdus/pdu2a.json b/data/grid5000/sites/lyon/pdus/pdu2a.json
index 8958c40ed4a83ad56a529ea1521fae0d4d85f009..83a262d56639e7fc6210551ca37ee53de4dde8d0 100644
--- a/data/grid5000/sites/lyon/pdus/pdu2a.json
+++ b/data/grid5000/sites/lyon/pdus/pdu2a.json
@@ -3,11 +3,21 @@
   "mac": "28:29:86:1D:00:32",
   "model": "AP8886",
   "ports": {
-    "14": "neowise-6",
-    "15": "neowise-7",
-    "20": "neowise-8",
-    "21": "neowise-9",
-    "28": "neowise-10"
+    "14": {
+      "uid": "neowise-6"
+    },
+    "15": {
+      "uid": "neowise-7"
+    },
+    "20": {
+      "uid": "neowise-8"
+    },
+    "21": {
+      "uid": "neowise-9"
+    },
+    "28": {
+      "uid": "neowise-10"
+    }
   },
   "type": "pdu",
   "uid": "pdu2a",
diff --git a/data/grid5000/sites/lyon/pdus/pdu2b.json b/data/grid5000/sites/lyon/pdus/pdu2b.json
index bdbc733c36deea498c0423c483819382ffd6d4c2..8ced3d3a6fc8f72cf7e04d34a0a517ac88c97175 100644
--- a/data/grid5000/sites/lyon/pdus/pdu2b.json
+++ b/data/grid5000/sites/lyon/pdus/pdu2b.json
@@ -3,11 +3,21 @@
   "mac": "28:29:86:1D:00:2B",
   "model": "AP8886",
   "ports": {
-    "14": "neowise-6",
-    "15": "neowise-7",
-    "20": "neowise-8",
-    "21": "neowise-9",
-    "28": "neowise-10"
+    "14": {
+      "uid": "neowise-6"
+    },
+    "15": {
+      "uid": "neowise-7"
+    },
+    "20": {
+      "uid": "neowise-8"
+    },
+    "21": {
+      "uid": "neowise-9"
+    },
+    "28": {
+      "uid": "neowise-10"
+    }
   },
   "type": "pdu",
   "uid": "pdu2b",
diff --git a/data/grid5000/sites/lyon/pdus/pdu3a.json b/data/grid5000/sites/lyon/pdus/pdu3a.json
index 756ed0ef2bd4ac41a33a86c28f0c12665f18b795..6e2e9854dac58eafc6f6ac4102d33a09e3dbf687 100644
--- a/data/grid5000/sites/lyon/pdus/pdu3a.json
+++ b/data/grid5000/sites/lyon/pdus/pdu3a.json
@@ -3,29 +3,50 @@
   "mac": "00:20:85:D7:8A:6C",
   "model": "EMAB20",
   "ports": {
-    "a1": "sagittaire-2",
-    "a2": "sagittaire-3",
-    "a3": "sagittaire-4",
-    "a4": "sagittaire-5",
-    "a6": "sagittaire-7",
-    "a7": "wattmetrev3-1-phase1",
-    "a8": "sirius-1",
+    "a1": {
+      "uid": "sagittaire-2"
+    },
+    "a2": {
+      "uid": "sagittaire-3"
+    },
+    "a3": {
+      "uid": "sagittaire-4"
+    },
+    "a4": {
+      "uid": "sagittaire-5"
+    },
+    "a6": {
+      "uid": "sagittaire-7"
+    },
+    "a8": {
+      "uid": "sirius-1"
+    },
     "b1": "gw",
     "b2": "salome",
-    "b3": "wattmetrev3-1-phase2",
     "b5": {
       "uid": "gemini-1"
     },
-    "b6": "gemini-2",
-    "b7": "pyxis-4",
-    "b8": "sirius-1",
-    "c1": "gemini-2",
-    "c2": "pyxis-3",
-    "c3": "wattmetrev3-1-phase3",
+    "b6": {
+      "uid": "gemini-2"
+    },
+    "b7": {
+      "uid": "pyxis-4"
+    },
+    "b8": {
+      "uid": "sirius-1"
+    },
+    "c1": {
+      "uid": "gemini-2"
+    },
+    "c2": {
+      "uid": "pyxis-3"
+    },
     "c5": {
       "uid": "gemini-1"
     },
-    "c8": "sirius-1"
+    "c8": {
+      "uid": "sirius-1"
+    }
   },
   "type": "pdu",
   "uid": "pdu3a",
diff --git a/data/grid5000/sites/lyon/pdus/pdu3b.json b/data/grid5000/sites/lyon/pdus/pdu3b.json
index d2e9c197048854455927cbced9d3c39864f3bfb8..a6b5722518476b90ba9e1558a9c38dd0cfb6eb7c 100644
--- a/data/grid5000/sites/lyon/pdus/pdu3b.json
+++ b/data/grid5000/sites/lyon/pdus/pdu3b.json
@@ -3,20 +3,38 @@
   "mac": "00:20:85:D7:84:EB",
   "model": "EMAB20",
   "ports": {
-    "a1": "sagittaire-11",
-    "a2": "sagittaire-12",
-    "a3": "sagittaire-13",
-    "a4": "sagittaire-14",
-    "a5": "sagittaire-15",
-    "a6": "sagittaire-16",
+    "a1": {
+      "uid": "sagittaire-11"
+    },
+    "a2": {
+      "uid": "sagittaire-12"
+    },
+    "a3": {
+      "uid": "sagittaire-13"
+    },
+    "a4": {
+      "uid": "sagittaire-14"
+    },
+    "a5": {
+      "uid": "sagittaire-15"
+    },
+    "a6": {
+      "uid": "sagittaire-16"
+    },
     "a7": "gw",
-    "a8": "sirius-1",
+    "a8": {
+      "uid": "sirius-1"
+    },
     "b1": "switch-adm",
     "b5": {
       "uid": "gemini-1"
     },
-    "b6": "gemini-2",
-    "b8": "sirius-1",
+    "b6": {
+      "uid": "gemini-2"
+    },
+    "b8": {
+      "uid": "sirius-1"
+    },
     "c1": {
       "uid": "pyxis-1"
     },
@@ -24,11 +42,15 @@
       "uid": "pyxis-2"
     },
     "c3": "switch-ib",
-    "c4": "gemini-2",
+    "c4": {
+      "uid": "gemini-2"
+    },
     "c5": {
       "uid": "gemini-1"
     },
-    "c8": "sirius-1"
+    "c8": {
+      "uid": "sirius-1"
+    }
   },
   "type": "pdu",
   "uid": "pdu3b",
diff --git a/data/grid5000/sites/lyon/pdus/wattmetrev3-1.json b/data/grid5000/sites/lyon/pdus/wattmetrev3-1.json
deleted file mode 100644
index 4eb4f5a06094f25ce295226c95d16589cb5bacd7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/pdus/wattmetrev3-1.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "ip": "172.16.63.8",
-  "kind": "wattmetre-only",
-  "metrics": [
-    {
-      "description": "Power consumption per outlet reported by wattmetre, in watt",
-      "name": "wattmetre_power_watt",
-      "optional_period": 10,
-      "period": 1000,
-      "source": {
-        "protocol": "wattmetre"
-      }
-    }
-  ],
-  "model": "v3",
-  "ports": {
-    "0": "sirius-1",
-    "1": "sirius-1",
-    "10": "neowise-5",
-    "12": "neowise-1",
-    "13": "neowise-2",
-    "14": "neowise-3",
-    "15": "neowise-4",
-    "16": "neowise-5",
-    "18": "sagittaire-2",
-    "19": "sagittaire-3",
-    "2": "sirius-1",
-    "20": "sagittaire-4",
-    "21": "sagittaire-5",
-    "22": "sagittaire-7",
-    "24": "gemini-2",
-    "25": "gemini-2",
-    "26": "gemini-2",
-    "27": "gemini-2",
-    "28": "pyxis-3",
-    "29": "pyxis-4",
-    "3": "sirius-1",
-    "30": "sagittaire-11",
-    "31": "sagittaire-12",
-    "32": "sagittaire-13",
-    "33": "sagittaire-14",
-    "34": "sagittaire-15",
-    "35": "sagittaire-16",
-    "4": "sirius-1",
-    "5": "sirius-1",
-    "6": "neowise-1",
-    "7": "neowise-2",
-    "8": "neowise-3",
-    "9": "neowise-4"
-  },
-  "serial": "02000014",
-  "type": "pdu",
-  "uid": "wattmetrev3-1",
-  "vendor": "OmegaWatt"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/pdus/wattmetrev3-2.json b/data/grid5000/sites/lyon/pdus/wattmetrev3-2.json
deleted file mode 100644
index 625dce97fcb41b3b3748f90cb2f2d726d274757a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/pdus/wattmetrev3-2.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "ip": "172.16.63.8",
-  "kind": "wattmetre-only",
-  "metrics": [
-    {
-      "description": "Power consumption per outlet reported by wattmetre, in watt",
-      "name": "wattmetre_power_watt",
-      "optional_period": 10,
-      "period": 1000,
-      "source": {
-        "protocol": "wattmetre"
-      }
-    }
-  ],
-  "model": "v3",
-  "ports": {
-    "0": "neowise-6",
-    "1": "neowise-7",
-    "10": "neowise-10",
-    "2": "neowise-8",
-    "3": "neowise-9",
-    "4": "neowise-10",
-    "6": "neowise-6",
-    "7": "neowise-7",
-    "8": "neowise-8",
-    "9": "neowise-9"
-  },
-  "serial": "02000011",
-  "type": "pdu",
-  "uid": "wattmetrev3-2",
-  "vendor": "OmegaWatt"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/lyon/pdus.yaml b/input/grid5000/sites/lyon/pdus.yaml
index 75bc0ce7db4b22ef28f18b4fb0d5405247627e09..c0533c20729ce6e0a1223bbc512da148bbedaa14 100644
--- a/input/grid5000/sites/lyon/pdus.yaml
+++ b/input/grid5000/sites/lyon/pdus.yaml
@@ -10,39 +10,14 @@ pdus:
     ports:
       14: #bank2
         uid: neowise-1
-        wattmetre: wattmetrev3-1
-        module: "04000016"
-        channel: 1
-        phase: 1
-        phase_inverted: false
       15: #bank2
         uid: neowise-2
-        wattmetre: wattmetrev3-1
-        module: "04000016"
-        channel: 2
-        phase: 1
-        phase_inverted: false
       20: #bank3
         uid: neowise-3
-        wattmetre: wattmetrev3-1
-        module: "04000016"
-        channel: 3
-        phase: 3
-        phase_inverted: true
       21: #bank3
         uid: neowise-4
-        wattmetre: wattmetrev3-1
-        module: "04000016"
-        channel: 4
-        phase: 3
-        phase_inverted: true
       34: #bank5
         uid: neowise-5
-        wattmetre: wattmetrev3-1
-        module: "04000016"
-        channel: 5
-        phase: 2
-        phase_inverted: false
 
   pdu1b:
     # Rangée 9, 1ere armoire, PDU droite
@@ -54,39 +29,14 @@ pdus:
     ports:
       14: #bank2
         uid: neowise-1
-        wattmetre: wattmetrev3-1
-        module: "04000014"
-        channel: 1
-        phase: 1
-        phase_inverted: true
       15: #bank2
         uid: neowise-2
-        wattmetre: wattmetrev3-1
-        module: "04000014"
-        channel: 2
-        phase: 1
-        phase_inverted: true
       20: #bank3
         uid: neowise-3
-        wattmetre: wattmetrev3-1
-        module: "04000014"
-        channel: 3
-        phase: 3
-        phase_inverted: true
       35: #bank5
         uid: neowise-4
-        wattmetre: wattmetrev3-1
-        module: "04000014"
-        channel: 4
-        phase: 2
-        phase_inverted: true
       34: #bank5
         uid: neowise-5
-        wattmetre: wattmetrev3-1
-        module: "04000014"
-        channel: 5
-        phase: 2
-        phase_inverted: true
 
   pdu3a:
     # Rangée 9, 2ere armoire, PDU gauche
@@ -97,107 +47,34 @@ pdus:
     ports:
       a1:
         uid: sagittaire-2
-        wattmetre: wattmetrev3-1
-        module: "04000018"
-        channel: 1
-        phase: 1
-        phase_inverted: true
       a2:
         uid: sagittaire-3
-        wattmetre: wattmetrev3-1
-        module: "04000018"
-        channel: 2
-        phase: 1
-        phase_inverted: true
       a3:
         uid: sagittaire-4
-        wattmetre: wattmetrev3-1
-        module: "04000018"
-        channel: 3
-        phase: 1
-        phase_inverted: true
       a4:
         uid: sagittaire-5
-        wattmetre: wattmetrev3-1
-        module: "04000018"
-        channel: 4
-        phase: 1
-        phase_inverted: true
       a6:
         uid: sagittaire-7
-        wattmetre: wattmetrev3-1
-        module: "04000018"
-        channel: 6
-        phase: 1
-        phase_inverted: true
-      a7: wattmetrev3-1-phase1
       a8:
         uid: sirius-1
-        wattmetre: wattmetrev3-1
-        module: "04000013"
-        channel: 1
-        phase: 1
-        phase_inverted: false
       b1: gw
       b2: salome
-      b3: wattmetrev3-1-phase2
       b5:
         uid: gemini-1
-          #wattmetre: wattmetrev3-1
-          #module: "04000011"
-          #channel: 1
-          #phase: 2
-          #phase_inverted: true
       b6:
         uid: gemini-2
-        wattmetre: wattmetrev3-1
-        module: "04000020"
-        channel: 1
-        phase: 2
-        phase_inverted: true
       b7:
         uid: pyxis-4
-        wattmetre: wattmetrev3-1
-        module: "04000020"
-        channel: 6
-        phase: 2
-        phase_inverted: true
       b8:
         uid: sirius-1
-        wattmetre: wattmetrev3-1
-        module: "04000013"
-        channel: 2
-        phase: 2
-        phase_inverted: true
       c1:
         uid: gemini-2
-        wattmetre: wattmetrev3-1
-        module: "04000020"
-        channel: 2
-        phase: 3
-        phase_inverted: true
       c2:
         uid: pyxis-3
-        wattmetre: wattmetrev3-1
-        module: "04000020"
-        channel: 5
-        phase: 3
-        phase_inverted: true
-      c3: wattmetrev3-1-phase3
       c5:
         uid: gemini-1
-          #wattmetre: wattmetrev3-1
-          #module: "04000011"
-          #channel: 2
-          #phase: 3
-          #phase_inverted: true
       c8:
         uid: sirius-1
-        wattmetre: wattmetrev3-1
-        module: "04000013"
-        channel: 3
-        phase: 3
-        phase_inverted: true
 
   pdu3b:
     # Rangée 9, 2ere armoire, PDU droite
@@ -208,112 +85,37 @@ pdus:
     ports:
       a1:
         uid: sagittaire-11
-        wattmetre: wattmetrev3-1
-        module: "04000022"
-        channel: 1
-        phase: 1
-        phase_inverted: true
       a2:
         uid: sagittaire-12
-        wattmetre: wattmetrev3-1
-        module: "04000022"
-        channel: 2
-        phase: 1
-        phase_inverted: true
       a3:
         uid: sagittaire-13
-        wattmetre: wattmetrev3-1
-        module: "04000022"
-        channel: 3
-        phase: 1
-        phase_inverted: true
       a4:
         uid: sagittaire-14
-        wattmetre: wattmetrev3-1
-        module: "04000022"
-        channel: 4
-        phase: 1
-        phase_inverted: true
       a5:
         uid: sagittaire-15
-        wattmetre: wattmetrev3-1
-        module: "04000022"
-        channel: 5
-        phase: 1
-        phase_inverted: true
       a6:
         uid: sagittaire-16
-        wattmetre: wattmetrev3-1
-        module: "04000022"
-        channel: 6
-        phase: 1
-        phase_inverted: true
       a7: gw
       a8:
         uid: sirius-1
-        wattmetre: wattmetrev3-1
-        module: "04000013"
-        channel: 4
-        phase: 1
-        phase_inverted: false
       b1: switch-adm
       b5:
         uid: gemini-1
-          #wattmetre: wattmetrev3-1
-          #module: "04000011"
-          #channel: 3
-          #phase: 2
-          #phase_inverted: true
       b6:
         uid: gemini-2
-        wattmetre: wattmetrev3-1
-        module: "04000020"
-        channel: 3
-        phase: 2
-        phase_inverted: true
       b8:
         uid: sirius-1
-        wattmetre: wattmetrev3-1
-        module: "04000013"
-        channel: 5
-        phase: 2
-        phase_inverted: true
       c1:
         uid: pyxis-1
-          #wattmetre: wattmetrev3-1
-          #module: "04000011"
-          #channel: 5
-          #phase: 3
-          #phase_inverted: true
       c2:
         uid: pyxis-2
-          #wattmetre: wattmetrev3-1
-          #module: "04000011"
-          #channel: 6
-          #phase: 3
-          #phase_inverted: true
       c3: switch-ib
       c4:
         uid: gemini-2
-        wattmetre: wattmetrev3-1
-        module: "04000020"
-        channel: 4
-        phase: 3
-        phase_inverted: true
       c5:
         uid: gemini-1
-        #wattmetre: wattmetrev3-1
-        #module: "04000011"
-        #channel: 4
-        #phase: 3
-        #phase_inverted: true
       c8:
         uid: sirius-1
-        wattmetre: wattmetrev3-1
-        module: "04000013"
-        channel: 6
-        phase: 3
-        phase_inverted: false
 
   pdu2a:
     # Rangée 8, 1ere armoire, PDU droite
@@ -325,39 +127,14 @@ pdus:
     ports:
       14: #bank2
         uid: neowise-6
-        wattmetre: wattmetrev3-2
-        module: "04000015"
-        channel: 1
-        phase: 1
-        phase_inverted: true
       15: #bank2
         uid: neowise-7
-        wattmetre: wattmetrev3-2
-        module: "04000015"
-        channel: 2
-        phase: 1
-        phase_inverted: true
       20: #bank3
         uid: neowise-8
-        wattmetre: wattmetrev3-2
-        module: "04000015"
-        channel: 3
-        phase: 3
-        phase_inverted: true
       21: #bank3
         uid: neowise-9
-        wattmetre: wattmetrev3-2
-        module: "04000015"
-        channel: 4
-        phase: 3
-        phase_inverted: true
       28: #bank4
         uid: neowise-10
-        wattmetre: wattmetrev3-2
-        module: "04000015"
-        channel: 5
-        phase: 2
-        phase_inverted: true
 
   pdu2b:
     # Rangée 8, 1ere armoire, PDU gauche
@@ -369,39 +146,14 @@ pdus:
     ports:
       14: #bank2
         uid: neowise-6
-        wattmetre: wattmetrev3-2
-        module: "04000012"
-        channel: 1
-        phase: 1
-        phase_inverted: true
       15: #bank2
         uid: neowise-7
-        wattmetre: wattmetrev3-2
-        module: "04000012"
-        channel: 2
-        phase: 1
-        phase_inverted: true
       20: #bank3
         uid: neowise-8
-        wattmetre: wattmetrev3-2
-        module: "04000012"
-        channel: 3
-        phase: 2
-        phase_inverted: true
       21: #bank3
         uid: neowise-9
-        wattmetre: wattmetrev3-2
-        module: "04000012"
-        channel: 4
-        phase: 2
-        phase_inverted: true
       28: #bank4
         uid: neowise-10
-        wattmetre: wattmetrev3-2
-        module: "04000012"
-        channel: 5
-        phase: 3
-        phase_inverted: true
 
   wattmetre1:
     vendor: OmegaWatt
@@ -456,30 +208,3 @@ pdus:
       40: orion-3  #orion-2 est retired, on passe direct à orion-3
       41: orion-4
 
-  wattmetrev3-1:
-    vendor: OmegaWatt
-    model: v3
-    kind: wattmetre-only
-    serial: '02000014'
-    ip: 172.16.63.8
-    metrics:
-      - name: wattmetre_power_watt
-        description: Power consumption per outlet reported by wattmetre, in watt
-        period: 1000
-        optional_period: 10
-        source:
-          protocol: wattmetre
-
-  wattmetrev3-2:
-    vendor: OmegaWatt
-    model: v3
-    kind: wattmetre-only
-    serial: '02000011'
-    ip: 172.16.63.8
-    metrics:
-      - name: wattmetre_power_watt
-        description: Power consumption per outlet reported by wattmetre, in watt
-        period: 1000
-        optional_period: 10
-        source:
-          protocol: wattmetre
diff --git a/lib/refrepo/valid/data/homogeneity.yaml.erb b/lib/refrepo/valid/data/homogeneity.yaml.erb
index 504c5b7290ae723524d9b2df73d40f99e0fe83b6..be5a7c06c2b1451a656f5094c3f22f9b2460d8e5 100644
--- a/lib/refrepo/valid/data/homogeneity.yaml.erb
+++ b/lib/refrepo/valid/data/homogeneity.yaml.erb
@@ -110,13 +110,6 @@ lyon:
     - ~storage_devices.pci-0000:02:04.0-scsi-0:0:1:0.size
     - ~storage_devices.pci-0000:02:04.0-scsi-0:0:1:0.vendor
     - ~storage_devices.pci-0000:02:04.0-scsi-0:0:1:0.firmware_version
-  gemini-2:
-    - +pdu[4]
-    - +pdu[5]
-    - +pdu[6]
-    - +pdu[7]
-  pyxis-3:
-    - +pdu[1]
 
 nancy:
   graffiti-2: