diff --git a/Dockerfile b/Dockerfile
index 94170a11..3f299070 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,8 +18,6 @@ RUN \
   apk add --no-cache \
     bash \
     curl \
-    patch \
-    tar \
     tzdata \
     xz
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index d2d64732..a74e825f 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -18,8 +18,6 @@ RUN \
   apk add --no-cache \
     bash \
     curl \
-    patch \
-    tar \
     tzdata \
     xz
 
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 7d6c671c..7560561e 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -18,8 +18,6 @@ RUN \
   apk add --no-cache \
     bash \
     curl \
-    patch \
-    tar \
     tzdata \
     xz
 
diff --git a/root/etc/s6-overlay/s6-rc.d/init-adduser/dependencies.d/init-script-check b/root/etc/s6-overlay/s6-rc.d/init-adduser/dependencies.d/init-script-check
deleted file mode 100644
index e69de29b..00000000
diff --git a/root/etc/s6-overlay/s6-rc.d/init-custom-files/run b/root/etc/s6-overlay/s6-rc.d/init-custom-files/run
index 86ca3032..3d8a17e5 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-custom-files/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-custom-files/run
@@ -2,21 +2,8 @@
 # shellcheck shell=bash
 
 # Directories
-SCRIPTS_DIR_OLD="/config/custom-cont-init.d"
 SCRIPTS_DIR="/custom-cont-init.d"
 
-SERVICES_DIR_OLD="/config/custom-services.d"
-
-# chown legacy folders if they exist
-if [[ -e "${SCRIPTS_DIR_OLD}" ]]; then
-    chown -R 0:0 "${SCRIPTS_DIR_OLD}"
-fi
-
-# chown legacy folders if they exist
-if [[ -e "${SERVICES_DIR_OLD}" ]]; then
-    chown -R 0:0 "${SERVICES_DIR_OLD}"
-fi
-
 # Make sure custom init directory exists and has files in it
 if [[ -e "${SCRIPTS_DIR}" ]] && [[ -n "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)" ]]; then
     echo "[custom-init] Files found, executing"
@@ -30,27 +17,6 @@ if [[ -e "${SCRIPTS_DIR}" ]] && [[ -n "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)"
             echo "[custom-init] ${NAME}: is not a file"
         fi
     done
-
-    # Remove legacy folder if it's empty
-    if [[ -e "${SCRIPTS_DIR_OLD}" ]] && [[ -z "$(/bin/ls -A ${SCRIPTS_DIR_OLD} 2>/dev/null)" ]]; then
-        echo "[custom-init] Legacy files folder ${SCRIPTS_DIR_OLD} is empty, deleting..."
-        rm -rf "${SCRIPTS_DIR_OLD}"
-    fi 
-elif [[ -e "${SCRIPTS_DIR_OLD}" ]] && [[ -n "$(/bin/ls -A ${SCRIPTS_DIR_OLD} 2>/dev/null)" ]]; then
-    echo "[custom-init] Files found, executing"
-    for SCRIPT in "${SCRIPTS_DIR_OLD}"/*; do
-        NAME="$(basename "${SCRIPT}")"
-        if [[ -f "${SCRIPT}" ]]; then
-            echo "[custom-init] ${NAME}: executing..."
-            /bin/bash "${SCRIPT}"
-            echo "[custom-init] ${NAME}: exited $?"
-        elif [[ ! -f "${SCRIPT}" ]]; then
-            echo "[custom-init] ${NAME}: is not a file"
-        fi
-    done
-elif [[ -e "${SCRIPTS_DIR_OLD}" ]] && [[ -z "$(/bin/ls -A ${SCRIPTS_DIR_OLD} 2>/dev/null)" ]]; then
-    echo "[custom-init] Legacy files folder ${SCRIPTS_DIR_OLD} is empty, deleting..."
-    rm -rf "${SCRIPTS_DIR_OLD}"
 else
     echo "[custom-init] No custom files found, skipping..."
 fi
diff --git a/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-script-check b/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-script-check
deleted file mode 100644
index e69de29b..00000000
diff --git a/root/etc/s6-overlay/s6-rc.d/init-script-check/dependencies.d/00-legacy b/root/etc/s6-overlay/s6-rc.d/init-script-check/dependencies.d/00-legacy
deleted file mode 100644
index e69de29b..00000000
diff --git a/root/etc/s6-overlay/s6-rc.d/init-script-check/run b/root/etc/s6-overlay/s6-rc.d/init-script-check/run
deleted file mode 100755
index 20c2c43b..00000000
--- a/root/etc/s6-overlay/s6-rc.d/init-script-check/run
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-if [[ -n "$(/bin/ls -A "/config/custom-cont-init.d" 2>/dev/null)" ]] ||
-    [[ -n "$(/bin/ls -A "/config/custom-services.d" 2>/dev/null)" ]]; then
-    cat << EOF | tee /config/custom-cont-init.d/README.txt 2>/dev/null
-********************************************************
-********************************************************
-*                                                      *
-*                         !!!!                         *
-* Custom scripts or services found in legacy locations *
-*                         !!!!                         *
-*    Please move your custom scripts and services      *
-*    to /custom-cont-init.d and /custom-services.d     *
-*    respectively to ensure they continue working.     *
-*                                                      *
-*  Visit https://linuxserver.io/custom for more info.  *
-*                                                      *
-********************************************************
-********************************************************
-EOF
-fi
-exit 0
diff --git a/root/etc/s6-overlay/s6-rc.d/init-script-check/type b/root/etc/s6-overlay/s6-rc.d/init-script-check/type
deleted file mode 100644
index bdd22a18..00000000
--- a/root/etc/s6-overlay/s6-rc.d/init-script-check/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-script-check/up b/root/etc/s6-overlay/s6-rc.d/init-script-check/up
deleted file mode 100644
index a7c155ab..00000000
--- a/root/etc/s6-overlay/s6-rc.d/init-script-check/up
+++ /dev/null
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-script-check/run
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-script-check b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-script-check
deleted file mode 100644
index e69de29b..00000000