diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
index 2d659104..c636c461 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
@@ -82,14 +82,6 @@ boot/kernel/gentoo/packages:
 	media-sound/alsa-utils
 	net-dialup/globespan-adsl
 
-# These were not stable at time of snapshot/release.
-#	net-wireless/rtl8180
-#	net-wireless/rtl8187
-#	net-wireless/adm8211
-#	net-wireless/acx
-#	net-wireless/ipw3945
-#	net-wireless/rt2500
-
 	sys-apps/pcmciautils
 	sys-kernel/linux-firmware
 	sys-kernel/spl
@@ -103,9 +95,6 @@ livecd/unmerge:
 	app-admin/perl-cleaner
 	app-admin/python-updater
 	app-arch/cpio
-	dev-libs/gmp
-	dev-libs/libxml2
-	dev-libs/mpfr
 	dev-python/pycrypto
 	dev-util/pkgconfig
 	perl-core/PodParser
@@ -116,8 +105,6 @@ livecd/unmerge:
 	sys-apps/man
 	sys-apps/man-pages
 	sys-apps/miscfiles
-#	sys-apps/portage
-#	sys-apps/sandbox
 	sys-apps/texinfo
 	sys-devel/autoconf
 	sys-devel/autoconf-wrapper
@@ -126,8 +113,6 @@ livecd/unmerge:
 	sys-devel/binutils-config
 	sys-devel/bison
 	sys-devel/flex
-# This might be needed for software speech.
-	sys-devel/gcc
 	sys-devel/gcc-config
 	sys-devel/gettext
 	sys-devel/gnuconfig
@@ -135,8 +120,6 @@ livecd/unmerge:
 	sys-devel/m4
 	sys-devel/make
 	sys-devel/patch
-	sys-libs/db
-	sys-libs/gdbm
 	sys-libs/libkudzu
 	sys-kernel/genkernel
 	sys-kernel/linux-headers
@@ -148,7 +131,6 @@ livecd/empty:
 	/etc/cron.weekly
 	/etc/logrotate.d
 	/etc/modules.autoload.d
-	/etc/rsync
 	/etc/runlevels/single
 	/etc/skel
 	/lib/dev-state
@@ -171,9 +153,6 @@ livecd/empty:
 	/usr/lib/nfs
 	/usr/lib/perl5/site_perl
 	/usr/lib/portage
-	/usr/lib/python2.2
-	/usr/lib/python2.3
-	/usr/lib/python2.4/test
 	/usr/lib64/X11/config
 	/usr/lib64/X11/doc
 	/usr/lib64/X11/etc
@@ -184,13 +163,8 @@ livecd/empty:
 	/usr/lib64/nfs
 	/usr/lib64/perl5/site_perl
 	/usr/lib64/portage
-	/usr/lib64/python2.2
-	/usr/lib64/python2.3
-	/usr/lib64/python2.4/test
 	/usr/local
 	/usr/portage
-	/usr/powerpc-unknown-linux-gnu
-	/usr/powerpc64-unknown-linux-gnu
 	/usr/share/aclocal
 	/usr/share/baselayout
 	/usr/share/binutils-data
@@ -216,7 +190,6 @@ livecd/empty:
 	/usr/share/texinfo
 	/usr/share/unimaps
 	/usr/share/zoneinfo
-	/usr/sparc-unknown-linux-gnu
 	/usr/src
 	/var/cache
 	/var/empty
@@ -288,10 +261,6 @@ livecd/rm:
 	/usr/bin/readelf
 	/usr/bin/repoman
 	/usr/bin/size
-	/usr/bin/powerpc-unknown-linux-gnu-*
-	/usr/bin/powerpc64-unknown-linux-gnu-*
-	/usr/bin/sparc-unknown-linux-gnu-*
-	/usr/bin/sparc64-unknown-linux-gnu-*
 	/usr/bin/strip
 	/usr/bin/tbz2tool
 	/usr/bin/xpak
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
index 5d50a06f..b17fcadf 100644
--- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
@@ -82,14 +82,6 @@ boot/kernel/gentoo/packages:
 	media-sound/alsa-utils
 	net-dialup/globespan-adsl
 
