diff --git a/mk.sh b/mk.sh
index 8e79d3d..f194aa5 100755
--- a/mk.sh
+++ b/mk.sh
@@ -37,13 +37,12 @@ TCDIR="$BUILDROOT/${BOARD}-${PRODUCT}/toolchain"
 PKGBUILDDIR="$BUILDROOT/${BOARD}-${PRODUCT}/build"
 PKGSRCDIR="$BUILDROOT/src"
 PKGDEPLOYDIR="$BUILDROOT/${BOARD}-${PRODUCT}/deploy"
-PKGDEVDEPLOYDIR="$BUILDROOT/${BOARD}-${PRODUCT}/deploy-dev"
 PKGLOGDIR="$BUILDROOT/${BOARD}-${PRODUCT}/log"
 PKGDOWNLOADDIR="$BUILDROOT/download"
 PACKAGELIST="$BUILDROOT/${BOARD}-${PRODUCT}/pkglist"
 
 mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGLOGDIR"
-mkdir -p "$PKGDEPLOYDIR" "$PKGDEVDEPLOYDIR" "$TCDIR/bin"
+mkdir -p "$PKGDEPLOYDIR" "$TCDIR/bin"
 
 export PATH="$TCDIR/bin:$PATH"
 
@@ -89,6 +88,7 @@ while read pkg; do
 		install_build_deps
 		run_pkg_command "build"
 		run_pkg_command "deploy"
+		deploy_dev_cleanup "$PKGDEPLOYDIR/$PKGNAME"
 		restore_toolchain
 
 		rm -rf "$PKGBUILDDIR"
diff --git a/pkg/bash-completion/build b/pkg/bash-completion/build
index 60462d7..2901ef2 100755
--- a/pkg/bash-completion/build
+++ b/pkg/bash-completion/build
@@ -18,12 +18,9 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/bash/build b/pkg/bash/build
index 87592e4..f3b7922 100755
--- a/pkg/bash/build
+++ b/pkg/bash/build
@@ -19,7 +19,6 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install
 
