diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/finish b/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/finish
deleted file mode 100644
index a8222fb03..000000000
--- a/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/finish
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/command/execlineb -S0
-/run/s6/basedir/bin/halt
\ No newline at end of file
diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/run b/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/run
deleted file mode 100644
index 8757e5d50..000000000
--- a/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/command/with-contenv sh
-rm -rf /var/run/dbus.pid
-echo "Starting dbus"
-exec dbus-daemon --system --nofork
\ No newline at end of file
diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/type b/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/type
deleted file mode 100644
index 1780f9f44..000000000
--- a/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/finish b/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/finish
deleted file mode 100644
index a8222fb03..000000000
--- a/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/finish
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/command/execlineb -S0
-/run/s6/basedir/bin/halt
\ No newline at end of file
diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/run b/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/run
deleted file mode 100644
index fc5092970..000000000
--- a/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/command/with-contenv sh
-sleep 5
-while [ ! -f /var/run/dbus.pid ]; do
-  "dbus is not running, sleeping for 5 seconds before trying to start avahi"
-  sleep 5
-done
-echo "Starting avahi"
-exec avahi-daemon --no-chroot
\ No newline at end of file
diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/type b/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/type
deleted file mode 100644
index 1780f9f44..000000000
--- a/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/startup/script.sh b/docker/classic/etc/s6-overlay/s6-rc.d/startup/script.sh
deleted file mode 100644
index c975a4036..000000000
--- a/docker/classic/etc/s6-overlay/s6-rc.d/startup/script.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo "STARTING - $(date)"
\ No newline at end of file
diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/startup/type b/docker/classic/etc/s6-overlay/s6-rc.d/startup/type
deleted file mode 100644
index 3d92b15f2..000000000
--- a/docker/classic/etc/s6-overlay/s6-rc.d/startup/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
\ No newline at end of file
diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/startup/up b/docker/classic/etc/s6-overlay/s6-rc.d/startup/up
deleted file mode 100644
index 0c609ec60..000000000
--- a/docker/classic/etc/s6-overlay/s6-rc.d/startup/up
+++ /dev/null
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/startup/script.sh
\ No newline at end of file
diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/user/contents.d/01-dbus b/docker/classic/etc/s6-overlay/s6-rc.d/user/contents.d/01-dbus
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/user/contents.d/02-avahi b/docker/classic/etc/s6-overlay/s6-rc.d/user/contents.d/02-avahi
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/user/contents.d/startup b/docker/classic/etc/s6-overlay/s6-rc.d/user/contents.d/startup
deleted file mode 100644
index e69de29bb..000000000