-# These were not stable at time of snapshot/release.
-#	net-wireless/rtl8180
-#	net-wireless/rtl8187
-#	net-wireless/adm8211
-#	net-wireless/acx
-#	net-wireless/ipw3945
-#	net-wireless/rt2500
-
 	sys-apps/pcmciautils
 	sys-kernel/linux-firmware
 
@@ -100,9 +92,6 @@ livecd/unmerge:
 	app-admin/perl-cleaner
 	app-admin/python-updater
 	app-arch/cpio
-	dev-libs/gmp
-	dev-libs/libxml2
-	dev-libs/mpfr
 	dev-python/pycrypto
 	dev-util/pkgconfig
 	perl-core/PodParser
@@ -113,8 +102,6 @@ livecd/unmerge:
 	sys-apps/man
 	sys-apps/man-pages
 	sys-apps/miscfiles
-#	sys-apps/portage
-#	sys-apps/sandbox
 	sys-apps/texinfo
 	sys-devel/autoconf
 	sys-devel/autoconf-wrapper
@@ -123,8 +110,6 @@ livecd/unmerge:
 	sys-devel/binutils-config
 	sys-devel/bison
 	sys-devel/flex
-# This might be needed for software speech.
-	sys-devel/gcc
 	sys-devel/gcc-config
 	sys-devel/gettext
 	sys-devel/gnuconfig
@@ -132,8 +117,6 @@ livecd/unmerge:
 	sys-devel/m4
 	sys-devel/make
 	sys-devel/patch
-	sys-libs/db
-	sys-libs/gdbm
 	sys-libs/libkudzu
 	sys-kernel/genkernel
 	sys-kernel/linux-headers
@@ -145,13 +128,10 @@ livecd/empty:
 	/etc/cron.weekly
 	/etc/logrotate.d
 	/etc/modules.autoload.d
-	/etc/rsync
 	/etc/runlevels/single
 	/etc/skel
 	/lib/dev-state
 	/lib/udev-state
-	/lib64/dev-state
-	/lib64/udev-state
 	/root/.ccache
 	/tmp
 	/usr/diet/include
@@ -168,26 +148,8 @@ livecd/empty:
 	/usr/lib/nfs
 	/usr/lib/perl5/site_perl
 	/usr/lib/portage
-	/usr/lib/python2.2
-	/usr/lib/python2.3
-	/usr/lib/python2.4/test
-	/usr/lib64/X11/config
-	/usr/lib64/X11/doc
-	/usr/lib64/X11/etc
-	/usr/lib64/awk
-	/usr/lib64/ccache
-	/usr/lib64/gcc-config
-	/usr/lib64/gconv
-	/usr/lib64/nfs
-	/usr/lib64/perl5/site_perl
-	/usr/lib64/portage
-	/usr/lib64/python2.2
-	/usr/lib64/python2.3
-	/usr/lib64/python2.4/test
 	/usr/local
 	/usr/portage
-	/usr/powerpc-unknown-linux-gnu
-	/usr/powerpc64-unknown-linux-gnu
 	/usr/share/aclocal
 	/usr/share/baselayout
 	/usr/share/binutils-data
@@ -213,7 +175,6 @@ livecd/empty:
 	/usr/share/texinfo
 	/usr/share/unimaps
 	/usr/share/zoneinfo
-	/usr/sparc-unknown-linux-gnu
 	/usr/src
 	/var/cache
 	/var/empty
@@ -285,10 +246,6 @@ livecd/rm:
 	/usr/bin/readelf
 	/usr/bin/repoman
 	/usr/bin/size
-	/usr/bin/powerpc-unknown-linux-gnu-*
-	/usr/bin/powerpc64-unknown-linux-gnu-*
-	/usr/bin/sparc-unknown-linux-gnu-*
-	/usr/bin/sparc64-unknown-linux-gnu-*
 	/usr/bin/strip
 	/usr/bin/tbz2tool
 	/usr/bin/xpak