diff --git a/board/common/cleanups.sh b/board/common/cleanups.sh
index 8be357b433..ce144868af 100755
--- a/board/common/cleanups.sh
+++ b/board/common/cleanups.sh
@@ -159,10 +159,13 @@ rm -rf $TARGET/usr/lib/python2.7/ensurepip/
 
 # startup scripts
 rm -f $TARGET/etc/init.d/S01logging
+rm -f $TARGET/etc/init.d/S10udev
 rm -f $TARGET/etc/init.d/S15watchdog
 rm -f $TARGET/etc/init.d/S49ntp
+rm -f $TARGET/etc/init.d/S50sshd
 rm -f $TARGET/etc/init.d/S50proftpd
 rm -f $TARGET/etc/init.d/S20urandom
 rm -f $TARGET/etc/init.d/S80dhcp-relay
 rm -f $TARGET/etc/init.d/S80dhcp-server
+rm -f $TARGET/etc/init.d/S91smb
 
diff --git a/board/common/overlay/etc/init.d/S11datapart b/board/common/overlay/etc/init.d/S11datapart
index 22da4eee86..aedbb92996 100755
--- a/board/common/overlay/etc/init.d/S11datapart
+++ b/board/common/overlay/etc/init.d/S11datapart
@@ -32,6 +32,7 @@ case "$1" in
         mkdir /data/log
         mkdir -m 775 /data/output
         mkdir -m 775 /data/media
+        cp /etc/version /data/etc/version
 
         ln -s /usr/share/zoneinfo/UTC /data/etc/localtime
         msg_done
diff --git a/board/odroidc1/overlay/etc/modules b/board/odroidc1/overlay/etc/modules
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/configs/odroidc1_defconfig b/configs/odroidc1_defconfig
index c69379eb4b..89c82d5832 100644
--- a/configs/odroidc1_defconfig
+++ b/configs/odroidc1_defconfig
@@ -19,7 +19,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/a9824bf83556d36ce6be4224c01a9ab7d49afa8b.tar.gz"
-BR2_LINUX_KERNEL_PATCH="board/odroidc1/kernel-watchdog.patch"
+BR2_LINUX_KERNEL_PATCH=""
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/odroidc1/kernel.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/package/motioneye/motioneye.mk b/package/motioneye/motioneye.mk
index 4c45eb8c96..55c335ae34 100644
--- a/package/motioneye/motioneye.mk
+++ b/package/motioneye/motioneye.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MOTIONEYE_VERSION = 93276d1d38bc7d3904f5b1acc97d268bd2a20750
+MOTIONEYE_VERSION = 022221553bd114c579af4ec91820ce659ea35f74
 MOTIONEYE_SITE = $(call github,ccrisan,motioneye,$(MOTIONEYE_VERSION))
 MOTIONEYE_SOURCE = $(MOTIONEYE_VERSION).tar.gz
 MOTIONEYE_LICENSE = GPLv3