diff --git a/linux/aux-tools/Makefile b/linux/aux-tools/Makefile
index 106e7e74..d919c84f 100644
--- a/linux/aux-tools/Makefile
+++ b/linux/aux-tools/Makefile
@@ -5,5 +5,4 @@ install:
 	mkdir -p $(DESTDIR)/usr/lib/qubes
 	cp cleanup-dispvms $(DESTDIR)/usr/lib/qubes
 	cp startup-misc.sh $(DESTDIR)/usr/lib/qubes
-	cp block-cleaner-daemon.py $(DESTDIR)/usr/lib/qubes/
 	cp fix-dir-perms.sh $(DESTDIR)/usr/lib/qubes/
diff --git a/linux/aux-tools/block-cleaner-daemon.py b/linux/aux-tools/block-cleaner-daemon.py
deleted file mode 100755
index 75b549dc..00000000
--- a/linux/aux-tools/block-cleaner-daemon.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/python
-
-import xen.lowlevel.xs
-import time
-import subprocess
-
-xs = xen.lowlevel.xs.xs()
-
-domain_list = []
-
-def setup_watches():
-    global domain_list
-
-    new_domain_list = xs.ls('', '/local/domain')
-    for dom in new_domain_list:
-        if dom not in domain_list:
-            print "Adding: %s" % dom
-            xs.watch('/local/domain/%s/backend/vbd' % dom, int(dom))
-    for dom in domain_list:
-        if dom not in new_domain_list:
-            print "Removing: %s" % dom
-            xs.unwatch('/local/domain/%s/backend/vbd' % dom, int(dom))
-    domain_list = new_domain_list
-
-def handle_vbd_state(path):
-    state = xs.read('', path)
-    if state == '6':
-        # Closed state; wait a moment to not interrupt reconnect
-        time.sleep(0.500)
-        state = xs.read('', path)
-        if state == '6':
-            # If still closed, detach device
-            path_components = path.split('/')
-            # /local/domain/<BACK XID>/backend/vbd/<FRONT XID>/<DEV>/...
-            vm_xid = path_components[6]
-            vm_dev = path_components[7]
-            if vm_xid in domain_list:
-                subprocess.call(['xl', 'block-detach', vm_xid, vm_dev])
-
-def main():
-
-    xs.watch('@introduceDomain', 'reload')
-    xs.watch('@releaseDomain', 'reload')
-    setup_watches()
-    while True:
-        (path, token) = xs.read_watch()
-        if token == 'reload':
-            setup_watches()
-        else:
-            if path.endswith('/state'):
-                handle_vbd_state(path)
-
-main()
diff --git a/linux/systemd/Makefile b/linux/systemd/Makefile
index 7cebae40..1ba1d355 100644
--- a/linux/systemd/Makefile
+++ b/linux/systemd/Makefile
@@ -5,7 +5,6 @@ all:
 
 install:
 	mkdir -p $(DESTDIR)$(UNITDIR)
-	cp qubes-block-cleaner.service $(DESTDIR)$(UNITDIR)
 	cp qubes-core.service $(DESTDIR)$(UNITDIR)
 	cp qubes-netvm.service $(DESTDIR)$(UNITDIR)
 	cp qubes-vm@.service $(DESTDIR)$(UNITDIR)
diff --git a/linux/systemd/qubes-block-cleaner.service b/linux/systemd/qubes-block-cleaner.service
deleted file mode 100644
index 1a862989..00000000
--- a/linux/systemd/qubes-block-cleaner.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Qubes block device cleaner (xen front/back)
-After=qubes-core.service
-
-[Service]
-ExecStart=/usr/lib/qubes/block-cleaner-daemon.py
-StandardOutput=syslog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index 49c87651..e5b26b29 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -391,12 +391,10 @@ fi
 %{python3_sitelib}/qubespolicy/glade/RPCConfirmationWindow.glade
 
 /usr/lib/qubes/cleanup-dispvms
-/usr/lib/qubes/block-cleaner-daemon.py*
 /usr/lib/qubes/fix-dir-perms.sh
 /usr/lib/qubes/startup-misc.sh
 /usr/libexec/qubes/qubes-notify-tools
 /usr/libexec/qubes/qubes-notify-updates
-%{_unitdir}/qubes-block-cleaner.service
 %{_unitdir}/qubes-core.service
 %{_unitdir}/qubes-netvm.service
 %{_unitdir}/qubes-qmemman.service