diff --git a/target/bootdisk/build_stage1.sh b/target/bootdisk/build_stage1.sh
index 9360a6b7d..b25efa4cc 100644
--- a/target/bootdisk/build_stage1.sh
+++ b/target/bootdisk/build_stage1.sh
@@ -1,6 +1,4 @@
 
-set | grep STRIP
-
 echo_header "Creating initrd data:"
 rm -rf $disksdir/initrd
 mkdir -p $disksdir/initrd/{dev,proc,tmp,scsi,net,bin}
diff --git a/target/bootdisk/build_stage2.sh b/target/bootdisk/build_stage2.sh
index dbd25b06f..5b41c89d5 100644
--- a/target/bootdisk/build_stage2.sh
+++ b/target/bootdisk/build_stage2.sh
@@ -53,9 +53,10 @@ do
 done
 #
 echo_status "Remove the stuff we don't need ..."
-rm -rf usr/doc usr/man usr/info usr/share/* var/adm/*
+rm -rf home usr/{local,doc,man,info,games} var/adm/*
 rm -rf usr/{include,src} usr/*-linux-gnu usr/lib/*.{a,la,o}
 rm -rf usr/lib/*/ boot/*-rock boot/System.map
+ls -d usr/share/* | grep -v pci.ids | xargs rm -rf
 #
 echo_status "Installing some terminfo databases ..."
 tar --use-compress-program=bzip2 -xf ../../pkgs/ncurses.tar.bz2	\