diff --git a/general/overlay/etc/init.d/S10resetd b/general/overlay/etc/init.d/S10resetd
deleted file mode 100755
index 6be1e158..00000000
--- a/general/overlay/etc/init.d/S10resetd
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	start)
-		/usr/sbin/resetd &
-		;;
-esac
diff --git a/general/overlay/etc/inittab b/general/overlay/etc/inittab
index ed2561f0..f0a2afba 100644
--- a/general/overlay/etc/inittab
+++ b/general/overlay/etc/inittab
@@ -19,22 +19,18 @@
 ::sysinit:/bin/mkdir -p /dev/pts /dev/shm
 ::sysinit:/bin/mount -a
 ::sysinit:/bin/mkdir -p /run/lock/subsys
-# ::sysinit:/sbin/swapon -a
 null::sysinit:/bin/ln -sf /proc/self/fd /dev/fd
 null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin
 null::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout
 null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr
 ::sysinit:/bin/hostname -F /etc/hostname
-# now run any rc scripts
+
+# Run rc scripts
 ::sysinit:/etc/init.d/rcS
 
 # Put a getty on the serial port
 console::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL
 
-# Stuff to do for the 3-finger salute
-#::ctrlaltdel:/sbin/reboot
-
 # Stuff to do before rebooting
 ::shutdown:/etc/init.d/rcK
-# ::shutdown:/sbin/swapoff -a
 ::shutdown:/bin/umount -a -f
diff --git a/general/overlay/etc/modules b/general/overlay/etc/modules
index 343f9637..4841de40 100644
--- a/general/overlay/etc/modules
+++ b/general/overlay/etc/modules
@@ -1,6 +1,2 @@
-f2fs
 vfat
 exfat
-
-# For XM530 SD cards
-# sdio0_sd
diff --git a/general/overlay/etc/profile b/general/overlay/etc/profile
index 9522ac9b..cca56b60 100644
--- a/general/overlay/etc/profile
+++ b/general/overlay/etc/profile
@@ -1,4 +1,5 @@
 export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/tmp"
+export EDITOR="/bin/vi"
 export HOME=$(grep -e "^${USER:-root}:" /etc/passwd | cut -d ":" -f 6)
 export HOME=${HOME:-/root}
 export TZ=$(cat /etc/TZ)
@@ -20,12 +21,6 @@ if [ "$PS1" ]; then
 	fi
 fi
 
-export EDITOR='/bin/vi'
-
-[ -x /usr/bin/arp ] || arp() {
-	cat /proc/net/arp
-}
-
 differ() {
 	diff -rN "/rom$1" "$1"
 }
@@ -81,4 +76,5 @@ show_wlan() {
 # Source configuration files from /etc/profile.d
 for i in /etc/profile.d/*.sh; do
 	[ -r "$i" ] && . $i
-done; unset i
+done
+unset i
diff --git a/general/overlay/usr/sbin/sysreset.sh b/general/overlay/usr/sbin/sysreset.sh
deleted file mode 100755
index 9d201f7e..00000000
--- a/general/overlay/usr/sbin/sysreset.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-show_help() {
-	echo "Usage: $0 [OPTIONS]
-  -m          Reset Majestic config.
-  -n          Reset network config.
-  -h          Show this help.
-"
-	exit 0
-}
-
-reset_majestic() {
-	cp -f /rom/etc/majestic.yaml /etc/majestic.yaml
-}
-
-reset_network() {
-	cp -f /rom/etc/network/interfaces /etc/network/interfaces
-}
-
-while getopts hmn flag; do
-	case ${flag} in
-		m) reset_majestic ;;
-		n) reset_network ;;
-		h) show_help ;;
-	esac
-done
-
-exit 0
diff --git a/general/scripts/legacy/bump_gcc_everywhere.sh b/general/scripts/legacy/general/bump_gcc_everywhere.sh
similarity index 100%
rename from general/scripts/legacy/bump_gcc_everywhere.sh
rename to general/scripts/legacy/general/bump_gcc_everywhere.sh
diff --git a/general/scripts/legacy/create_overlayed_rootfs.sh b/general/scripts/legacy/general/create_overlayed_rootfs.sh
similarity index 100%
rename from general/scripts/legacy/create_overlayed_rootfs.sh
rename to general/scripts/legacy/general/create_overlayed_rootfs.sh
diff --git a/general/scripts/legacy/create_toolchain_binding.sh b/general/scripts/legacy/general/create_toolchain_binding.sh
similarity index 100%
rename from general/scripts/legacy/create_toolchain_binding.sh
rename to general/scripts/legacy/general/create_toolchain_binding.sh
diff --git a/general/scripts/legacy/show_kernel_vers.sh b/general/scripts/legacy/general/show_kernel_vers.sh
similarity index 100%
rename from general/scripts/legacy/show_kernel_vers.sh
rename to general/scripts/legacy/general/show_kernel_vers.sh
diff --git a/general/overlay/usr/sbin/light b/general/scripts/legacy/sbin/light
similarity index 100%
rename from general/overlay/usr/sbin/light
rename to general/scripts/legacy/sbin/light
diff --git a/general/overlay/usr/sbin/profiler b/general/scripts/legacy/sbin/profiler
similarity index 100%
rename from general/overlay/usr/sbin/profiler
rename to general/scripts/legacy/sbin/profiler
diff --git a/general/overlay/usr/sbin/resetd b/general/scripts/legacy/sbin/resetd
similarity index 100%
rename from general/overlay/usr/sbin/resetd
rename to general/scripts/legacy/sbin/resetd
diff --git a/general/scripts/rootfs_script.sh b/general/scripts/rootfs_script.sh
index 1f9b1b6a..c1d8d64d 100755
--- a/general/scripts/rootfs_script.sh
+++ b/general/scripts/rootfs_script.sh
@@ -7,8 +7,8 @@ date +GITHUB_VERSION="\"${GIT_BRANCH-local}+${GIT_HASH-build}, %Y-%m-%d"\" >> ${
 echo BUILD_OPTION=${OPENIPC_VARIANT} >> ${FILE}
 date +TIME_STAMP=%s >> ${FILE}
 
-CONF="INGENIC_OSDRV_T30=y|LIBV4L=y|MAVLINK_ROUTER=y|WIFIBROADCAST=y|WEBRTC_AUDIO_PROCESSING=y"
-if ! grep -q "USES_GLIBC" ${BR2_CONFIG} && ! grep -qP ${CONF} ${BR2_CONFIG}; then
+CONF="USES_GLIBC=y|INGENIC_OSDRV_T30=y|LIBV4L=y|MAVLINK_ROUTER=y|WIFIBROADCAST=y|WEBRTC_AUDIO_PROCESSING=y"
+if ! grep -qP ${CONF} ${BR2_CONFIG}; then
 	rm -f ${TARGET_DIR}/usr/lib/libstdc++*
 fi