diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs
index f8a8d8cb..0d9ddeef 100644
--- a/src/api2/node/disks/directory.rs
+++ b/src/api2/node/disks/directory.rs
@@ -2,7 +2,7 @@ use anyhow::{bail, Error};
 use serde_json::json;
 use ::serde::{Deserialize, Serialize};
 
-use proxmox::api::{api, Permission, RpcEnvironment, RpcEnvironmentType, HttpError};
+use proxmox::api::{api, Permission, RpcEnvironment, RpcEnvironmentType};
 use proxmox::api::section_config::SectionConfigData;
 use proxmox::api::router::Router;
 
@@ -16,7 +16,6 @@ use crate::tools::systemd::{self, types::*};
 use crate::server::WorkerTask;
 
 use crate::api2::types::*;
-use proxmox::api::error::StatusCode;
 use crate::config::datastore::DataStoreConfig;
 
 #[api(
@@ -194,10 +193,8 @@ pub fn create_datastore_disk(
     },
 )]
 /// Remove a Filesystem mounted under '/mnt/datastore/<name>'.".
-pub fn delete_datastore_disk(
-    name: String,
-    rpcenv: &mut dyn RpcEnvironment,
-) -> Result<(), Error> {
+pub fn delete_datastore_disk(name: String) -> Result<(), Error> {
+
     let path = format!("/mnt/datastore/{}", name);
     // path of datastore cannot be changed
     let (config, _) = crate::config::datastore::config()?;
@@ -206,36 +203,32 @@ pub fn delete_datastore_disk(
         .filter(|ds| ds.path == path)
         .next();
 
-    match conflicting_datastore {
-        Some(conflicting_datastore) =>
-            Err(Error::from(HttpError::new(StatusCode::CONFLICT,
-                                           format!("Can't remove '{}' since it's required by datastore '{}'",
-                                                   conflicting_datastore.path,
-                                                   conflicting_datastore.name)))),
-        None => {
-            // disable systemd mount-unit
-            let mut mount_unit_name = systemd::escape_unit(&path, true);
-            mount_unit_name.push_str(".mount");
-            systemd::disable_unit(mount_unit_name.as_str())?;
+    if let Some(conflicting_datastore) = conflicting_datastore {
+        bail!("Can't remove '{}' since it's required by datastore '{}'",
+              conflicting_datastore.path, conflicting_datastore.name);
+    }
 
-            // delete .mount-file
-            let mount_unit_path = format!("/etc/systemd/system/{}", mount_unit_name);
-            let full_path = std::path::Path::new(mount_unit_path.as_str());
-            log::info!("removing {:?}", full_path);
-            std::fs::remove_file(&full_path)?;
+    // disable systemd mount-unit
+    let mut mount_unit_name = systemd::escape_unit(&path, true);
+    mount_unit_name.push_str(".mount");
+    systemd::disable_unit(&mount_unit_name)?;
 
-            // try to unmount, if that fails tell the user to reboot or unmount manually
-            let mut command = std::process::Command::new("umount");
-            command.arg(path.as_str());
-            match crate::tools::run_command(command, None) {
-                Err(_) => bail!(
-                    "Could not umount '{}' since it is busy. It will stay mounted \
-                    until the next reboot or until unmounted manually!",
-                    path
-                 ),
-                Ok(_) => Ok(())
-            }
-        }
+    // delete .mount-file
+    let mount_unit_path = format!("/etc/systemd/system/{}", mount_unit_name);
+    let full_path = std::path::Path::new(&mount_unit_path);
+    log::info!("removing systemd mount unit {:?}", full_path);
+    std::fs::remove_file(&full_path)?;
+
+    // try to unmount, if that fails tell the user to reboot or unmount manually
+    let mut command = std::process::Command::new("umount");
+    command.arg(&path);
+    match crate::tools::run_command(command, None) {
+        Err(_) => bail!(
+            "Could not umount '{}' since it is busy. It will stay mounted \
+             until the next reboot or until unmounted manually!",
+            path
+        ),
+        Ok(_) => Ok(())
     }
 }