diff --git a/etc/tree/scrubs.i386 b/etc/tree/scrubs.i386
index 5276088c..df0647d3 100644
--- a/etc/tree/scrubs.i386
+++ b/etc/tree/scrubs.i386
@@ -1,5 +1,39 @@
-# remove unnecessary directories from root
+# remove unnecessary directories from /
 remove @instroot@/boot
+remove @instroot@/dev
 remove @instroot@/home
+remove @instroot@/media
+remove @instroot@/mnt
+remove @instroot@/opt
 remove @instroot@/root
+remove @instroot@/selinux
+remove @instroot@/srv
+remove @instroot@/sys
 remove @instroot@/tmp
+
+# remove directories from /usr
+remove @instroot@/usr/etc
+remove @instroot@/usr/games
+remove @instroot@/usr/include
+remove @instroot@/usr/kerberos
+remove @instroot@/usr/local
+remove @instroot@/usr/tmp
+
+# remove modules and firmware directories
+remove @instroot@/lib/modules
+remove @instroot@/lib/firmware
+
+# remove directories from /var
+remove @instroot@/var/db
+remove @instroot@/var/empty
+remove @instroot@/var/games
+remove @instroot@/var/local
+remove @instroot@/var/lock
+remove @instroot@/var/log
+remove @instroot@/var/mail
+remove @instroot@/var/nis
+remove @instroot@/var/opt
+remove @instroot@/var/preserve
+remove @instroot@/var/spool
+remove @instroot@/var/tmp
+remove @instroot@/var/yp
diff --git a/src/pylorax/_rewrite/scrubs.py b/src/pylorax/_rewrite/scrubs.py
index 1ec6279a..8f6eda3c 100644
--- a/src/pylorax/_rewrite/scrubs.py
+++ b/src/pylorax/_rewrite/scrubs.py
@@ -61,25 +61,6 @@ class Install(object):
         #if os.path.isfile(os.path.join(self.conf.treedir, 'bin', 'gawk')):
         #    os.symlink('awk', os.path.join(self.conf.treedir, 'bin', 'gawk'))
 
-        # remove dirs from root
-        dirs = ('boot', 'dev', 'home', 'media', 'mnt', 'opt', 'root', 'selinux', 'srv', 'sys', 'tmp', 'keymaps')
-        for dir in dirs:
-            rm(os.path.join(self.conf.treedir, dir))
-
-        # remove dirs from usr
-        dirs = ('etc', 'games', 'include', 'kerberos', 'local', 'tmp')
-        for dir in dirs:
-            rm(os.path.join(self.conf.treedir, 'usr', dir))
-
-        # remove dirs from var
-        dirs = ('db', 'empty', 'games', 'local', 'lock', 'log', 'mail', 'nis', 'opt', 'preserve', 'spool', 'tmp', 'yp')
-        for dir in dirs:
-            rm(os.path.join(self.conf.treedir, 'var', dir))
-
-        # remove modules and firmware
-        rm(os.path.join(self.conf.treedir, 'lib', 'modules'))
-        rm(os.path.join(self.conf.treedir, 'lib', 'firmware'))
-
         # remove dirs from usr/lib
         dirs = ('ConsoleKit', 'X11', 'alsa-lib', 'asterisk', 'avahi', 'booty', 'db4.5*', 'enchant', 'games', 'gio', 'gnome-keyring', 'gnome-vfs-2.0',
                 'krb5', 'libglade', 'libxslt-plugins', 'lua', 'notification-daemon*', 'nss', 'openssl', 'orbit-2.0', 'perl5', 'pkgconfig', 'plymouth',