diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
index 3b51fe4a62..3a90990594 100644
--- a/tools/hotplug/Linux/Makefile
+++ b/tools/hotplug/Linux/Makefile
@@ -11,7 +11,6 @@ XEN_SCRIPTS += vif-setup
 XEN_SCRIPTS-$(CONFIG_LIBNL) += remus-netbuf-setup
 XEN_SCRIPTS += block
 XEN_SCRIPTS += block-enbd block-nbd
-XEN_SCRIPTS += xen-hotplug-cleanup
 XEN_SCRIPTS += external-device-migrate
 XEN_SCRIPTS += vscsi
 XEN_SCRIPTS += block-iscsi
diff --git a/tools/hotplug/Linux/xen-hotplug-cleanup b/tools/hotplug/Linux/xen-hotplug-cleanup
deleted file mode 100644
index fcaa8fc8c6..0000000000
--- a/tools/hotplug/Linux/xen-hotplug-cleanup
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/bash
-
-dir=$(dirname "$0")
-. "$dir/xen-hotplug-common.sh"
-
-# Claim the lock protecting ${XEN_SCRIPT_DIR}/block.  This stops a race whereby
-# paths in the store would disappear underneath that script as it attempted to
-# read from the store checking for device sharing.
-# Any other scripts that do similar things will have to have their lock
-# claimed too.
-# This is pretty horrible, but there's not really a nicer way of solving this.
-claim_lock "block"
-
-# split backend/DEVCLASS/VMID/DEVID on slashes
-path_array=( ${XENBUS_PATH//\// } )
-# get /vm/UUID path
-vm=$(xenstore_read_default "/local/domain/${path_array[2]}/vm" "")
-# construct /vm/UUID/device/DEVCLASS/DEVID
-if [ "$vm" != "" ]; then
-  vm_dev="$vm/device/${path_array[1]}/${path_array[3]}"
-
-  # if the vm path does not exist and the device class is 'vbd' then we may have
-  # a tap2 device
-  $(xenstore-read "$vm_dev" 2>/dev/null) || \
-  {
-     if [ "${path_array[1]}" = "vbd" ]; then
-        vm_dev="$vm/device/tap2/${path_array[3]}"
-     fi
-  }
-else
-  vm_dev=
-fi
-
-# remove device frontend store entries
-xenstore-rm -t \
-  $(xenstore-read "$XENBUS_PATH/frontend" 2>/dev/null) 2>/dev/null || true
-
-# remove device backend store entries
-xenstore-rm -t "$XENBUS_PATH"        2>/dev/null || true
-xenstore-rm -t "error/$XENBUS_PATH"  2>/dev/null || true
-
-# remove device path from /vm/UUID
-[ "$vm_dev" != "" ] && xenstore-rm -t "$vm_dev" 2>/dev/null || true
-
-release_lock "block"