diff --git a/nodes.ia b/nodes.ia
index 0293877..68c7abc 100644
--- a/nodes.ia
+++ b/nodes.ia
@@ -75,9 +75,6 @@ profiles cmclub office machine amd64 maverick;
 @muffins
 profiles cmclub office machine amd64 maverick;
 
-@pop-tarts
-profiles cmclub office machine i386 maverick;
-
 # Computational Math Club Servers
 
 @staples
diff --git a/packages.ia b/packages.ia
index 04f126f..b60e479 100644
--- a/packages.ia
+++ b/packages.ia
@@ -59,7 +59,9 @@ if @auth-core {
     install nscd libnss-ldapd ldap-utils libpam-krb5 krb5-user ldapvi;
 
     @csclub
-    install libpam-csc molly-guard;
+    install libpam-csc;
+
+    install molly-guard;
 };
 
 if @nfs-core {
@@ -465,10 +467,12 @@ remove mlocate locate;
 
 if @!container {
     @amd64 install linux-image-amd64/linux-image;
-    @i386 install linux-image-686;
+    @i386 install linux-image-686/linux-image;
     @sparc install @!nosmp linux-image-sparc64-smp @nosmp linux-image-sparc64;
     @powerpc install linux-image-powerpc;
     @alpha install linux-image-alpha
     @mips install linux-image-mips;
     @armel install;
 };
+
+remove apparmor;