diff --git a/Cargo.toml b/Cargo.toml
index 33d0ff8..1dde3aa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,9 +6,6 @@ package.categories = ["virtualization"]
 members = [
   "xcp-metrics",
   "xcp-metrics-common",
-  #"xapi-rs",
-  #"xcp-metrics-test",
-  #"plugins/xcp-metrics-plugin-common",
   "plugins/xcp-metrics-plugin-xen",
   "plugins/xcp-metrics-plugin-xenstore",
   "xcp-metrics-tools",
diff --git a/plugins/xcp-metrics-plugin-bridge-v2/Cargo.toml b/plugins/xcp-metrics-plugin-bridge-v2/Cargo.toml
deleted file mode 100644
index d637ddc..0000000
--- a/plugins/xcp-metrics-plugin-bridge-v2/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "xcp-metrics-plugin-bridge-v2"
-edition = "2021"
-version.workspace = true
-repository.workspace = true
-categories.workspace = true
-license = "AGPL-3.0-only"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-xcp-metrics-common = { path = "../../xcp-metrics-common" }
-xcp-metrics-plugin-common = { path = "../xcp-metrics-plugin-common" }
-xapi = { path = "../../xapi-rs" }
-
-uuid = "1.4"
-anyhow = "1.0"
-fastrand = "2.0"
-serde_json = "1.0"
-
-tracing = "0.1"
-tracing-subscriber = "0.3"
-
-tokio = { version = "1", features = ["full"] }
-
-[dependencies.clap]
-version = "4.3"
-features = ["derive"]
diff --git a/plugins/xcp-metrics-plugin-bridge-v2/src/main.rs b/plugins/xcp-metrics-plugin-bridge-v2/src/main.rs
deleted file mode 100644
index 1575742..0000000
--- a/plugins/xcp-metrics-plugin-bridge-v2/src/main.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use std::{collections::HashMap, path::PathBuf, time::Duration};
-
-use clap::{command, Parser};
-use tokio::time;
-use xapi::METRICS_SHM_PATH;
-use xcp_metrics_common::{
-    metrics::MetricSet,
-    protocol_v3::{self, ProtocolV3Header},
-    utils::mapping::CustomMapping,
-};
-
-use xcp_metrics_plugin_common::{bridge::v3_to_v2::BridgeToV2, protocol_v2::RrddPlugin};
-
-/// A bridge plugin (from v3 to v2) for protocol v3 plugins.
-#[derive(Parser, Debug)]
-#[command(author, version, about, long_about = None)]
-struct Args {
-    /// Name of the plugin to bridge.
-    #[arg(short, long)]
-    plugin_name: String,
-
-    /// Logging level
-    #[arg(short, long, default_value_t = tracing::Level::INFO)]
-    log_level: tracing::Level,
-
-    /// Target daemon path.
-    #[arg(short, long)]
-    target: Option<PathBuf>,
-
-    /// V3 to V2 mapping file (JSON format)
-    #[arg(short, long)]
-    mapping_path: Option<PathBuf>,
-}
-
-fn load_mapping(args: &Args) -> HashMap<Box<str>, CustomMapping> {
-    if let Some(path) = &args.mapping_path {
-        let content = std::fs::read_to_string(path).expect("Unable to read mapping file");
-        serde_json::from_str(&content).expect("Invalid mapping file.")
-    } else {
-        Default::default()
-    }
-}
-
-async fn read_protocol_v3(path: &str) -> anyhow::Result<(ProtocolV3Header, MetricSet)> {
-    let mut reader = tokio::fs::File::open(path).await?;
-
-    Ok(protocol_v3::parse_v3_async(&mut reader).await?)
-}
-
-#[tokio::main]
-async fn main() {
-    let args = Args::parse();
-
-    let text_subscriber = tracing_subscriber::fmt()
-        .with_ansi(true)
-        .with_max_level(args.log_level)
-        .compact()
-        .finish();
-
-    tracing::subscriber::set_global_default(text_subscriber).unwrap();
-
-    let bridged_plugin_name = format!("{}_bridged", args.plugin_name);
-
-    let path = format!("{METRICS_SHM_PATH}{}", args.plugin_name);
-    tracing::info!("Plugin to bridge path: {path}");
-
-    let (header, metrics_set) = read_protocol_v3(&path).await.unwrap();
-
-    tracing::debug!("Protocol v3 header: {header:?}");
-    tracing::debug!("Initial MetricsSet: {metrics_set:?}");
-
-    let mut bridge = BridgeToV2::with_mappings(load_mapping(&args));
-    bridge.update(metrics_set);
-
-    let mut plugin = RrddPlugin::new(
-        &bridged_plugin_name,
-        bridge.get_metadata().clone(),
-        Some(&bridge.get_data()),
-        Some(
-            &args
-                .target
-                .unwrap_or_else(|| xapi::get_module_path("xcp-rrdd")),
-        ),
-    )
-    .await
-    .unwrap();
-
-    // Expose protocol v2
-    loop {
-        let (header, metrics_set) = read_protocol_v3(&path).await.unwrap();
-        tracing::debug!("Updated: {header:?}");
-        tracing::debug!(" - {metrics_set:?}");
-
-        // Update sources
-        if bridge.update(metrics_set) {
-            tracing::debug!("Updating metadata");
-            let metadata = bridge.get_metadata().clone();
-            tracing::debug!(" - {metadata:?}");
-
-            plugin
-                .reset_metadata(metadata, Some(&bridge.get_data()))
-                .await
-                .unwrap();
-        }
-
-        plugin.update_values(&bridge.get_data()).await.unwrap();
-        time::sleep(Duration::from_secs(1)).await;
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-common/Cargo.toml b/plugins/xcp-metrics-plugin-common/Cargo.toml
deleted file mode 100644
index ca67257..0000000
--- a/plugins/xcp-metrics-plugin-common/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "xcp-metrics-plugin-common"
-description = "Library that helps making plugins for xcp-metrics and xcp-rrdd"
-version.workspace = true
-license = "AGPL-3.0-only"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-xcp-metrics-common = { path = "../../xcp-metrics-common" }
-xapi = { path = "../../xapi-rs" }
-
-anyhow = "1.0"
-tokio = "1"
-uuid = "1.11"
-tracing = "0.1"
-tracing-subscriber = "0.3"
-
-dashmap = "6.1"
-futures = "0.3"
-
-xenstore-rs = "0.8"
\ No newline at end of file
diff --git a/plugins/xcp-metrics-plugin-common/src/bridge/mod.rs b/plugins/xcp-metrics-plugin-common/src/bridge/mod.rs
deleted file mode 100644
index b2cff8d..0000000
--- a/plugins/xcp-metrics-plugin-common/src/bridge/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-//! Bridges for conversion beteen protocol v2 and protocol v3.
-
-pub mod v3_to_v2;
diff --git a/plugins/xcp-metrics-plugin-common/src/bridge/v3_to_v2.rs b/plugins/xcp-metrics-plugin-common/src/bridge/v3_to_v2.rs
deleted file mode 100644
index aee6559..0000000
--- a/plugins/xcp-metrics-plugin-common/src/bridge/v3_to_v2.rs
+++ /dev/null
@@ -1,143 +0,0 @@
-//! Adapter to convert from protocol v3 to protocol v2.
-use std::{collections::HashMap, iter};
-
-use xcp_metrics_common::{
-    metrics::{Label, Metric, MetricFamily, MetricValue, MetricSet, MetricValue},
-    rrdd::{
-        protocol_common::{DataSourceMetadata, DataSourceValue},
-        protocol_v2::{indexmap::IndexMap, RrddMetadata},
-    },
-    utils::{
-        delta::MetricSetModel,
-        mapping::{CustomMapping, DefaultMapping, MetadataMapping},
-    },
-};
-
-/// Adapter to convert protocol v3 metrics set into protocol v2 metadata and data.
-#[derive(Clone)]
-pub struct BridgeToV2 {
-    model: MetricSetModel,
-    latest_set: MetricSet,
-    custom_mappings: HashMap<Box<str>, CustomMapping>,
-
-    metadata: RrddMetadata,
-    metadata_map: Vec<(Box<str>, Box<[Label]>)>,
-}
-
-/// Convert a MetricPoint into a protocol-v2 value.
-fn metric_point_to_v2(metric_point: &MetricValue) -> DataSourceValue {
-    match metric_point.value {
-        MetricValue::Gauge(value) => DataSourceValue::from(value),
-        MetricValue::Counter { total, .. } => DataSourceValue::from(total),
-        _ => DataSourceValue::Undefined,
-    }
-}
-
-impl BridgeToV2 {
-    pub fn new() -> Self {
-        Self {
-            model: MetricSetModel::default(),
-            latest_set: MetricSet::default(),
-            custom_mappings: HashMap::default(),
-            metadata: RrddMetadata {
-                datasources: IndexMap::default(),
-            },
-            metadata_map: vec![],
-        }
-    }
-
-    pub fn with_mappings(custom_mappings: HashMap<Box<str>, CustomMapping>) -> Self {
-        Self {
-            custom_mappings,
-            ..Default::default()
-        }
-    }
-
-    fn metric_to_v2_metadata(
-        &self,
-        family_name: &str,
-        family: &MetricFamily,
-        metric: &Metric,
-    ) -> Option<(Box<str>, DataSourceMetadata)> {
-        if let Some(custom_mapping) = self.custom_mappings.get(family_name) {
-            custom_mapping.convert(family_name, family, metric)
-        } else {
-            DefaultMapping.convert(family_name, family, metric)
-        }
-    }
-
-    /// Update bridge information, returns true on metadata change.
-    pub fn update(&mut self, metrics_set: MetricSet) -> bool {
-        let delta = self.model.compute_delta(&metrics_set);
-        self.model.apply_delta(&delta);
-
-        if !delta.added_families.is_empty()
-            || !delta.added_metrics.is_empty()
-            || !delta.removed_metrics.is_empty()
-        {
-            self.latest_set = metrics_set;
-            self.reset_metadata();
-            true
-        } else {
-            self.latest_set = metrics_set;
-            false
-        }
-    }
-
-    pub fn get_data(&self) -> Box<[DataSourceValue]> {
-        self.metadata_map
-            .iter()
-            .filter_map(|(family_name, labels)| self.get_first_metric_point(family_name, labels))
-            .map(metric_point_to_v2)
-            .collect::<Box<[DataSourceValue]>>()
-    }
-
-    pub fn get_metadata(&self) -> &RrddMetadata {
-        &self.metadata
-    }
-
-    fn get_first_metric_point<'a>(
-        &'a self,
-        family_name: &str,
-        labels: &[Label],
-    ) -> Option<&'a MetricValue> {
-        self.latest_set
-            .families
-            .get(family_name)
-            .and_then(|family| {
-                family
-                    .metrics
-                    .iter()
-                    // Filter by labels
-                    .filter(|(_, metric)| metric.labels.as_ref() == labels)
-                    // Only take first metrics_point
-                    .find_map(|(_, metric)| metric.metrics_point.first())
-            })
-    }
-
-    fn reset_metadata(&mut self) {
-        let (datasources, metadata_map) = self
-            .latest_set
-            .families
-            .iter()
-            // Combine family with family name and metrics.
-            .flat_map(|(name, family)| {
-                iter::zip(iter::repeat((name, family)), family.metrics.iter())
-            })
-            // Convert this data to protocol v2 metadata and mapping information.
-            .filter_map(|((family_name, family), (_, metric))| {
-                self.metric_to_v2_metadata(family_name, family, metric)
-                    .map(|mapping| (mapping, (family_name.clone(), metric.labels.clone())))
-            })
-            .unzip();
-
-        self.metadata = RrddMetadata { datasources };
-        self.metadata_map = metadata_map;
-    }
-}
-
-impl Default for BridgeToV2 {
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-common/src/lib.rs b/plugins/xcp-metrics-plugin-common/src/lib.rs
deleted file mode 100644
index e0413a6..0000000
--- a/plugins/xcp-metrics-plugin-common/src/lib.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod bridge;
-pub mod plugin;
-pub mod protocol_v2;
-pub mod protocol_v3;
-
-//pub mod xenstore;
\ No newline at end of file
diff --git a/plugins/xcp-metrics-plugin-common/src/plugin.rs b/plugins/xcp-metrics-plugin-common/src/plugin.rs
deleted file mode 100644
index b2ffd6e..0000000
--- a/plugins/xcp-metrics-plugin-common/src/plugin.rs
+++ /dev/null
@@ -1,143 +0,0 @@
-//! Utilities that manages communication with daemon using protocol v3
-//! under the hood and converting to protocol v2 if needed.
-use std::{collections::HashMap, path::Path, time::Duration};
-
-use tokio::time;
-
-use crate::{
-    bridge::v3_to_v2::BridgeToV2,
-    protocol_v2::RrddPlugin,
-    protocol_v3::{utils::SimpleMetricSet, MetricsPlugin},
-};
-use xcp_metrics_common::utils::mapping::CustomMapping;
-
-pub const XCP_RRDD_PATH: &str = "/var/lib/xcp/xcp-rrdd";
-
-/// Abstraction of a protocol v3 plugin.
-pub trait XcpPlugin {
-    /// Update the state of the plugin.
-    fn update(&mut self) -> impl std::future::Future<Output = ()> + Send;
-
-    // Generate a new metric set representing the current state of data.
-    fn generate_metrics(&mut self) -> SimpleMetricSet;
-
-    /// Get the plugin name (uid).
-    fn get_name(&self) -> &str;
-
-    // Get plugin mappings
-    fn get_mappings(&self) -> Option<HashMap<Box<str>, CustomMapping>>;
-}
-
-fn arg0_starts_with_rrdp() -> bool {
-    let Some(arg0) = std::env::args().next() else {
-        return false;
-    };
-
-    Path::new(&arg0)
-        .file_name()
-        .unwrap_or_default()
-        .to_os_string()
-        .to_string_lossy()
-        .starts_with("rrdp-")
-}
-
-/// Run the provided for either protocol v2 (converting from v3) or protocol v3 depending on `version`.
-///
-/// Versions :
-///   2: Use a internal v3 to v2 bridge with `mappings` to convert from protocol v3 to protocol v2.
-///   3: Directly expose protocol v3 metrics to target daemon.
-///
-/// If no target_daemon is provided, use default one.
-pub async fn run_hybrid(
-    shared: impl XcpPlugin,
-    mut target_daemon_path: Option<&Path>,
-    mut version: Option<u32>,
-) {
-    if target_daemon_path.is_none() && version.is_none() && arg0_starts_with_rrdp() {
-        tracing::info!("Program name starts with rrdp-*, use xcp-rrdd and protocol-v2 by default.");
-        target_daemon_path = Some(Path::new(&XCP_RRDD_PATH));
-        version = Some(2);
-    }
-
-    match version.unwrap_or(3) {
-        2 => run_plugin_v2(shared, target_daemon_path).await,
-        3 => run_plugin_v3(shared, target_daemon_path).await,
-        p => tracing::error!("Unknown protocol {p}"),
-    }
-}
-
-pub async fn run_plugin_v2(mut shared: impl XcpPlugin, target_daemon_path: Option<&Path>) {
-    tracing::info!("Running protocol v2 plugin: {}", shared.get_name());
-    let mut metrics = shared.generate_metrics();
-
-    let mut bridge = BridgeToV2::with_mappings(shared.get_mappings().unwrap_or_default());
-    bridge.update(metrics.into());
-
-    let mut plugin = match RrddPlugin::new(
-        shared.get_name(),
-        bridge.get_metadata().clone(),
-        Some(&bridge.get_data()),
-        target_daemon_path,
-    )
-    .await
-    {
-        Ok(plugin) => plugin,
-        Err(e) => {
-            tracing::error!("Unable to initialize plugin ({e})");
-            return;
-        }
-    };
-
-    // Expose protocol v2
-    loop {
-        tracing::debug!("Updating plugin state");
-
-        // Update sources
-        shared.update().await;
-
-        // Fetch and push new metrics.
-        metrics = shared.generate_metrics();
-
-        if bridge.update(metrics.into()) {
-            if let Err(e) = plugin
-                .reset_metadata(bridge.get_metadata().clone(), Some(&bridge.get_data()))
-                .await
-            {
-                tracing::warn!("Unable to update metadata ({e}");
-            }
-        }
-
-        if let Err(e) = plugin.update_values(&bridge.get_data()).await {
-            tracing::warn!("Unable to update plugin values ({e})");
-        }
-
-        time::sleep(Duration::from_secs(1)).await;
-    }
-}
-
-pub async fn run_plugin_v3(mut shared: impl XcpPlugin, target_daemon_path: Option<&Path>) {
-    tracing::info!("Running protocol v3 plugin: {}", shared.get_name());
-    // Expose protocol v3
-    // NOTE: some could be undefined values
-    let plugin = MetricsPlugin::new(
-        &shared.get_name().to_string(),
-        shared.generate_metrics().into(),
-        target_daemon_path,
-    )
-    .await
-    .unwrap();
-
-    loop {
-        tracing::debug!("Updating plugin state");
-        // Update sources
-        shared.update().await;
-
-        // Fetch and push new metrics.
-        plugin
-            .update(shared.generate_metrics().into())
-            .await
-            .unwrap();
-
-        time::sleep(Duration::from_secs(1)).await;
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-common/src/protocol_v2.rs b/plugins/xcp-metrics-plugin-common/src/protocol_v2.rs
deleted file mode 100644
index 4e6f1c5..0000000
--- a/plugins/xcp-metrics-plugin-common/src/protocol_v2.rs
+++ /dev/null
@@ -1,173 +0,0 @@
-use std::path::{Path, PathBuf};
-
-use tokio::{
-    fs::{create_dir_all, OpenOptions},
-    io::AsyncWriteExt,
-};
-
-use xapi::{
-    rpc::{
-        message::{parse_http_response, RpcKind},
-        methods::rrdd::{PluginLocalDeregister, PluginLocalRegister},
-    },
-    unix::METRICS_SHM_PATH,
-};
-use xcp_metrics_common::rrdd::{
-    protocol_common::DataSourceValue,
-    protocol_v2::{values_to_raw, RrddMessageHeader, RrddMetadata},
-};
-
-pub struct RrddPlugin {
-    uid: Box<str>,
-    header: RrddMessageHeader,
-    metrics_path: PathBuf,
-    target_daemon_path: PathBuf,
-}
-
-const DEFAULT_DAEMON: &str = "/var/lib/xcp/xcp-metrics";
-
-impl RrddPlugin {
-    /// Create and register a new plugin.
-    pub async fn new(
-        uid: &'_ str,
-        metadata: RrddMetadata,
-        initial_values: Option<&[DataSourceValue]>,
-        target_daemon_path: Option<&Path>,
-    ) -> anyhow::Result<Self> {
-        let (header, metadata_str) = Self::generate_initial_header(metadata, initial_values);
-
-        let plugin = Self {
-            uid: uid.into(),
-            header,
-            metrics_path: Path::new(METRICS_SHM_PATH).join(uid),
-            target_daemon_path: target_daemon_path
-                .unwrap_or(Path::new(DEFAULT_DAEMON))
-                .to_path_buf(),
-        };
-
-        plugin.reset_file(Some(&metadata_str)).await?;
-        plugin.advertise_plugin().await?;
-
-        Ok(plugin)
-    }
-
-    /// Push new values to the shared file.
-    ///
-    /// # Condition
-    /// The length of `new_values` must match the latest sent metadata (either by [Self::new] or [Self::reset_metadata]).
-    pub async fn update_values(&mut self, new_values: &[DataSourceValue]) -> anyhow::Result<()> {
-        self.header.update_values(&values_to_raw(new_values))?;
-        self.reset_file(None).await
-    }
-
-    /// Advertise the existence of the plugin to the main daemon.
-    pub async fn advertise_plugin(&self) -> anyhow::Result<()> {
-        let request = PluginLocalRegister {
-            info: "Five_Seconds".into(),
-            protocol: "V2".into(),
-            uid: self.uid.to_string(),
-        };
-
-        let response = xapi::unix::send_rpc_to(
-            &self.target_daemon_path,
-            "POST",
-            &request,
-            &self.uid, /* use uid as user-agent */
-            RpcKind::XmlRpc,
-        )
-        .await
-        .map_err(|e| {
-            anyhow::anyhow!(
-                "Can't reach '{}' daemon ({e})",
-                self.target_daemon_path.to_string_lossy()
-            )
-        })?;
-
-        tracing::info!("RPC Response: {:?}", parse_http_response(response).await);
-
-        Ok(())
-    }
-
-    /// Replace the metadata of the shared file.
-    ///
-    /// # Condition
-    /// The length of `initial_values` must match the `metadata`.
-    pub async fn reset_metadata(
-        &mut self,
-        metadata: RrddMetadata,
-        initial_values: Option<&[DataSourceValue]>,
-    ) -> anyhow::Result<()> {
-        let (header, metadata_str) =
-            Self::generate_initial_header(metadata.clone(), initial_values);
-
-        self.header = header;
-        self.reset_file(Some(&metadata_str)).await
-    }
-
-    async fn reset_file(&self, raw_metadata: Option<&str>) -> anyhow::Result<()> {
-        // Create directory if doesn't exist.
-        create_dir_all(METRICS_SHM_PATH).await?;
-
-        let mut options = OpenOptions::new();
-        options.create(true);
-        options.truncate(false);
-        options.write(true);
-
-        let mut file = options.open(&self.metrics_path).await?;
-
-        let mut header_buffer = vec![];
-        self.header.write(&mut header_buffer)?;
-        file.write_all(&header_buffer).await?;
-
-        if let Some(raw_metadata) = raw_metadata {
-            file.write_all(raw_metadata.as_bytes()).await?;
-        }
-
-        Ok(())
-    }
-
-    fn generate_initial_header(
-        metadata: RrddMetadata,
-        initial_values: Option<&[DataSourceValue]>,
-    ) -> (RrddMessageHeader, Box<str>) {
-        let raw_values = if let Some(init) = initial_values {
-            values_to_raw(init)
-        } else {
-            vec![[0; 8]; metadata.datasources.len()].into_boxed_slice()
-        };
-
-        RrddMessageHeader::generate(&raw_values, metadata)
-    }
-
-    /// Deregister the plugin from the daemon.
-    pub async fn deregister_plugin(self) {
-        tracing::info!("Deregistering {}...", &self.uid);
-
-        // Unregister plugin
-        let request = PluginLocalDeregister {
-            uid: self.uid.to_string(),
-        };
-
-        match xapi::unix::send_rpc_to(
-            &self.target_daemon_path,
-            "POST",
-            &request,
-            &self.uid, /* use uid as user-agent */
-            RpcKind::XmlRpc,
-        )
-        .await
-        {
-            Ok(response) => {
-                tracing::info!("RPC Response: {:?}", parse_http_response(response).await)
-            }
-            Err(e) => {
-                tracing::error!("Unable to unregister plugin ({e})")
-            }
-        }
-
-        // Delete plugin file.
-        if let Err(e) = tokio::fs::remove_file(self.metrics_path).await {
-            tracing::warn!("Unable to remove plugin file: {e}")
-        }
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-common/src/protocol_v3/mod.rs b/plugins/xcp-metrics-plugin-common/src/protocol_v3/mod.rs
deleted file mode 100644
index 11806e7..0000000
--- a/plugins/xcp-metrics-plugin-common/src/protocol_v3/mod.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-//! xcp-metrics plugin protocol v3 framework.
-pub mod utils;
-
-use std::path::{Path, PathBuf};
-
-use tokio::fs::{create_dir_all, OpenOptions};
-
-use xapi::{
-    rpc::{
-        message::{parse_http_response, RpcKind},
-        methods::rrdd::{PluginMetricsDeregister, PluginMetricsRegister},
-    },
-    unix::METRICS_SHM_PATH,
-};
-use xcp_metrics_common::{metrics::MetricSet, protocol_v3};
-
-pub struct MetricsPlugin {
-    uid: Box<str>,
-    metrics_path: PathBuf,
-    target_daemon_path: PathBuf,
-}
-
-const DEFAULT_DAEMON: &str = "/var/lib/xcp/xcp-metrics";
-
-impl MetricsPlugin {
-    /// Create and register a new plugin.
-    pub async fn new(
-        uid: &'_ str,
-        metrics: MetricSet,
-        target_daemon_path: Option<&Path>,
-    ) -> anyhow::Result<Self> {
-        let plugin = Self {
-            uid: uid.into(),
-            metrics_path: Path::new(METRICS_SHM_PATH).join(uid),
-            target_daemon_path: target_daemon_path
-                .unwrap_or(Path::new(DEFAULT_DAEMON))
-                .to_path_buf(),
-        };
-
-        plugin.update(metrics).await?;
-        plugin.advertise_plugin().await?;
-
-        Ok(plugin)
-    }
-
-    pub async fn update(&self, metrics: MetricSet) -> anyhow::Result<()> {
-        create_dir_all(METRICS_SHM_PATH).await?;
-
-        let mut options = OpenOptions::new();
-        options.create(true);
-        options.truncate(false);
-        options.write(true);
-
-        let mut file = options.open(&self.metrics_path).await?;
-
-        protocol_v3::generate_v3_async(&mut file, None, metrics).await?;
-
-        Ok(())
-    }
-
-    /// Advertise the existence of the plugin to the main daemon.
-    pub async fn advertise_plugin(&self) -> anyhow::Result<()> {
-        let request = PluginMetricsRegister {
-            version: "OpenMetrics 1.0.0".into(),
-            uid: self.uid.to_string(),
-        };
-
-        let response = xapi::unix::send_rpc_to(
-            &self.target_daemon_path,
-            "POST",
-            &request,
-            &self.uid, /* use uid as user-agent */
-            RpcKind::JsonRpc,
-        )
-        .await
-        .map_err(|e| {
-            anyhow::anyhow!(
-                "Can't reach '{}' daemon ({e})",
-                self.target_daemon_path.to_string_lossy()
-            )
-        })?;
-
-        tracing::debug!("RPC Response: {:?}", parse_http_response(response).await);
-
-        Ok(())
-    }
-
-    /// Deregister the plugin from the daemon.
-    pub async fn deregister_plugin(self) {
-        tracing::info!("Deregistering {}...", &self.uid);
-
-        // Unregister plugin
-        let request = PluginMetricsDeregister {
-            uid: self.uid.to_string(),
-        };
-
-        match xapi::unix::send_rpc_to(
-            &self.target_daemon_path,
-            "POST",
-            &request,
-            &self.uid, /* use uid as user-agent */
-            RpcKind::JsonRpc,
-        )
-        .await
-        {
-            Ok(response) => {
-                tracing::debug!("RPC Response: {:?}", parse_http_response(response).await)
-            }
-            Err(e) => {
-                tracing::error!("Unable to unregister plugin ({e})")
-            }
-        }
-
-        // Delete plugin file.
-        if let Err(e) = tokio::fs::remove_file(self.metrics_path).await {
-            tracing::warn!("Unable to remove plugin file: {e}");
-        }
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-common/src/protocol_v3/utils.rs b/plugins/xcp-metrics-plugin-common/src/protocol_v3/utils.rs
deleted file mode 100644
index 0efa674..0000000
--- a/plugins/xcp-metrics-plugin-common/src/protocol_v3/utils.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-//! Simpler metrics representation for plugins.
-
-use std::{collections::HashMap, time::SystemTime};
-
-use xcp_metrics_common::metrics::{
-    Label, Metric, MetricFamily, MetricSet, MetricType, MetricValue, MetricValue,
-};
-
-#[derive(Clone, Debug)]
-pub struct SimpleMetricSet {
-    pub families: HashMap<String, SimpleMetricFamily>,
-}
-
-impl From<SimpleMetricSet> for MetricSet {
-    fn from(SimpleMetricSet { families }: SimpleMetricSet) -> Self {
-        Self {
-            families: families
-                .into_iter()
-                .map(|(name, family)| (name.into_boxed_str(), family.into()))
-                .collect(),
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct SimpleMetricFamily {
-    pub metric_type: MetricType,
-    pub unit: Box<str>,
-    pub help: Box<str>,
-
-    pub metrics: Vec<SimpleMetric>,
-}
-
-impl From<SimpleMetricFamily> for MetricFamily {
-    fn from(
-        SimpleMetricFamily {
-            metric_type,
-            unit,
-            help,
-            metrics,
-        }: SimpleMetricFamily,
-    ) -> Self {
-        Self {
-            reference_count: 1,
-            metric_type,
-            unit,
-            help,
-            metrics: metrics
-                .into_iter()
-                .map(|simple_metric| (uuid::Uuid::new_v4(), Metric::from(simple_metric)))
-                .collect(),
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct SimpleMetric {
-    pub labels: Vec<Label>,
-    pub value: MetricValue,
-}
-
-impl From<SimpleMetric> for Metric {
-    fn from(SimpleMetric { labels, value }: SimpleMetric) -> Self {
-        Self {
-            labels: labels.into_boxed_slice(),
-            value,
-        }
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-common/src/xenstore/mock.rs b/plugins/xcp-metrics-plugin-common/src/xenstore/mock.rs
deleted file mode 100644
index 6b77b56..0000000
--- a/plugins/xcp-metrics-plugin-common/src/xenstore/mock.rs
+++ /dev/null
@@ -1,219 +0,0 @@
-//! A fake XenStore.
-//!
-//! Doesn't really attempt to be exactly compatible with XenStore implementation.
-use std::{
-    io::{Error, ErrorKind},
-    iter,
-    pin::Pin,
-    task::{Context, Poll},
-};
-
-use dashmap::{DashMap, DashSet};
-use futures::Stream;
-use tokio::sync::{mpsc, Mutex};
-
-use super::{
-    read::XsRead,
-    watch::{XsStreamTrait, XsWatch, XsWatchEntry},
-    write::XsWrite,
-    xs::XBTransaction,
-};
-
-pub struct MockXs {
-    tree: DashMap<Box<str>, Box<str>>,
-
-    watch_map: DashSet<(Box<str>, Box<str>)>,
-    watch_reader: Mutex<mpsc::UnboundedReceiver<XsWatchEntry>>,
-    watch_sender: mpsc::UnboundedSender<XsWatchEntry>,
-}
-
-impl Default for MockXs {
-    fn default() -> Self {
-        Self::new(DashMap::default())
-    }
-}
-
-impl MockXs {
-    pub fn new(tree: DashMap<Box<str>, Box<str>>) -> Self {
-        let (sender, reader) = mpsc::unbounded_channel();
-
-        Self {
-            tree,
-
-            watch_map: Default::default(),
-            watch_reader: Mutex::new(reader),
-            watch_sender: sender,
-        }
-    }
-}
-
-pub struct MockStream<'a> {
-    fake_xs: &'a MockXs,
-}
-
-impl Stream for MockStream<'_> {
-    type Item = XsWatchEntry;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        let Ok(mut reader) = self.fake_xs.watch_reader.try_lock() else {
-            return Poll::Ready(None);
-        };
-
-        reader.poll_recv(cx)
-    }
-}
-
-impl<'a> XsStreamTrait<'a> for MockStream<'a> {}
-
-impl XsRead for MockXs {
-    fn directory(&self, _: XBTransaction, path: &str) -> Result<Vec<String>, Error> {
-        if self.tree.get(path).is_some() {
-            let entries: Vec<String> = self
-                .tree
-                .iter()
-                .filter_map(|entry| {
-                    let key = entry.key().as_ref();
-                    let prefix = format!("{path}/");
-
-                    // This is at least a entry (or sub-entry) of this directory.
-                    if key.starts_with(&prefix) {
-                        // Strip the 'path/' part.
-                        let without_prefix: String = key.chars().skip(prefix.len()).collect();
-
-                        // If there is a '/' with path with prefix, this is a subdirectory entry, skip it.
-                        if without_prefix.contains('/') {
-                            None
-                        } else {
-                            Some(without_prefix)
-                        }
-                    } else {
-                        None
-                    }
-                })
-                .collect();
-
-            Ok(entries)
-        } else {
-            Err(Error::new(ErrorKind::NotFound, "Not found"))
-        }
-    }
-
-    fn read(&self, _: XBTransaction, path: &str) -> Result<String, Error> {
-        self.tree
-            .get(path)
-            .map(|entry| entry.value().to_string())
-            .ok_or(Error::new(ErrorKind::NotFound, "Not found"))
-    }
-}
-
-impl XsWrite for MockXs {
-    fn write(&self, _: XBTransaction, path: &str, data: &str) -> Result<(), Error> {
-        self.tree.insert(path.into(), data.into());
-
-        // Create all parents (if needed)
-        // Take all path parts (subdirectory names), and build the path progressively,
-        // creating all missings entries in the tree.
-        path.split('/')
-            .skip(1) // Ignore first entry (empty before root)
-            .fold(String::new(), |mut path, part| {
-                path.push('/');
-                path.push_str(part);
-
-                // Create the directory (if not exists)
-                if self.tree.get(path.as_str()).is_none() {
-                    self.tree.insert(path.clone().into(), "".into());
-                }
-
-                path
-            });
-
-        // Fire any related watcher
-
-        for entry in self.watch_map.iter() {
-            // Make sure it is either the same path or a subdirectory and not
-            // a path in the same directory, with a name that has the same prefix.
-            if entry.0.as_ref() == path || path.starts_with(&format!("{}/", entry.0)) {
-                self.watch_sender
-                    .send(XsWatchEntry {
-                        path: path.into(),
-                        token: entry.1.to_string(),
-                    })
-                    .map_err(|_| Error::new(ErrorKind::BrokenPipe, "Unable to send entry"))?;
-            }
-        }
-
-        Ok(())
-    }
-
-    fn rm(&self, _: XBTransaction, path: &str) -> Result<(), Error> {
-        self.tree.remove(path);
-
-        Ok(())
-    }
-}
-
-impl XsWatch for MockXs {
-    type XsStreamType<'a> = MockStream<'a>
-    where
-        Self: 'a;
-
-    fn watch(&self, path: &str, token: &str) -> Result<(), Error> {
-        self.watch_map.insert((path.into(), token.into()));
-
-        Ok(())
-    }
-
-    fn read_watch(&self) -> Result<Vec<XsWatchEntry>, Error> {
-        let mut watcher = self.watch_reader.blocking_lock();
-
-        Ok(iter::from_fn(|| watcher.try_recv().ok()).collect())
-    }
-
-    fn check_watch(&self) -> Result<Option<XsWatchEntry>, Error> {
-        let mut watcher = self.watch_reader.blocking_lock();
-
-        Ok(watcher.try_recv().ok())
-    }
-
-    fn unwatch(&self, path: &str, token: &str) -> Result<(), Error> {
-        self.watch_map
-            .retain(|entry| !(entry.0.as_ref() == path && entry.1.as_ref() == token));
-
-        Ok(())
-    }
-
-    fn get_stream(&self) -> Result<Self::XsStreamType<'_>, Error> {
-        Ok(MockStream { fake_xs: self })
-    }
-}
-
-#[test]
-
-fn test_watch() {
-    let xs = MockXs::default();
-
-    xs.watch("/test1", "token").unwrap();
-    xs.watch("/test2", "token").unwrap();
-
-    xs.write(XBTransaction::Null, "/test1", "test").unwrap();
-    xs.write(XBTransaction::Null, "/test2", "test").unwrap();
-    xs.write(XBTransaction::Null, "/test2/123", "test").unwrap();
-
-    let watched = xs.read_watch().unwrap();
-    assert!(watched[0].path == "/test1");
-    assert!(watched[1].path == "/test2");
-    assert!(watched[2].path == "/test2/123");
-}
-
-#[test]
-fn test_subdirectories() {
-    let xs = MockXs::default();
-
-    xs.write(XBTransaction::Null, "/1/2/3/4/5", "hello world")
-        .unwrap();
-
-    for path in ["/1", "/1/2", "/1/2/3", "/1/2/3/4", "/1/2/3/4/5"] {
-        xs.read(XBTransaction::Null, path)
-            .expect(&format!("Missing {path}"));
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-common/src/xenstore/mod.rs b/plugins/xcp-metrics-plugin-common/src/xenstore/mod.rs
deleted file mode 100644
index ca36500..0000000
--- a/plugins/xcp-metrics-plugin-common/src/xenstore/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-pub mod mock;
-pub mod read;
-pub mod watch;
-pub mod watch_cache;
-pub mod write;
-
-#[cfg(not(feature = "xenstore-wip"))]
-pub use xenstore_rs as xs;
-
-#[cfg(feature = "xenstore-wip")]
-pub use xenstore_rs_wip as xs;
diff --git a/plugins/xcp-metrics-plugin-common/src/xenstore/read.rs b/plugins/xcp-metrics-plugin-common/src/xenstore/read.rs
deleted file mode 100644
index 7517785..0000000
--- a/plugins/xcp-metrics-plugin-common/src/xenstore/read.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use std::io::Error as IoError;
-
-use super::xs::XBTransaction;
-
-pub trait XsRead {
-    fn directory(&self, transaction: XBTransaction, path: &str) -> Result<Vec<String>, IoError>;
-    fn read(&self, transaction: XBTransaction, path: &str) -> Result<String, IoError>;
-}
-
-impl XsRead for super::xs::Xs {
-    fn directory(&self, transaction: XBTransaction, path: &str) -> Result<Vec<String>, IoError> {
-        self.directory(transaction, path)
-    }
-
-    fn read(&self, transaction: XBTransaction, path: &str) -> Result<String, IoError> {
-        self.read(transaction, path)
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-common/src/xenstore/watch.rs b/plugins/xcp-metrics-plugin-common/src/xenstore/watch.rs
deleted file mode 100644
index 8cee634..0000000
--- a/plugins/xcp-metrics-plugin-common/src/xenstore/watch.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use futures::{Stream, StreamExt};
-use std::io::Error as IoError;
-
-use super::read::XsRead;
-
-#[derive(Debug)]
-pub struct XsWatchEntry {
-    pub path: String,
-    pub token: String,
-}
-
-pub trait XsStreamTrait<'a>: Send + Sync + Stream<Item = XsWatchEntry> + Unpin {}
-
-pub trait XsWatch: XsRead + 'static + Send + Sync {
-    type XsStreamType<'a>: XsStreamTrait<'a>
-    where
-        Self: 'a;
-
-    fn watch(&self, path: &str, token: &str) -> Result<(), IoError>;
-
-    fn read_watch(&self) -> Result<Vec<XsWatchEntry>, IoError>;
-
-    fn check_watch(&self) -> Result<Option<XsWatchEntry>, IoError>;
-
-    fn unwatch(&self, path: &str, token: &str) -> Result<(), IoError>;
-
-    fn get_stream(&self) -> Result<Self::XsStreamType<'_>, IoError>;
-}
-
-#[cfg(feature = "xenstore-wip")]
-impl From<super::xs::XsWatchEntry> for XsWatchEntry {
-    fn from(super::xs::XsWatchEntry { path, token }: super::xs::XsWatchEntry) -> Self {
-        Self { path, token }
-    }
-}
-
-#[cfg(feature = "xenstore-wip")]
-pub struct XsStream<'a>(super::xs::XsStream<'a>);
-
-#[cfg(feature = "xenstore-wip")]
-impl Stream for XsStream<'_> {
-    type Item = XsWatchEntry;
-
-    fn poll_next(
-        mut self: std::pin::Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Option<Self::Item>> {
-        self.0
-            .poll_next_unpin(cx)
-            .map(|poll_result| poll_result.map(Into::into))
-    }
-}
-
-#[cfg(feature = "xenstore-wip")]
-impl XsStreamTrait<'_> for XsStream<'_> {}
-
-#[cfg(feature = "xenstore-wip")]
-impl XsWatch for super::xs::Xs {
-    type XsStreamType<'a> = XsStream<'a>;
-
-    fn watch(&self, path: &str, token: &str) -> Result<(), IoError> {
-        self.watch(path, token)
-    }
-
-    fn read_watch(&self) -> Result<Vec<XsWatchEntry>, IoError> {
-        self.read_watch()
-            .map(|entries| entries.into_iter().map(Into::into).collect())
-    }
-
-    fn check_watch(&self) -> Result<Option<XsWatchEntry>, IoError> {
-        self.check_watch().map(|result| result.map(Into::into))
-    }
-
-    fn unwatch(&self, path: &str, token: &str) -> Result<(), IoError> {
-        self.unwatch(path, token)
-    }
-
-    fn get_stream(&self) -> Result<Self::XsStreamType<'_>, IoError> {
-        Ok(XsStream(self.get_stream()?))
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-common/src/xenstore/watch_cache.rs b/plugins/xcp-metrics-plugin-common/src/xenstore/watch_cache.rs
deleted file mode 100644
index 4cb8575..0000000
--- a/plugins/xcp-metrics-plugin-common/src/xenstore/watch_cache.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-//! A watch-based xenstore cache that tracks specific values.
-use dashmap::DashMap;
-use futures::StreamExt;
-use std::sync::Arc;
-use tokio::{
-    select,
-    sync::mpsc::{self, error::SendError},
-    task::{self, JoinHandle},
-};
-
-use super::{watch::XsWatch, xs::XBTransaction};
-
-/// A Xs watch cache that passively update values.
-pub struct WatchCache {
-    pub cache: Arc<DashMap<String, String>>,
-    pub watch_task: JoinHandle<()>,
-    watch_channel: mpsc::UnboundedSender<String>,
-    unwatch_channel: mpsc::UnboundedSender<String>,
-}
-
-async fn watch_task<XS: XsWatch>(
-    xs: XS,
-    cache: Arc<DashMap<String, String>>,
-    mut watch_channel: mpsc::UnboundedReceiver<String>,
-    mut unwatch_channel: mpsc::UnboundedReceiver<String>,
-) {
-    let xs = Arc::new(xs);
-
-    let watch_task = task::spawn({
-        let cache = cache.clone();
-        let xs = xs.clone();
-
-        async move {
-            let mut stream = xs.get_stream().unwrap();
-
-            while let Some(entry) = stream.next().await {
-                match xs.read(XBTransaction::Null, &entry.path) {
-                    Ok(value) => {
-                        tracing::debug!("Readed {} = {value}", entry.path);
-                        cache.insert(entry.path, value);
-                    }
-                    Err(e) => {
-                        tracing::debug!("Removed {} ({e})", entry.path);
-                        cache.remove(&entry.path);
-                    }
-                }
-            }
-        }
-    });
-
-    let watch_channel_task = task::spawn({
-        let xs = xs.clone();
-
-        async move {
-            while let Some(to_watch) = watch_channel.recv().await {
-                tracing::debug!("Watching {to_watch}");
-                xs.watch(&to_watch, "xcp-metrics-xenstored").ok();
-            }
-        }
-    });
-
-    let unwatch_channel_task = task::spawn({
-        let xs = xs.clone();
-
-        async move {
-            while let Some(to_unwatch) = unwatch_channel.recv().await {
-                tracing::debug!("Unwatching {to_unwatch}");
-                xs.unwatch(&to_unwatch, "xcp-metrics-xenstored").ok();
-                cache.remove(&to_unwatch);
-            }
-        }
-    });
-
-    select! {
-        _ = watch_task => {},
-        _ = watch_channel_task => {},
-        _ = unwatch_channel_task => {},
-    };
-}
-
-impl WatchCache {
-    pub fn new<XS: XsWatch>(xs: XS) -> Self {
-        let cache = Arc::new(DashMap::new());
-        let (watch_sender, watch_receiver) = mpsc::unbounded_channel();
-        let (unwatch_sender, unwatch_receiver) = mpsc::unbounded_channel();
-
-        let watch_cache = cache.clone();
-        let watch_task = task::spawn(async move {
-            watch_task(xs, watch_cache, watch_receiver, unwatch_receiver).await
-        });
-
-        Self {
-            cache,
-            watch_task,
-            watch_channel: watch_sender,
-            unwatch_channel: unwatch_sender,
-        }
-    }
-
-    pub fn watch(&self, path: &str) -> Result<(), SendError<String>> {
-        self.watch_channel.send(path.to_string())
-    }
-
-    pub fn unwatch(&self, path: &str) -> Result<(), SendError<String>> {
-        self.unwatch_channel.send(path.to_string())
-    }
-
-    pub fn read(&self, path: &str) -> Option<String> {
-        self.cache.get(path).map(|value| value.clone())
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-common/src/xenstore/write.rs b/plugins/xcp-metrics-plugin-common/src/xenstore/write.rs
deleted file mode 100644
index b040d97..0000000
--- a/plugins/xcp-metrics-plugin-common/src/xenstore/write.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use std::io::Error as IoError;
-
-use super::xs::XBTransaction;
-
-pub trait XsWrite {
-    fn write(&self, transaction: XBTransaction, path: &str, data: &str) -> Result<(), IoError>;
-
-    fn rm(&self, transaction: XBTransaction, path: &str) -> Result<(), IoError>;
-}
-
-#[cfg(feature = "xenstore-wip")]
-impl XsWrite for super::xs::Xs {
-    fn write(&self, transaction: XBTransaction, path: &str, data: &str) -> Result<(), IoError> {
-        self.write(transaction, path, data)
-    }
-
-    fn rm(&self, transaction: XBTransaction, path: &str) -> Result<(), IoError> {
-        self.rm(transaction, path)
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-procfs/Cargo.toml b/plugins/xcp-metrics-plugin-procfs/Cargo.toml
deleted file mode 100644
index f3c11bc..0000000
--- a/plugins/xcp-metrics-plugin-procfs/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "xcp-metrics-plugin-procfs"
-description = "Processes monitoring plugin"
-version.workspace = true
-license = "AGPL-3.0-only"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-xcp-metrics-common = { path = "../../xcp-metrics-common" }
-xcp-metrics-plugin-common = { path = "../xcp-metrics-plugin-common" }
-
-tokio = { version = "1", features = ["full"] }
-uuid = "1.4"
-anyhow = "1.0"
-maplit = "1.0"
\ No newline at end of file
diff --git a/plugins/xcp-metrics-plugin-procfs/src/main.rs b/plugins/xcp-metrics-plugin-procfs/src/main.rs
deleted file mode 100644
index e856fa1..0000000
--- a/plugins/xcp-metrics-plugin-procfs/src/main.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use std::{collections::HashMap, fs, time::Duration};
-use tokio::time;
-
-use xcp_metrics_common::metrics::{Label, MetricType, MetricValue};
-use xcp_metrics_plugin_common::protocol_v3::{
-    utils::{SimpleMetric, SimpleMetricFamily, SimpleMetricSet},
-    MetricsPlugin,
-};
-
-fn generate_metrics() -> SimpleMetricSet {
-    let pids = fs::read_dir("/proc")
-        .expect("Unable to read /proc")
-        .filter_map(|entry| entry.ok())
-        .filter_map(|dir| {
-            // Filter pids
-            let file_name = dir.file_name();
-            let raw_pid = file_name.to_string_lossy();
-
-            raw_pid
-                .chars()
-                .all(|c| c.is_ascii_digit())
-                .then(|| (raw_pid.to_string(), dir.path().to_path_buf()))
-        })
-        .collect::<Vec<_>>();
-
-    let mut families: HashMap<String, SimpleMetricFamily> = HashMap::new();
-
-    families.insert(
-        "process_path".into(),
-        SimpleMetricFamily {
-            metric_type: MetricType::Info,
-            unit: "".into(),
-            help: "Process informations".into(),
-            metrics: pids
-                .iter()
-                .map(|(pid, path)| SimpleMetric {
-                    labels: vec![Label("pid".into(), pid.to_owned().into())],
-                    value: MetricValue::Info(
-                        vec![Label(
-                            "cmdline".into(),
-                            fs::read_to_string(path.join("cmdline"))
-                                .unwrap_or_default()
-                                .into(),
-                        )]
-                        .into(),
-                    ),
-                })
-                .collect(),
-        },
-    );
-
-    SimpleMetricSet { families }
-}
-
-#[tokio::main]
-async fn main() {
-    let metrics = generate_metrics();
-
-    let plugin = MetricsPlugin::new("xcp-metrics-plugin-procfs", metrics.clone().into(), None)
-        .await
-        .unwrap();
-
-    // Expose protocol v2
-    loop {
-        // Fetch and push new metrics.
-        plugin.update(generate_metrics().into()).await.unwrap();
-
-        time::sleep(Duration::from_secs(1)).await;
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-squeezed/Cargo.toml b/plugins/xcp-metrics-plugin-squeezed/Cargo.toml
deleted file mode 100644
index 0cbfe07..0000000
--- a/plugins/xcp-metrics-plugin-squeezed/Cargo.toml
+++ /dev/null
@@ -1,31 +0,0 @@
-[package]
-name = "xcp-metrics-plugin-squeezed"
-edition = "2021"
-version.workspace = true
-repository.workspace = true
-categories.workspace = true
-license = "AGPL-3.0-only"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-xcp-metrics-common = { path = "../../xcp-metrics-common" }
-xcp-metrics-plugin-common = { path = "../xcp-metrics-plugin-common", features = ["xenstore"] }
-
-uuid = "1.4"
-anyhow = "1.0"
-dashmap = "5.5"
-futures = "0.3"
-maplit = "1.0"
-
-tracing = "0.1"
-tracing-subscriber = "0.3"
-
-tokio = { version = "1", features = ["full"] }
-
-[dependencies.clap]
-version = "4.3"
-features = ["derive"]
-
-[dev-dependencies]
-serde_json = "1.0"
\ No newline at end of file
diff --git a/plugins/xcp-metrics-plugin-squeezed/src/main.rs b/plugins/xcp-metrics-plugin-squeezed/src/main.rs
deleted file mode 100644
index 0b4453f..0000000
--- a/plugins/xcp-metrics-plugin-squeezed/src/main.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-#[cfg(test)]
-mod test;
-
-use std::{collections::HashMap, path::PathBuf};
-
-use clap::Parser;
-use maplit::hashmap;
-
-use xcp_metrics_common::metrics::{MetricType, MetricValue, NumberValue};
-use xcp_metrics_plugin_common::{
-    plugin::{run_hybrid, XcpPlugin},
-    protocol_v3::utils::{SimpleMetric, SimpleMetricFamily, SimpleMetricSet},
-    xenstore::{
-        read::XsRead,
-        xs::{XBTransaction, Xs, XsOpenFlags},
-    },
-};
-
-/// xcp-metrics Squeezed plugin.
-#[derive(Clone, Parser, Debug)]
-#[command(author, version, about, long_about = None)]
-struct Args {
-    /// Logging level
-    #[arg(short, long, default_value_t = tracing::Level::INFO)]
-    log_level: tracing::Level,
-
-    /// Target daemon.
-    #[arg(short, long)]
-    target: Option<PathBuf>,
-
-    /// Used protocol
-    #[arg(short, long)]
-    protocol: Option<u32>,
-}
-
-#[derive(Debug, PartialEq)]
-pub struct SqueezedInfo {
-    /// Host memory reclaimed by squeezed.
-    /// dynamic_max - target
-    pub reclaimed: u32,
-    /// Host memory that could be reclaimed by squeezed.
-    /// target - dynamic_min
-    pub reclaimed_max: u32,
-}
-
-impl SqueezedInfo {
-    pub fn get<XS: XsRead>(xs: &XS) -> anyhow::Result<Self> {
-        let (reclaimed, reclaimed_max) = xs
-            // Get the list of domains.
-            .directory(XBTransaction::Null, "/local/domain")?
-            .iter()
-            // Read all values, filtering out domains that have any value missing.
-            .filter_map(|domid| {
-                xs.read(
-                    XBTransaction::Null,
-                    format!("/local/domain/{domid}/memory/target").as_str(),
-                )
-                .ok()
-                .zip(
-                    xs.read(
-                        XBTransaction::Null,
-                        format!("/local/domain/{domid}/memory/dynamic-min").as_str(),
-                    )
-                    .ok(),
-                )
-                .zip(
-                    xs.read(
-                        XBTransaction::Null,
-                        format!("/local/domain/{domid}/memory/dynamic-max").as_str(),
-                    )
-                    .ok(),
-                )
-            })
-            // Parse values.
-            .filter_map(|((target, dynamic_min), dynamic_max)| {
-                target
-                    .parse::<u32>()
-                    .ok()
-                    .zip(dynamic_min.parse::<u32>().ok())
-                    .zip(dynamic_max.parse::<u32>().ok())
-            })
-            // Compute reclaimed and reclaimed_max based on iterator values.
-            .fold(
-                (0u32, 0u32),
-                |(reclaimed, reclaimed_max), ((target, dynamic_min), dynamic_max)| {
-                    (
-                        (reclaimed + dynamic_max - target),
-                        reclaimed_max + target - dynamic_min,
-                    )
-                },
-            );
-
-        Ok(SqueezedInfo {
-            reclaimed,
-            reclaimed_max,
-        })
-    }
-}
-
-pub struct SqueezedPlugin<XS: XsRead> {
-    xs: XS,
-}
-
-impl<XS: XsRead> XcpPlugin for SqueezedPlugin<XS> {
-    fn update(&mut self) {}
-
-    fn generate_metrics(&mut self) -> SimpleMetricSet {
-        let Ok(SqueezedInfo {
-            reclaimed,
-            reclaimed_max,
-        }) = SqueezedInfo::get(&self.xs)
-        else {
-            // No data
-            tracing::warn!("No /local/domain found");
-            return SimpleMetricSet {
-                families: hashmap! {},
-            };
-        };
-
-        SimpleMetricSet {
-            families: hashmap! {
-            "memory_reclaimed".into() =>
-                SimpleMetricFamily {
-                    metric_type: MetricType::Gauge,
-                    unit: "B".into(),
-                    help: "Host memory reclaimed by squeezed".into(),
-                    metrics: vec![SimpleMetric {
-                        labels: vec![],
-                        // KiB to Bytes
-                        value: MetricValue::Gauge(NumberValue::Int64((reclaimed * 1024) as _)),
-                    }],
-                },
-            "memory_reclaimed_max".into() =>
-                SimpleMetricFamily {
-                    metric_type: MetricType::Gauge,
-                    unit: "B".into(),
-                    help: "Host memory that could be reclaimed by squeezed".into(),
-                    metrics: vec![SimpleMetric {
-                        labels: vec![],
-                        // KiB to Bytes
-                        value: MetricValue::Gauge(NumberValue::Int64((reclaimed_max * 1024) as _)),
-                    }],
-                }
-            },
-        }
-    }
-
-    fn get_name(&self) -> &str {
-        "xcp-metrics-plugin-squeezed"
-    }
-
-    fn get_mappings(
-        &self,
-    ) -> Option<HashMap<Box<str>, xcp_metrics_common::utils::mapping::CustomMapping>> {
-        None
-    }
-}
-
-#[tokio::main]
-async fn main() {
-    let args = Args::parse();
-
-    let text_subscriber = tracing_subscriber::fmt()
-        .with_ansi(true)
-        .with_max_level(args.log_level)
-        .compact()
-        .finish();
-
-    tracing::subscriber::set_global_default(text_subscriber).unwrap();
-
-    let xs = match Xs::new(XsOpenFlags::ReadOnly) {
-        Ok(xs) => xs,
-        Err(e) => {
-            tracing::error!("Unable to initialize XenStore {e}");
-            return;
-        }
-    };
-
-    let plugin = SqueezedPlugin { xs };
-
-    run_hybrid(plugin, args.target.as_deref(), args.protocol).await;
-}
diff --git a/plugins/xcp-metrics-plugin-squeezed/src/rrdp-squeezed.service b/plugins/xcp-metrics-plugin-squeezed/src/rrdp-squeezed.service
deleted file mode 100644
index 08a8e49..0000000
--- a/plugins/xcp-metrics-plugin-squeezed/src/rrdp-squeezed.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=XCP-metrics RRD daemon squeezed plugin
-After=xcp-rrdd.service
-Requires=xcp-rrdd.service
-Conflicts=xcp-rrdd-squeezed.service
-
-[Service]
-ExecStart=/opt/xensource/libexec/xcp-rrdd-plugins/rrdp-squeezed
-StandardError=null
-# restart but fail if more than 5 failures in 30s
-Restart=on-failure
-StartLimitBurst=5
-StartLimitInterval=30s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/plugins/xcp-metrics-plugin-squeezed/src/test.rs b/plugins/xcp-metrics-plugin-squeezed/src/test.rs
deleted file mode 100644
index f3f0345..0000000
--- a/plugins/xcp-metrics-plugin-squeezed/src/test.rs
+++ /dev/null
@@ -1,190 +0,0 @@
-use std::{io::Read, iter};
-
-use xcp_metrics_common::rrdd::{
-    protocol_common::DataSourceValue,
-    protocol_v2::{self, values_to_raw, RrddMessageHeader, RrddMetadata},
-};
-use xcp_metrics_plugin_common::{
-    bridge::v3_to_v2::BridgeToV2,
-    plugin::XcpPlugin,
-    xenstore::{mock::MockXs, write::XsWrite, xs::XBTransaction},
-};
-
-use crate::{SqueezedInfo, SqueezedPlugin};
-
-#[test]
-fn no_vm() {
-    // No virtual machine : all 0
-    let xs = MockXs::default();
-
-    xs.write(XBTransaction::Null, "/local/domain", "").unwrap();
-
-    assert_eq!(
-        SqueezedInfo::get(&xs).unwrap(),
-        SqueezedInfo {
-            reclaimed: 0,
-            reclaimed_max: 0
-        }
-    );
-}
-
-#[test]
-fn single_vm() {
-    let xs = MockXs::default();
-
-    xs.write(
-        XBTransaction::Null,
-        "/local/domain/0/memory/target",
-        "123456",
-    )
-    .unwrap();
-    xs.write(
-        XBTransaction::Null,
-        "/local/domain/0/memory/dynamic-min",
-        "0",
-    )
-    .unwrap();
-    xs.write(
-        XBTransaction::Null,
-        "/local/domain/0/memory/dynamic-max",
-        "654321",
-    )
-    .unwrap();
-
-    assert_eq!(
-        SqueezedInfo::get(&xs).unwrap(),
-        SqueezedInfo {
-            reclaimed: 530865,
-            reclaimed_max: 123456
-        }
-    );
-}
-
-#[test]
-fn multiple_vm() {
-    let xs = MockXs::default();
-
-    xs.write(
-        XBTransaction::Null,
-        "/local/domain/0/memory/target",
-        "123456",
-    )
-    .unwrap();
-    xs.write(
-        XBTransaction::Null,
-        "/local/domain/0/memory/dynamic-min",
-        "0",
-    )
-    .unwrap();
-    xs.write(
-        XBTransaction::Null,
-        "/local/domain/0/memory/dynamic-max",
-        "654321",
-    )
-    .unwrap();
-
-    // Consider missing domain 1.
-
-    xs.write(
-        XBTransaction::Null,
-        "/local/domain/2/memory/target",
-        "111111",
-    )
-    .unwrap();
-    xs.write(
-        XBTransaction::Null,
-        "/local/domain/2/memory/dynamic-min",
-        "0",
-    )
-    .unwrap();
-    xs.write(
-        XBTransaction::Null,
-        "/local/domain/2/memory/dynamic-max",
-        "999999",
-    )
-    .unwrap();
-
-    assert_eq!(
-        SqueezedInfo::get(&xs).unwrap(),
-        SqueezedInfo {
-            reclaimed: 530865 + 888888,
-            reclaimed_max: 123456 + 111111
-        }
-    );
-}
-
-#[test]
-fn test_export() {
-    let xs = MockXs::default();
-
-    // /local/domain is needed for squeezed plugin to work properly
-    // Having this entry missing will create warnings and no families at the end.
-    xs.write(XBTransaction::Null, "/local/domain", "").unwrap();
-
-    xs.write(XBTransaction::Null, "/local/domain/0", "")
-        .unwrap();
-    xs.write(
-        XBTransaction::Null,
-        "/local/domain/2/memory/dynamic-max",
-        "1048576",
-    )
-    .unwrap();
-    xs.write(
-        XBTransaction::Null,
-        "/local/domain/2/memory/dynamic-min",
-        "524288",
-    )
-    .unwrap();
-    xs.write(
-        XBTransaction::Null,
-        "/local/domain/2/memory/target",
-        "1048576",
-    )
-    .unwrap();
-
-    let mut plugin = SqueezedPlugin { xs };
-
-    let mut bridge = BridgeToV2::new();
-    bridge.update(plugin.generate_metrics().into());
-
-    let metadata = bridge.get_metadata();
-    let data = bridge.get_data();
-
-    // Generate a rrdd header
-    let (header, _) = RrddMessageHeader::generate(&values_to_raw(&data), metadata.clone());
-
-    // Read a reference one generated with rrdp-squeezed
-    let reference_payload = &mut include_bytes!("../tests/xcp-rrdd-squeezed").as_slice();
-    let reference_header = protocol_v2::RrddMessageHeader::parse_from(reference_payload).unwrap();
-
-    let metadata_part = Read::take(reference_payload, reference_header.metadata_length as u64);
-    let mut reference_metadata: RrddMetadata = serde_json::from_reader(metadata_part).unwrap();
-
-    // Normalize reference datasource values (they are not used in protocol v2).
-    reference_metadata
-        .datasources
-        .iter_mut()
-        .for_each(|(_, ds)| ds.value = DataSourceValue::Int64(0));
-
-    // Check if metadata matches
-    assert_eq!(metadata, &reference_metadata);
-
-    // Check if values matches.
-    // Order may not be the same between xcp-rrdd-squeezed and this plugin (due to some hashmap randomness).
-    // We need to compare each values, regardless of the order.
-    iter::zip(
-        reference_metadata.datasources.iter(),
-        reference_header.values.iter(),
-    )
-    .for_each(|((reference_name, _), reference_raw_value)| {
-        // Get matching raw value in generated data.
-        let value = iter::zip(metadata.datasources.iter(), header.values.iter())
-            // Get matching value
-            .find(|((name, _), _)| reference_name.as_ref() == name.as_ref())
-            // Convert DataSourceValue into raw bytes.
-            .map(|(_, value)| value)
-            .expect(&format!("Missing name {reference_name}"));
-
-        assert_eq!(value, reference_raw_value, "{reference_name} differs");
-    });
-}
diff --git a/plugins/xcp-metrics-plugin-squeezed/tests/xcp-rrdd-squeezed b/plugins/xcp-metrics-plugin-squeezed/tests/xcp-rrdd-squeezed
deleted file mode 100644
index a58ac62..0000000
Binary files a/plugins/xcp-metrics-plugin-squeezed/tests/xcp-rrdd-squeezed and /dev/null differ
diff --git a/plugins/xcp-metrics-plugin-tests/Cargo.toml b/plugins/xcp-metrics-plugin-tests/Cargo.toml
deleted file mode 100644
index 82cf409..0000000
--- a/plugins/xcp-metrics-plugin-tests/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "xcp-metrics-plugin-tests"
-description = "xcp-metrics test plugins"
-version.workspace = true
-license = "AGPL-3.0-only"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-xcp-metrics-common = { path = "../../xcp-metrics-common" }
-xcp-metrics-plugin-common = { path = "../xcp-metrics-plugin-common" }
-
-tokio = { version = "1", features = ["full"] }
-uuid = "1.4"
-anyhow = "1.0"
-fastrand = "2.0"
\ No newline at end of file
diff --git a/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-basic.rs b/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-basic.rs
deleted file mode 100644
index cce1955..0000000
--- a/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-basic.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use std::time::Duration;
-use tokio::time;
-
-use xcp_metrics_common::rrdd::{
-    protocol_common::{DataSourceMetadata, DataSourceOwner, DataSourceType, DataSourceValue},
-    protocol_v2::{indexmap::indexmap, RrddMetadata},
-};
-use xcp_metrics_plugin_common::protocol_v2::RrddPlugin;
-
-#[tokio::main]
-async fn main() {
-    let metadata = RrddMetadata {
-        datasources: indexmap! {
-            "life".into() => DataSourceMetadata {
-                description: "Answer to the Ultimate Question of Life, The Universe, and Everything".into(),
-                units: "everything".into(),
-                ds_type: DataSourceType::Absolute,
-                value: DataSourceValue::Int64(42),
-                min: 42.0,
-                max: 42.0,
-                owner: DataSourceOwner::Host,
-                default: true,
-            },
-            "pi".into() => DataSourceMetadata {
-                description: "The PI number".into(),
-                units: "rad".into(),
-                ds_type: DataSourceType::Absolute,
-                value: DataSourceValue::Float(std::f64::consts::PI),
-                min: 3.0,
-                max: 4.0,
-                owner: DataSourceOwner::Host,
-                default: true,
-            }
-        },
-    };
-
-    let values = [
-        DataSourceValue::Int64(42),
-        DataSourceValue::Float(std::f64::consts::PI),
-    ];
-
-    let mut plugin = RrddPlugin::new("xcp-metrics-plugin-basic", metadata, Some(&values), None)
-        .await
-        .unwrap();
-
-    // Expose protocol v2
-    loop {
-        // Update sources
-        plugin.update_values(&values).await.unwrap();
-        time::sleep(Duration::from_secs(1)).await;
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-characters.rs b/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-characters.rs
deleted file mode 100644
index ebcc7a4..0000000
--- a/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-characters.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use std::time::Duration;
-use tokio::time;
-
-use xcp_metrics_common::rrdd::{
-    protocol_common::{DataSourceMetadata, DataSourceOwner, DataSourceType, DataSourceValue},
-    protocol_v2::{indexmap::indexmap, RrddMetadata},
-};
-use xcp_metrics_plugin_common::protocol_v2::RrddPlugin;
-
-#[tokio::main]
-async fn main() {
-    let metadata = RrddMetadata {
-        datasources: indexmap! {
-            "some_imaginary_cpu_usage".into() => DataSourceMetadata {
-                description: "Some value".into(),
-                units: "(fraction)".into(),
-                ds_type: DataSourceType::Absolute,
-                value: DataSourceValue::Float(50.0),
-                min: 0.0,
-                max: 100.0,
-                owner: DataSourceOwner::Host,
-                default: true,
-            },
-            "another thing".into() => DataSourceMetadata {
-                description: "Another Value".into(),
-                units: "a-b-c".into(),
-                ds_type: DataSourceType::Absolute,
-                value: DataSourceValue::Float(std::f64::consts::PI),
-                min: 3.0,
-                max: 4.0,
-                owner: DataSourceOwner::Host,
-                default: true,
-            }
-        },
-    };
-
-    let values = [
-        DataSourceValue::Int64(42),
-        DataSourceValue::Float(std::f64::consts::PI),
-    ];
-
-    let mut plugin = RrddPlugin::new(
-        "xcp-metrics-plugin-characters",
-        metadata,
-        Some(&values),
-        None,
-    )
-    .await
-    .unwrap();
-
-    // Expose protocol v2
-    loop {
-        // Update sources
-        plugin.update_values(&values).await.unwrap();
-        time::sleep(Duration::from_secs(1)).await;
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-deregister.rs b/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-deregister.rs
deleted file mode 100644
index 8db5923..0000000
--- a/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-deregister.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use std::time::Duration;
-use tokio::time;
-
-use xcp_metrics_common::rrdd::{
-    protocol_common::{DataSourceMetadata, DataSourceOwner, DataSourceType, DataSourceValue},
-    protocol_v2::{indexmap::indexmap, RrddMetadata},
-};
-use xcp_metrics_plugin_common::protocol_v2::RrddPlugin;
-
-#[tokio::main]
-async fn main() {
-    let metadata = RrddMetadata {
-        datasources: indexmap! {
-            "life".into() => DataSourceMetadata {
-                description: "Answer to the Ultimate Question of Life, The Universe, and Everything".into(),
-                units: "everything".into(),
-                ds_type: DataSourceType::Absolute,
-                value: DataSourceValue::Int64(42),
-                min: 42.0,
-                max: 42.0,
-                owner: DataSourceOwner::Host,
-                default: true,
-            },
-            "pi".into() => DataSourceMetadata {
-                description: "The PI number".into(),
-                units: "rad".into(),
-                ds_type: DataSourceType::Absolute,
-                value: DataSourceValue::Float(std::f64::consts::PI),
-                min: 3.0,
-                max: 4.0,
-                owner: DataSourceOwner::Host,
-                default: true,
-            }
-        },
-    };
-
-    let values = [
-        DataSourceValue::Int64(42),
-        DataSourceValue::Float(std::f64::consts::PI),
-    ];
-
-    let mut plugin = RrddPlugin::new(
-        "xcp-metrics-plugin-deregister",
-        metadata,
-        Some(&values),
-        None,
-    )
-    .await
-    .unwrap();
-
-    // Expose protocol v2
-    // Update sources
-    plugin.update_values(&values).await.unwrap();
-
-    println!("Wait 10 seconds before plugin gets terminated...");
-    time::sleep(Duration::from_secs(10)).await;
-
-    plugin.deregister_plugin().await
-}
diff --git a/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-sin.rs b/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-sin.rs
deleted file mode 100644
index 17279c7..0000000
--- a/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-sin.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use std::time::Duration;
-use tokio::time::{self, Instant};
-
-use xcp_metrics_common::rrdd::{
-    protocol_common::{DataSourceMetadata, DataSourceOwner, DataSourceType, DataSourceValue},
-    protocol_v2::{indexmap::indexmap, RrddMetadata},
-};
-use xcp_metrics_plugin_common::protocol_v2::RrddPlugin;
-
-#[tokio::main]
-async fn main() {
-    let metadata = RrddMetadata {
-        datasources: indexmap! {
-            "sin".into() => DataSourceMetadata {
-                description: "A variation over time".into(),
-                units: "number".into(),
-                ds_type: DataSourceType::Gauge,
-                value: DataSourceValue::Float(0.0),
-                min: -1.0,
-                max: 1.0,
-                owner: DataSourceOwner::Host,
-                default: true,
-            }
-        },
-    };
-
-    let mut values = [DataSourceValue::Float(0.0)];
-    let time = Instant::now();
-
-    let mut plugin = RrddPlugin::new("xcp-metrics-plugin-sin", metadata, Some(&values), None)
-        .await
-        .unwrap();
-
-    // Expose protocol v2
-    loop {
-        // Update sources
-        values[0] = DataSourceValue::Float(f64::sin(time.elapsed().as_secs_f64()));
-
-        plugin.update_values(&values).await.unwrap();
-        time::sleep(Duration::from_secs(1)).await;
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-varying.rs b/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-varying.rs
deleted file mode 100644
index ff1c857..0000000
--- a/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v2-varying.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use std::io;
-
-use xcp_metrics_common::rrdd::{
-    protocol_common::{DataSourceMetadata, DataSourceOwner, DataSourceType, DataSourceValue},
-    protocol_v2::{
-        indexmap::{indexmap, IndexMap},
-        RrddMetadata,
-    },
-};
-use xcp_metrics_plugin_common::protocol_v2::RrddPlugin;
-
-#[tokio::main]
-async fn main() {
-    // Expose protocol v2
-    let metadata = RrddMetadata {
-        datasources: indexmap!(),
-    };
-    let values = [];
-
-    let mut plugin = RrddPlugin::new("xcp-metrics-plugin-varying", metadata, Some(&values), None)
-        .await
-        .unwrap();
-
-    loop {
-        // Generate some random datasources
-        let datasources: IndexMap<Box<str>, DataSourceMetadata> = (0..fastrand::usize(..10))
-            .map(|i| {
-                (
-                    format!("m{i}_{}", uuid::Uuid::new_v4().as_simple()).into_boxed_str(),
-                    DataSourceMetadata {
-                        description: format!("Test metric {i}").into(),
-                        units: "".into(),
-                        ds_type: DataSourceType::Gauge,
-                        value: DataSourceValue::Int64(0),
-                        min: 0.0,
-                        max: f32::INFINITY,
-                        owner: DataSourceOwner::Host,
-                        default: true,
-                    },
-                )
-            })
-            .collect();
-
-        let values: Vec<DataSourceValue> = datasources
-            .iter()
-            .map(|_| DataSourceValue::Int64(fastrand::i64(0..)))
-            .collect();
-
-        let metadata = RrddMetadata { datasources };
-
-        println!("Values: {values:#?}");
-        println!("Metadata: {metadata:#?}");
-
-        // Update sources
-        plugin
-            .reset_metadata(metadata, Some(&values))
-            .await
-            .unwrap();
-
-        println!("Press a key to reset values and metadata");
-        io::stdin().read_line(&mut String::default()).unwrap();
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v3-basic.rs b/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v3-basic.rs
deleted file mode 100644
index 833f6ad..0000000
--- a/plugins/xcp-metrics-plugin-tests/src/bin/xcp-metrics-plugin-v3-basic.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use std::time::Duration;
-use tokio::time;
-
-use xcp_metrics_common::metrics::{MetricType, MetricValue, NumberValue};
-use xcp_metrics_plugin_common::protocol_v3::{
-    utils::{SimpleMetric, SimpleMetricFamily, SimpleMetricSet},
-    MetricsPlugin,
-};
-
-#[tokio::main]
-async fn main() {
-    let metrics = SimpleMetricSet {
-        families: [
-            (
-                "life".to_string(),
-                SimpleMetricFamily {
-                    unit: "everything".into(),
-                    help: "Answer to the Ultimate Question of Life, The Universe, and Everything"
-                        .into(),
-                    metric_type: MetricType::Gauge,
-                    metrics: vec![SimpleMetric {
-                        labels: vec![],
-                        value: MetricValue::Gauge(NumberValue::Int64(42)),
-                    }],
-                },
-            ),
-            (
-                "pi".to_string(),
-                SimpleMetricFamily {
-                    unit: "rad".into(),
-                    help: "The PI number".into(),
-                    metric_type: MetricType::Gauge,
-                    metrics: vec![SimpleMetric {
-                        labels: vec![],
-                        value: MetricValue::Gauge(NumberValue::Double(std::f64::consts::PI)),
-                    }],
-                },
-            ),
-        ]
-        .into_iter()
-        .collect(),
-    };
-
-    let plugin = MetricsPlugin::new("xcp-metrics-plugin-basic", metrics.clone().into(), None)
-        .await
-        .unwrap();
-
-    // Expose protocol v2
-    loop {
-        // Update sources
-        plugin.update(metrics.clone().into()).await.unwrap();
-        time::sleep(Duration::from_secs(1)).await;
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-xen-v2/Cargo.toml b/plugins/xcp-metrics-plugin-xen-v2/Cargo.toml
deleted file mode 100644
index c5d6a81..0000000
--- a/plugins/xcp-metrics-plugin-xen-v2/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "xcp-metrics-plugin-xen-v2"
-description = "Xen monitoring rrdd-compatible plugin"
-version.workspace = true
-license = "AGPL-3.0-only"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-xcp-metrics-common = { path = "../../xcp-metrics-common" }
-xcp-metrics-plugin-common = { path = "../xcp-metrics-plugin-common" }
-xenctrl = { git = "https://github.com/TSnake41/xenctrl", branch = "more_functions" }
-xenctrl-sys = "*"
-
-uuid = "1.4"
-anyhow = "1.0"
-
-tokio = { version = "1", features = ["full"] }
\ No newline at end of file
diff --git a/plugins/xcp-metrics-plugin-xen-v2/src/main.rs b/plugins/xcp-metrics-plugin-xen-v2/src/main.rs
deleted file mode 100644
index 843cad8..0000000
--- a/plugins/xcp-metrics-plugin-xen-v2/src/main.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-mod metrics;
-
-use metrics::{discover_xen_metrics, XenMetric, XenMetricsShared};
-use std::{iter, time::Duration};
-use tokio::time;
-
-use xcp_metrics_common::rrdd::{
-    protocol_common::{DataSourceMetadata, DataSourceValue},
-    protocol_v2::{indexmap::IndexMap, RrddMetadata},
-};
-use xcp_metrics_plugin_common::protocol_v2::RrddPlugin;
-use xenctrl::XenControl;
-
-pub struct XenMetricsStatus {
-    pub dom_count: u32,
-}
-
-/// Recreate a new metadata with new XenMetric objects.
-fn regenerate_data_sources(
-    shared: &XenMetricsShared,
-) -> (Box<[Box<dyn XenMetric>]>, RrddMetadata, XenMetricsStatus) {
-    let (metrics, status) = discover_xen_metrics(shared);
-
-    let datasources: IndexMap<Box<str>, DataSourceMetadata> = metrics
-        .iter()
-        .map(|metric| {
-            (
-                metric.get_name().into(),
-                metric.generate_metadata().unwrap_or_default(),
-            )
-        })
-        .collect();
-
-    (metrics, RrddMetadata { datasources }, status)
-}
-
-/// Create a array of values from XenMetric objects.
-fn generate_values(sources: &mut [Box<dyn XenMetric>]) -> Box<[DataSourceValue]> {
-    sources.iter().map(|src| src.get_value()).collect()
-}
-
-/// Replace the values with new ones from XenMetric objects.
-fn generate_values_inplace(sources: &mut [Box<dyn XenMetric>], values: &mut [DataSourceValue]) {
-    iter::zip(sources.iter(), values.iter_mut()).for_each(|(src, val)| *val = src.get_value());
-}
-
-/// Check for new domains.
-fn check_new_metrics(xc: &XenControl, status: &XenMetricsStatus) -> bool {
-    // Check next domain
-    matches!(xc.domain_getinfo(status.dom_count + 1), Ok(Some(_)))
-}
-
-#[tokio::main]
-async fn main() {
-    let xc = xenctrl::XenControl::default().unwrap();
-    let mut shared = XenMetricsShared::new(&xc);
-
-    let (mut sources, mut metadata, mut status) = regenerate_data_sources(&shared);
-
-    sources.iter_mut().for_each(|src| {
-        src.update(&shared, &xc); // assume success
-    });
-
-    // NOTE: some could be undefined values
-    let mut values = generate_values(&mut sources);
-
-    let mut plugin = RrddPlugin::new("xcp-metrics-plugin-xen", metadata, Some(&values), None)
-        .await
-        .unwrap();
-
-    // Expose protocol v2
-    loop {
-        // Update sources
-        println!("Update sources");
-        shared.update(&xc);
-
-        if check_new_metrics(&xc, &status)
-            || sources
-                .iter_mut()
-                .map(|src| src.update(&shared, &xc))
-                .any(|b| !b)
-        {
-            println!("Rediscovering metrics...");
-
-            // New metrics found or an update has failed, rediscover and regenerate metadata.
-            (sources, metadata, status) = regenerate_data_sources(&shared);
-
-            sources.iter_mut().for_each(|src| {
-                src.update(&shared, &xc); // assume success
-            });
-
-            let values = generate_values(&mut sources);
-            println!("Values vector: {values:?}");
-
-            plugin
-                .reset_metadata(metadata, Some(&values))
-                .await
-                .unwrap();
-        } else {
-            // Update
-            generate_values_inplace(&mut sources, &mut values);
-        }
-
-        plugin.update_values(&values).await.unwrap();
-        time::sleep(Duration::from_secs(1)).await;
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-xen-v2/src/metrics/domain.rs b/plugins/xcp-metrics-plugin-xen-v2/src/metrics/domain.rs
deleted file mode 100644
index f65d817..0000000
--- a/plugins/xcp-metrics-plugin-xen-v2/src/metrics/domain.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use std::{borrow::Cow, time::Instant};
-
-use xcp_metrics_common::rrdd::protocol_common::{
-    DataSourceMetadata, DataSourceOwner, DataSourceType, DataSourceValue,
-};
-use xenctrl::XenControl;
-use xenctrl_sys::{xc_dominfo_t, xc_vcpuinfo_t};
-
-use crate::XenMetric;
-
-use super::{XenMetricsShared, XEN_PAGE_SIZE};
-
-pub struct VCpuTime {
-    vcpuid: u32,
-    domid: u32,
-    dom_uuid: uuid::Uuid,
-    current_vcpu: Option<(xc_vcpuinfo_t, Instant)>,
-    previous_vcpu: Option<(xc_vcpuinfo_t, Instant)>,
-    name: Box<str>,
-}
-
-impl VCpuTime {
-    pub fn new(vcpuid: u32, domid: u32, dom_uuid: uuid::Uuid) -> Self {
-        Self {
-            vcpuid,
-            domid,
-            dom_uuid,
-            current_vcpu: None,
-            previous_vcpu: None,
-            name: format!("dom{domid}_vcpu{vcpuid}").into(),
-        }
-    }
-}
-
-impl XenMetric for VCpuTime {
-    fn generate_metadata(&self) -> anyhow::Result<DataSourceMetadata> {
-        Ok(DataSourceMetadata {
-            description: format!("vCPU{} usage", self.vcpuid).into(),
-            units: "".into(),
-            ds_type: DataSourceType::Gauge,
-            value: DataSourceValue::Float(0.0),
-            min: 0.0,
-            max: 1.0,
-            owner: DataSourceOwner::VM(self.dom_uuid),
-            default: true,
-        })
-    }
-
-    fn update(&mut self, _: &XenMetricsShared, xc: &XenControl) -> bool {
-        match xc.vcpu_getinfo(self.domid, self.vcpuid) {
-            Ok(info) => {
-                self.previous_vcpu = self.current_vcpu;
-                self.current_vcpu.replace((info, Instant::now()));
-                true
-            }
-            Err(e) => {
-                eprintln!("vcpu_getinfo: {e}");
-                false
-            }
-        }
-    }
-
-    fn get_value(&self) -> DataSourceValue {
-        match (self.current_vcpu, self.previous_vcpu) {
-            (Some(_), None) => DataSourceValue::Float(0.0),
-            (Some((current, current_instant)), Some((previous, previous_instant))) => {
-                // xcp-rrdd: Workaround for Xen leaking the flag XEN_RUNSTATE_UPDATE; using a mask of its complement ~(1 << 63)
-                // Then convert from nanoseconds to seconds
-                let cputime = (current.cpu_time & !(1u64 << 63)) as f64 / 1.0e9;
-                // Do the same for previous cpu time.
-                let previous_cputime = (previous.cpu_time & !(1u64 << 63)) as f64 / 1.0e9;
-
-                DataSourceValue::Float(
-                    (cputime - previous_cputime)
-                        / current_instant
-                            .duration_since(previous_instant)
-                            .as_secs_f64(),
-                )
-            }
-            (None, _) => DataSourceValue::Undefined,
-        }
-    }
-
-    fn get_name(&self) -> Cow<str> {
-        Cow::Borrowed(&self.name)
-    }
-}
-
-pub struct DomainMemory {
-    domid: u32,
-    dom_uuid: uuid::Uuid,
-    name: Box<str>,
-    dominfo: Option<xc_dominfo_t>,
-}
-
-impl DomainMemory {
-    pub fn new(domid: u32, dom_uuid: uuid::Uuid) -> Self {
-        Self {
-            dom_uuid,
-            domid,
-            name: format!("dom{domid}_memory").into(),
-            dominfo: None,
-        }
-    }
-}
-
-impl XenMetric for DomainMemory {
-    fn generate_metadata(&self) -> anyhow::Result<DataSourceMetadata> {
-        Ok(DataSourceMetadata {
-            description: "Memory currently allocated to VM".into(),
-            units: "bytes".into(),
-            ds_type: DataSourceType::Gauge,
-            value: DataSourceValue::Int64(0),
-            min: 0.0,
-            max: f32::INFINITY,
-            owner: DataSourceOwner::VM(self.dom_uuid),
-            default: true,
-        })
-    }
-
-    fn update(&mut self, shared: &XenMetricsShared, _: &XenControl) -> bool {
-        if let Some(&info) = shared.dominfos.get(self.domid as usize) {
-            self.dominfo.replace(info);
-            true
-        } else {
-            false
-        }
-    }
-
-    fn get_value(&self) -> DataSourceValue {
-        self.dominfo.map_or_else(
-            || DataSourceValue::Undefined,
-            |info| DataSourceValue::Int64((info.nr_pages * XEN_PAGE_SIZE as u64) as i64),
-        )
-    }
-
-    fn get_name(&self) -> Cow<str> {
-        Cow::Borrowed(&self.name)
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-xen-v2/src/metrics/host.rs b/plugins/xcp-metrics-plugin-xen-v2/src/metrics/host.rs
deleted file mode 100644
index c5eb9fd..0000000
--- a/plugins/xcp-metrics-plugin-xen-v2/src/metrics/host.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use std::borrow::Cow;
-
-use xcp_metrics_common::rrdd::protocol_common::{
-    DataSourceMetadata, DataSourceOwner, DataSourceType, DataSourceValue,
-};
-use xenctrl::XenControl;
-
-use crate::XenMetric;
-
-use super::XenMetricsShared;
-
-#[derive(Default)]
-pub struct LoadAvg(f64);
-
-impl XenMetric for LoadAvg {
-    fn generate_metadata(&self) -> anyhow::Result<DataSourceMetadata> {
-        Ok(DataSourceMetadata {
-            description: "Domain0 loadavg".into(),
-            units: "".into(),
-            ds_type: DataSourceType::Gauge,
-            value: DataSourceValue::Float(0.0),
-            min: f32::NEG_INFINITY,
-            max: f32::INFINITY,
-            owner: DataSourceOwner::Host,
-            default: true,
-        })
-    }
-
-    fn update(&mut self, _: &XenMetricsShared, _: &XenControl) -> bool {
-        let proc_loadavg =
-            std::fs::read_to_string("/proc/loadavg").expect("Unable to read /proc/loadavg");
-
-        self.0 = proc_loadavg
-            .split_once(' ')
-            .expect("No first element in /proc/loadavg ?")
-            .0
-            .parse()
-            .expect("First part of /proc/loadavg not a number ?");
-
-        true
-    }
-
-    fn get_value(&self) -> DataSourceValue {
-        DataSourceValue::Float(self.0)
-    }
-
-    fn get_name(&self) -> Cow<str> {
-        Cow::Borrowed("loadavg")
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-xen-v2/src/metrics/mod.rs b/plugins/xcp-metrics-plugin-xen-v2/src/metrics/mod.rs
deleted file mode 100644
index e2f7e36..0000000
--- a/plugins/xcp-metrics-plugin-xen-v2/src/metrics/mod.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use std::{borrow::Cow, mem::MaybeUninit};
-
-use xcp_metrics_common::rrdd::protocol_common::{DataSourceMetadata, DataSourceValue};
-use xenctrl::XenControl;
-use xenctrl_sys::{xc_cpuinfo_t, xc_dominfo_t, xc_physinfo_t};
-
-use crate::XenMetricsStatus;
-
-use self::{
-    domain::{DomainMemory, VCpuTime},
-    host::LoadAvg,
-    physical::{MemoryFree, MemoryTotal, PCpuTime},
-};
-
-mod domain;
-mod host;
-mod physical;
-
-pub trait XenMetric {
-    /// Generate metadata for this metric.
-    fn generate_metadata(&self) -> anyhow::Result<DataSourceMetadata>;
-
-    /// Update metric and check if this metric still exists.
-    fn update(&mut self, shared: &XenMetricsShared, xc: &XenControl) -> bool;
-
-    /// Get the value of this metric.
-    fn get_value(&self) -> DataSourceValue;
-
-    /// Get the name of the metric.
-    fn get_name(&self) -> Cow<str>;
-}
-
-const XEN_PAGE_SIZE: usize = 4096; // 4 KiB
-
-/// Generate a new list of XenMetric objects.
-pub fn discover_xen_metrics(
-    shared: &XenMetricsShared,
-) -> (Box<[Box<dyn XenMetric>]>, XenMetricsStatus) {
-    let mut metrics: Vec<Box<dyn XenMetric>> = vec![];
-
-    // Add loadavg metric.
-    metrics.push(Box::<LoadAvg>::default());
-
-    shared.dominfos.iter().for_each(|dominfo| {
-        let dom_uuid = uuid::Uuid::from_bytes(dominfo.handle);
-
-        // Domain memory
-        metrics.push(Box::new(DomainMemory::new(dominfo.domid, dom_uuid)));
-
-        // vCPUs
-        for vcpuid in 0..=dominfo.max_vcpu_id {
-            metrics.push(Box::new(VCpuTime::new(vcpuid, dominfo.domid, dom_uuid)));
-        }
-    });
-
-    // pcpu infos
-    shared
-        .cpuinfos
-        .iter()
-        .enumerate()
-        .for_each(|(cpu_index, _)| metrics.push(Box::new(PCpuTime::new(cpu_index))));
-
-    // Memory infos
-    metrics.push(Box::<MemoryTotal>::default());
-    metrics.push(Box::<MemoryFree>::default());
-
-    (
-        metrics.into_boxed_slice(),
-        XenMetricsStatus {
-            dom_count: shared.dominfos.len() as u32,
-        },
-    )
-}
-
-/// Shared structure with various xenctrl informations.
-pub struct XenMetricsShared {
-    pub physinfo: Option<xc_physinfo_t>,
-    pub dominfos: Vec<xc_dominfo_t>,
-    pub cpuinfos: Vec<xc_cpuinfo_t>,
-
-    cpuinfos_buffer: Vec<MaybeUninit<xc_cpuinfo_t>>,
-}
-
-impl XenMetricsShared {
-    pub fn new(xc: &XenControl) -> Self {
-        let mut values = Self {
-            cpuinfos: vec![],
-            cpuinfos_buffer: vec![],
-            dominfos: vec![],
-            physinfo: None,
-        };
-
-        values.update(xc);
-
-        values
-    }
-
-    pub fn update(&mut self, xc: &XenControl) {
-        self.dominfos = (0..)
-            .map_while(|i| xc.domain_getinfo(i).ok().flatten())
-            .collect();
-
-        self.physinfo = xc.physinfo().ok();
-
-        self.cpuinfos_buffer.resize_with(
-            self.physinfo
-                .map(|physinfo| physinfo.nr_cpus as usize)
-                .unwrap_or(0),
-            MaybeUninit::zeroed,
-        );
-
-        self.cpuinfos = xc
-            .get_cpuinfo(&mut self.cpuinfos_buffer)
-            .map(|infos| infos.to_vec())
-            .unwrap_or_default();
-    }
-}
diff --git a/plugins/xcp-metrics-plugin-xen-v2/src/metrics/physical.rs b/plugins/xcp-metrics-plugin-xen-v2/src/metrics/physical.rs
deleted file mode 100644
index 1740d46..0000000
--- a/plugins/xcp-metrics-plugin-xen-v2/src/metrics/physical.rs
+++ /dev/null
@@ -1,156 +0,0 @@
-use std::{borrow::Cow, time::Instant};
-
-use xcp_metrics_common::rrdd::protocol_common::{
-    DataSourceMetadata, DataSourceOwner, DataSourceType, DataSourceValue,
-};
-
-use xenctrl::XenControl;
-use xenctrl_sys::xen_sysctl_cpuinfo_t;
-
-use super::{XenMetric, XenMetricsShared, XEN_PAGE_SIZE};
-
-pub struct PCpuTime {
-    cpu_index: usize,
-    current_info: Option<(xen_sysctl_cpuinfo_t, Instant)>,
-    previous_info: Option<(xen_sysctl_cpuinfo_t, Instant)>,
-}
-
-impl PCpuTime {
-    pub fn new(cpu_index: usize) -> Self {
-        Self {
-            cpu_index,
-            current_info: None,
-            previous_info: None,
-        }
-    }
-}
-
-impl XenMetric for PCpuTime {
-    fn generate_metadata(&self) -> anyhow::Result<DataSourceMetadata> {
-        Ok(DataSourceMetadata {
-            description: format!("Physical cpu usage for cpu {}", self.cpu_index).into(),
-            units: "".into(),
-            ds_type: DataSourceType::Gauge,
-            value: DataSourceValue::Float(0.0),
-            min: 0.0,
-            max: 1.0,
-            owner: DataSourceOwner::Host,
-            default: true,
-        })
-    }
-
-    fn update(&mut self, shared: &XenMetricsShared, _: &XenControl) -> bool {
-        if let Some(cpuinfo) = shared.cpuinfos.get(self.cpu_index) {
-            self.previous_info = self.current_info;
-            self.current_info.replace((*cpuinfo, Instant::now()));
-
-            true
-        } else {
-            false
-        }
-    }
-
-    fn get_value(&self) -> DataSourceValue {
-        match (self.current_info, self.previous_info) {
-            (Some((current, current_instant)), Some((previous, previous_instant))) => {
-                DataSourceValue::Float(
-                    // Compute busy ratio over time.
-                    1.0 - (((current.idletime - previous.idletime) as f64)
-                        / 1.0e9
-                        / current_instant
-                            .duration_since(previous_instant)
-                            .as_secs_f64()),
-                )
-            }
-            (Some(_), None) => DataSourceValue::Float(0.0),
-            (None, _) => DataSourceValue::Undefined,
-        }
-    }
-
-    fn get_name(&self) -> Cow<str> {
-        format!("cpu{}", self.cpu_index).into()
-    }
-}
-
-#[derive(Default)]
-pub struct MemoryTotal {
-    memory_total: Option<i64>,
-}
-
-impl XenMetric for MemoryTotal {
-    fn generate_metadata(&self) -> anyhow::Result<DataSourceMetadata> {
-        Ok(DataSourceMetadata {
-            description: "Total amount of memory in the host".into(),
-            units: "KiB".into(),
-            ds_type: DataSourceType::Gauge,
-            value: DataSourceValue::Int64(0),
-            min: 0.0,
-            max: f32::INFINITY,
-            owner: DataSourceOwner::Host,
-            default: true,
-        })
-    }
-
-    fn update(&mut self, shared: &XenMetricsShared, _: &XenControl) -> bool {
-        self.memory_total = Some(
-            shared.physinfo.map_or(0, |physinfo| physinfo.total_pages) as i64
-                * XEN_PAGE_SIZE as i64
-                / 1024,
-        );
-
-        true
-    }
-
-    fn get_value(&self) -> DataSourceValue {
-        if let Some(count) = self.memory_total {
-            DataSourceValue::Int64(count)
-        } else {
-            DataSourceValue::Undefined
-        }
-    }
-
-    fn get_name(&self) -> Cow<str> {
-        Cow::Borrowed("memory_total_kib")
-    }
-}
-
-#[derive(Default)]
-pub struct MemoryFree {
-    memory_free: Option<i64>,
-}
-
-impl XenMetric for MemoryFree {
-    fn generate_metadata(&self) -> anyhow::Result<DataSourceMetadata> {
-        Ok(DataSourceMetadata {
-            description: "Total amount of free memory".into(),
-            units: "KiB".into(),
-            ds_type: DataSourceType::Gauge,
-            value: DataSourceValue::Int64(0),
-            min: 0.0,
-            max: f32::INFINITY,
-            owner: DataSourceOwner::Host,
-            default: true,
-        })
-    }
-
-    fn update(&mut self, shared: &XenMetricsShared, _: &XenControl) -> bool {
-        self.memory_free = Some(
-            shared.physinfo.map_or(0, |physinfo| physinfo.free_pages) as i64 * XEN_PAGE_SIZE as i64
-                / 1024,
-        );
-
-        true
-    }
-
-    fn get_value(&self) -> DataSourceValue {
-        if let Some(value) = self.memory_free {
-            DataSourceValue::Int64(value)
-        } else {
-            DataSourceValue::Undefined
-        }
-    }
-
-    fn get_name(&self) -> Cow<str> {
-        Cow::Borrowed("memory_free_kib")
-    }
-}