@@ -29,8 +28,6 @@ deploy() {
 
 	cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$DEPLOY"
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/bdb/build b/pkg/bdb/build
index bb03e7e..5bd6f6b 100755
--- a/pkg/bdb/build
+++ b/pkg/bdb/build
@@ -19,7 +19,6 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
@@ -28,7 +27,6 @@ deploy() {
 	strip_files ${DEPLOY}/lib/*.so ${DEPLOY}/bin/db_*
 
 	rm -r "$DEPLOY/docs"
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/btrfs-progs/build b/pkg/btrfs-progs/build
index 9f25d2c..57e5ee5 100755
--- a/pkg/btrfs-progs/build
+++ b/pkg/btrfs-progs/build
@@ -22,14 +22,12 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install
 
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
 
 	strip_files ${DEPLOY}/{bin,lib}/*
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/bzip2/build b/pkg/bzip2/build
index d485126..c0a5b08 100755
--- a/pkg/bzip2/build
+++ b/pkg/bzip2/build
@@ -18,7 +18,6 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make PREFIX="$DEPLOY" install
 
@@ -31,8 +30,6 @@ deploy() {
 	ln -s "/bin/bzmore" "$DEPLOY/bin/bzless"
 	ln -s "/bin/bzdiff" "$DEPLOY/bin/bzcmp"
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/dnsmasq/build b/pkg/dnsmasq/build
index f86964d..9a6c8a6 100644
--- a/pkg/dnsmasq/build
+++ b/pkg/dnsmasq/build
@@ -18,7 +18,6 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make CC=${TARGET}-gcc PREFIX="/" BINDIR="/bin" DESTDIR="$DEPLOY" install
 
diff --git a/pkg/dosfstools/build b/pkg/dosfstools/build
index 5cec0b3..8e2b203 100755
--- a/pkg/dosfstools/build
+++ b/pkg/dosfstools/build
@@ -19,7 +19,6 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
diff --git a/pkg/eudev/build b/pkg/eudev/build
index 118a101..62f834b 100755
--- a/pkg/eudev/build
+++ b/pkg/eudev/build
@@ -24,11 +24,9 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
 
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 	rmdir "$DEPLOY/share"
 }
 
diff --git a/pkg/expat/build b/pkg/expat/build
index a4b6d16..43eff29 100644
--- a/pkg/expat/build
+++ b/pkg/expat/build
@@ -19,13 +19,10 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
 
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/file/build b/pkg/file/build
index 00212ef..d330b06 100755
--- a/pkg/file/build
+++ b/pkg/file/build
@@ -18,13 +18,10 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
 
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/firmware-rpi3/build b/pkg/firmware-rpi3/build
index df8b036..0115dff 100755
--- a/pkg/firmware-rpi3/build
+++ b/pkg/firmware-rpi3/build
@@ -16,17 +16,8 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
-	cp -r "$SOURCE/hardfp/opt" "$DEPLOY/"
-
-	mkdir -p "$DEVDEPLOY/opt/vc"
-	mv "$DEPLOY/opt/vc/include" "$DEVDEPLOY"
-
-	cp -r "$DEPLOY/opt/vc/lib" "$DEVDEPLOY/opt/vc"
-	rm ${DEPLOY}/opt/vc/lib/*.a
-	rm -r "${DEPLOY}/opt/vc/lib/pkgconfig"
-	rm -r "${DEPLOY}/opt/vc/src"
+	cp -r "$SOURCE/hardfp/opt" "$DEPLOY"
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
 
 	strip_files ${DEPLOY}/opt/vc/{bin,sbin}/*
diff --git a/pkg/gmp/build b/pkg/gmp/build
index 47c9742..8527ba4 100755
--- a/pkg/gmp/build
+++ b/pkg/gmp/build
@@ -18,12 +18,10 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	unfuck_libtool
 	make DESTDIR="$DEPLOY" install
 
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 	strip_files ${DEPLOY}/lib/*.so*
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
 }
diff --git a/pkg/iproute2/build b/pkg/iproute2/build
index 85b01bb..05e3a19 100755
--- a/pkg/iproute2/build
+++ b/pkg/iproute2/build
@@ -18,7 +18,6 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	mkdir -p "$DEPLOY/var/lib/arpd"
 	make DESTDIR="$DEPLOY" SYSROOT="$TCDIR/$TARGET" install
diff --git a/pkg/kbd/build b/pkg/kbd/build
index 9bbcd3b..af99e5e 100755
--- a/pkg/kbd/build
+++ b/pkg/kbd/build
@@ -19,12 +19,9 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/kmod/build b/pkg/kmod/build
index e6b690b..5fa0b39 100644
--- a/pkg/kmod/build
+++ b/pkg/kmod/build
@@ -19,7 +19,6 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 	local target
 
 	make DESTDIR="$DEPLOY" install-strip
@@ -28,8 +27,6 @@ deploy() {
 	for target in depmod insmod lsmod modinfo modprobe rmmod; do
 		ln -sf kmod $DEPLOY/bin/$target
 	done
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/libbsd/build b/pkg/libbsd/build
index 31121b0..40563dd 100644
--- a/pkg/libbsd/build
+++ b/pkg/libbsd/build
@@ -18,12 +18,9 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/libiconv/build b/pkg/libiconv/build
index 5de9964..73ddd96 100755
--- a/pkg/libiconv/build
+++ b/pkg/libiconv/build
@@ -18,14 +18,9 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install
 
-	rm -r "$DEPLOY/share"
-	rm "$DEPLOY/lib/charset.alias"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 	strip_files ${DEPLOY}/{bin,lib}/*
 }
 
diff --git a/pkg/libidn2/build b/pkg/libidn2/build
index 7b94124..0867c81 100755
--- a/pkg/libidn2/build
+++ b/pkg/libidn2/build
@@ -18,13 +18,8 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
-
-	rm -r "$DEPLOY/share"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/libmnl/build b/pkg/libmnl/build
index 243a744..993cf75 100644
--- a/pkg/libmnl/build
+++ b/pkg/libmnl/build
@@ -18,12 +18,9 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/libnftnl/build b/pkg/libnftnl/build
index 2bd2c27..883e0dc 100644
--- a/pkg/libnftnl/build
+++ b/pkg/libnftnl/build
@@ -18,12 +18,9 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/libseccomp/build b/pkg/libseccomp/build
index d33f84d..107c726 100644
--- a/pkg/libseccomp/build
+++ b/pkg/libseccomp/build
@@ -18,13 +18,8 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
-
-	rm -r "$DEPLOY/share"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/libtasn1/build b/pkg/libtasn1/build
index 9db4dbc..586bbc6 100755
--- a/pkg/libtasn1/build
+++ b/pkg/libtasn1/build
@@ -18,13 +18,8 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
-
-	rm -r "$DEPLOY/share"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/libunistring/build b/pkg/libunistring/build
index 948df9a..4588569 100755
--- a/pkg/libunistring/build
+++ b/pkg/libunistring/build
@@ -18,14 +18,8 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
-
-	rm -r "$DEPLOY/share"
-	rm "$DEPLOY/lib/charset.alias"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/linux_headers/build b/pkg/linux_headers/build
index 9341b7d..63cce0a 100755
--- a/pkg/linux_headers/build
+++ b/pkg/linux_headers/build
@@ -10,8 +10,7 @@ build() {
 deploy() {
 	local INPUT="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	export KBUILD_OUTPUT="$PKGBUILDDIR"
-	make -C "$INPUT" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" INSTALL_HDR_PATH="$DEVDEPLOY" headers_install
+	make -C "$INPUT" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" INSTALL_HDR_PATH="$DEPLOY" headers_install
 }
diff --git a/pkg/lzo/build b/pkg/lzo/build
index 7b9578c..6be78b9 100644
--- a/pkg/lzo/build
+++ b/pkg/lzo/build
@@ -19,12 +19,9 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/musl/build b/pkg/musl/build
index 4a35a90..4547a99 100755
--- a/pkg/musl/build
+++ b/pkg/musl/build
@@ -17,14 +17,9 @@ build() {
 deploy() {
 	local INPUT="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
-
-	DESTDIR="$DEVDEPLOY" make install-headers
-	DESTDIR="$DEVDEPLOY" make install-libs
-	rm $DEVDEPLOY/lib/*.so*
 
+	DESTDIR="$DEPLOY" make install-headers
 	DESTDIR="$DEPLOY" make install-libs
-	rm $DEPLOY/lib/*.a $DEPLOY/lib/*.o
 
 	mkdir -p "$DEPLOY/etc"
 
@@ -32,9 +27,9 @@ deploy() {
 
 	strip_files ${DEPLOY}/lib/*
 
-	find "$DEPLOY/lib" -exec stat {} --printf="%n m %a 0 0\\n" \; | \
+	find ${DEPLOY}/lib/*.so* -exec stat {} --printf="%n m %a 0 0\\n" \; | \
 		sed "s#^$DEPLOY/##g" | sed "s/644/444/g" | \
-		sed "s/755/555/g" | tail -n +2 > "$DEPLOY/rootfs_files.txt"
+		sed "s/755/555/g" > "$DEPLOY/rootfs_files.txt"
 
 	find "$DEPLOY/etc" -exec stat {} --printf="%n m %a 0 0\\n" \; | \
 		sed "s#^$DEPLOY/##g" | tail -n +2 >> "$DEPLOY/rootfs_files.txt"
diff --git a/pkg/ncurses/build b/pkg/ncurses/build
index 746e5dc..53466c6 100755
--- a/pkg/ncurses/build
+++ b/pkg/ncurses/build
@@ -21,7 +21,6 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
@@ -30,44 +29,20 @@ deploy() {
 
 	strip_files ${DEPLOY}/bin/* ${DEPLOY}/lib/*.so*
 
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
+	mkdir -p "${DEPLOY}/include/ncurses"
 
-	mkdir -p "${DEVDEPLOY}/include/ncurses"
-
-	for hdr in ${DEVDEPLOY}/include/ncursesw/*.h; do
+	for hdr in ${DEPLOY}/include/ncursesw/*.h; do
 		local fname=$(basename $hdr)
 		local target="../$fname"
 
-		mv "$hdr" "${DEVDEPLOY}/include"
-		ln -s "$target" "${DEVDEPLOY}/include/ncursesw/${fname}"
-		ln -s "$target" "${DEVDEPLOY}/include/ncurses/${fname}"
+		mv "$hdr" "${DEPLOY}/include"
+		ln -s "$target" "${DEPLOY}/include/ncursesw/${fname}"
+		ln -s "$target" "${DEPLOY}/include/ncurses/${fname}"
 	done
 
 	ln -s "libncursesw.so.$VERSION" "$DEPLOY/lib/libtinfo.so"
 	ln -s "libncursesw.so.$VERSION" "$DEPLOY/lib/libtinfo.so.$VERSION"
-	ln -s "libncursesw.a" "$DEVDEPLOY/lib/libtinfo.a"
-
-	# only keep relevant terminfo files
-	local olddir="$DEPLOY/share/terminfo.old"
-	local newdir="$DEPLOY/share/terminfo"
-	local term x
-
-	mv "$newdir" "$olddir"
-
-	for term in ansi dumb gnome gnome-fc5 gnome-rh72 gnome-rh80 \
-		    gnome-rh90 gnome-256color klone+color konsole \
-		    konsole-256color kvt linux linux-m linux-nic mlterm \
-		    nxterm rxvt rxvt-256color rxvt-basic rxvt-color screen \
-		    screen-256color screen-w unknown vt100 vt102 vt220 \
-		    vt220-8 vt220-8bit vt320 vt52 vte xterm xterm-256color \
-		    xterm-basic xterm-color xterm-nic xterm-r6;
-	do
-		x=${term:0:1}
-		mkdir -p "$newdir/$x"
-		mv "$olddir/$x/$term" "$newdir/$x"
-	done
-
-	rm -r "$olddir"
+	ln -s "libncursesw.a" "$DEPLOY/lib/libtinfo.a"
 }
 
 check_update() {
diff --git a/pkg/nettle/build b/pkg/nettle/build
index 479901c..824ca0a 100755
--- a/pkg/nettle/build
+++ b/pkg/nettle/build
@@ -18,11 +18,9 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install
 
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 	strip_files ${DEPLOY}/{bin,lib}/*
 }
 
diff --git a/pkg/nftables/build b/pkg/nftables/build
index 278adca..0690204 100644
--- a/pkg/nftables/build
+++ b/pkg/nftables/build
@@ -19,7 +19,6 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
diff --git a/pkg/openssl/build b/pkg/openssl/build
index e85f240..aa89338 100755
--- a/pkg/openssl/build
+++ b/pkg/openssl/build
@@ -21,12 +21,10 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
 
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 	strip_files ${DEPLOY}/bin/* ${DEPLOY}/lib/*.so*
 }
 
diff --git a/pkg/procps-ng/build b/pkg/procps-ng/build
index f8ab2c6..c3ad2ef 100755
--- a/pkg/procps-ng/build
+++ b/pkg/procps-ng/build
@@ -22,12 +22,9 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/psmisc/build b/pkg/psmisc/build
index 3a465fc..c091c18 100755
--- a/pkg/psmisc/build
+++ b/pkg/psmisc/build
@@ -21,7 +21,6 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
diff --git a/pkg/readline/build b/pkg/readline/build
index bea8e73..6744e1d 100755
--- a/pkg/readline/build
+++ b/pkg/readline/build
@@ -18,12 +18,10 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make SHLIB_LIBS="-lncursesw" DESTDIR="$DEPLOY" install
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
 
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 	chmod 755 ${DEPLOY}/lib/*
 	strip_files ${DEPLOY}/lib/*
 }
diff --git a/pkg/sqlite3/build b/pkg/sqlite3/build
index 772ca3b..d089014 100755
--- a/pkg/sqlite3/build
+++ b/pkg/sqlite3/build
@@ -18,13 +18,8 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
-
-	rm -r "$DEPLOY/share"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/tc-gcc2/build b/pkg/tc-gcc2/build
index 4f0f078..2de3ea7 100755
--- a/pkg/tc-gcc2/build
+++ b/pkg/tc-gcc2/build
@@ -20,7 +20,6 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make install
 
@@ -28,7 +27,7 @@ deploy() {
 
 	for f in $(ls ${TCDIR}/${TARGET}/include); do
 		for dep in $DEPENDS; do
-			if [ -e ${PKGDEVDEPLOYDIR}/${dep}/include/$f ]; then
+			if [ -e ${PKGDEPLOYDIR}/${dep}/include/$f ]; then
 				rm -rf "$TCDIR/$TARGET/include/$f"
 			fi
 		done
@@ -36,10 +35,6 @@ deploy() {
 
 	for f in $(ls ${TCDIR}/${TARGET}/lib); do
 		for dep in $DEPENDS; do
-			if [ -e ${PKGDEVDEPLOYDIR}/${dep}/lib/$f ]; then
-				rm -rf "$TCDIR/$TARGET/lib/$f"
-				continue
-			fi
 			if [ -e ${PKGDEPLOYDIR}/${dep}/lib/$f ]; then
 				rm -rf "$TCDIR/$TARGET/lib/$f"
 			fi
@@ -47,10 +42,8 @@ deploy() {
 	done
 
 	mkdir -p "$DEPLOY/lib"
-	mv ${TCDIR}/${TARGET}/{include,lib} "$DEVDEPLOY"
-	rm ${DEVDEPLOY}/lib/*.la
-	mv ${DEVDEPLOY}/lib/*.so* "$DEPLOY/lib"
-	mv ${DEPLOY}/lib/*.py "$DEVDEPLOY/lib"
+	mv ${TCDIR}/${TARGET}/{include,lib} "$DEPLOY"
+	rm ${DEPLOY}/lib/*.la
 
 	strip_files ${DEPLOY}/lib/*
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
diff --git a/pkg/unbound/build b/pkg/unbound/build
index 267c34e..1a34425 100644
--- a/pkg/unbound/build
+++ b/pkg/unbound/build
@@ -21,7 +21,6 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 	local tag alg type digest
 
 	make DESTDIR="$DEPLOY" install
@@ -29,7 +28,6 @@ deploy() {
 
 	cat_file_override "unbound.conf" > "$DEPLOY/etc/unbound/unbound.conf"
 
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 	strip_files ${DEPLOY}/{bin,lib}/*
 
 	echo "generating trust anchor root.key"
diff --git a/pkg/util-linux/build b/pkg/util-linux/build
index 3c4554c..7388ed4 100755
--- a/pkg/util-linux/build
+++ b/pkg/util-linux/build
@@ -32,7 +32,6 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 	local UTIL
 
 	mkdir -p "$DEPLOY/var/lib/hwclock"
@@ -45,7 +44,6 @@ deploy() {
 		mv ${DEPLOY}/sbin/* ${DEPLOY}/bin
 	fi
 
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
 }
 
diff --git a/pkg/xz/build b/pkg/xz/build
index 5012c35..d6a397c 100644
--- a/pkg/xz/build
+++ b/pkg/xz/build
@@ -18,12 +18,9 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install-strip
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
-
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 }
 
 check_update() {
diff --git a/pkg/zlib/build b/pkg/zlib/build
index fc2c24b..d199f10 100644
--- a/pkg/zlib/build
+++ b/pkg/zlib/build
@@ -19,12 +19,10 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local DEVDEPLOY="$3"
 
 	make DESTDIR="$DEPLOY" install
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
 
-	split_dev_deploy "$DEPLOY" "$DEVDEPLOY"
 	strip_files ${DEPLOY}/lib/*
 }
 
diff --git a/util/misc.sh b/util/misc.sh
index dbb0134..d5ae831 100644
--- a/util/misc.sh
+++ b/util/misc.sh
@@ -22,38 +22,17 @@ strip_files() {
 	done
 }
 
-split_dev_deploy() {
-	local lib f
-
-	if [ -d "$1/include" ]; then
-		mv "$1/include" "$2"
-	fi
-
-	if [ -d "$1/lib/pkgconfig" ]; then
-		mkdir -p "$2/lib/pkgconfig"
-		mv $1/lib/pkgconfig/* "$2/lib/pkgconfig"
-		rmdir "$1/lib/pkgconfig"
-	fi
+deploy_dev_cleanup() {
+	local f
 
 	if [ -d "$1/share/pkgconfig" ]; then
-		mkdir -p "$2/lib/pkgconfig"
-		mv $1/share/pkgconfig/* "$2/lib/pkgconfig"
+		mkdir -p "$1/lib/pkgconfig"
+		mv $1/share/pkgconfig/* "$1/lib/pkgconfig"
 		rmdir "$1/share/pkgconfig"
 	fi
 
 	for f in ${1}/lib/*.la; do
-		if [ -e "$f" ]; then
-			rm "$f"
-		fi
-	done
-
-	for f in ${1}/lib/*.a; do
-		if [ -f "$f" ]; then
-			mkdir -p "$2/lib"
-			mv ${1}/lib/*.a "$2/lib"
-		fi
-
-		break
+		[ ! -e "$f" ] || rm "$f"
 	done
 }
 
diff --git a/util/pkgcmd.sh b/util/pkgcmd.sh
index 0d1a456..2c9597e 100644
--- a/util/pkgcmd.sh
+++ b/util/pkgcmd.sh
@@ -1,18 +1,16 @@
 run_pkg_command() {
 	local FUNCTION="$1"
 	local DEPLOYDIR="$PKGDEPLOYDIR/$PKGNAME"
-	local DEVDEPLOYDIR="$PKGDEVDEPLOYDIR/$PKGNAME"
 	local LOGFILE="$PKGLOGDIR/${PKGNAME}-${FUNCTION}.log"
 	local SRC="$PKGSRCDIR/$SRCDIR"
 
 	echo "$PKGNAME - $FUNCTION"
 
-	mkdir -p "$PKGBUILDDIR" "$DEPLOYDIR" "$DEVDEPLOYDIR"
+	mkdir -p "$PKGBUILDDIR" "$DEPLOYDIR"
 
 	pushd "$PKGBUILDDIR" > /dev/null
-	$FUNCTION "$SRC" "$DEPLOYDIR" "$DEVDEPLOYDIR" &>> "$LOGFILE" < /dev/null
+	$FUNCTION "$SRC" "$DEPLOYDIR" &>> "$LOGFILE" < /dev/null
 	popd > /dev/null
 
 	(rmdir "$DEPLOYDIR" || true) 2> /dev/null ;
-	(rmdir "$DEVDEPLOYDIR" || true) 2> /dev/null ;
 }
diff --git a/util/toolchain.sh b/util/toolchain.sh
index 9443d0c..e851ede 100644
--- a/util/toolchain.sh
+++ b/util/toolchain.sh
@@ -17,14 +17,11 @@ restore_toolchain() {
 
 install_build_deps() {
 	for deppkg in $DEPENDS; do
-		local devdir="$PKGDEVDEPLOYDIR/$deppkg"
+		local devdir="$PKGDEPLOYDIR/$deppkg"
 
 		if [ -d "$devdir/include" ]; then
 			cp -R "$devdir/include" "$TCDIR/$TARGET"
 		fi
-		if [ -d "$PKGDEPLOYDIR/$deppkg/lib" ]; then
-			cp -R "$PKGDEPLOYDIR/$deppkg/lib" "$TCDIR/$TARGET"
-		fi
 		if [ -d "$devdir/lib" ]; then
 			cp -R "$devdir/lib" "$TCDIR/$TARGET"
 		fi