diff --git a/packages.ia b/packages.ia
index 55d6596..3f1e249 100644
--- a/packages.ia
+++ b/packages.ia
@@ -17,7 +17,7 @@ if @core {
             schedtool pciutils usbutils rsync;
 
     # compression
-    install bzip2 gzip pax lzma @!lenny xz-utils cpio;
+    install bzip2 gzip pax lzma xz-utils cpio;
 
     # terminals
     install ncurses-bin ncurses-term;
@@ -74,7 +74,7 @@ if @container {
 };
 
 if @auth-core {
-    install @!lenny nslcd libnss-ldapd ldap-utils libpam-krb5 krb5-user
+    install nslcd libnss-ldapd ldap-utils libpam-krb5 krb5-user
     ldapvi libsasl2-modules-gssapi-mit;
 
     @office
@@ -182,7 +182,7 @@ if @devel-full {
     install openjdk-6-jdk;
 
     # haskell
-    install ghc6 ghc6-doc @!lenny haskell-platform;
+    install ghc6 ghc6-doc haskell-platform;
 
     # ocaml
     install ocaml camlp4;
@@ -210,12 +210,12 @@ if @devel-full {
             ruby1.9-dev/ruby1.9.1-dev;
 
     # llvm
-    install @!lenny clang llvm-2.9/llvm llvm-2.9-dev/llvm-dev;
+    install clang llvm-2.9/llvm llvm-2.9-dev/llvm-dev;
 
     # scheme
     install mit-scheme-doc chicken-bin
             @!lucid @!maverick @!squeeze guile-1.8-dev tinyscheme
-            @!lenny @x86 scheme2c @!lenny scheme9
+            @x86 scheme2c scheme9
             @x86 stalin
             @x86 plt-scheme
             @wheezy/sid/oneiric/precise racket racket-doc;
@@ -291,7 +291,7 @@ if @general-use {
 
     # network
     install @!precise ipset ipcalc iftop nmap openipmi @x86 ipmitool cdpr lksctp-tools
-            iptables ebtables arptables tsocks @!lenny freeipmi-tools
+            iptables ebtables arptables tsocks freeipmi-tools
             lftp ncftp axel
             @X wireshark;
 
@@ -349,7 +349,6 @@ if @general-use {
     install octave3.2-emacsen/octave3.0-emacsen
 	    octave3.2-headers/octave3.0-headers;
 
-    @!lenny
     install octave-audio octave-benchmark octave-communications-common
 	    octave-communications octave-control octave-data-smoothing
 	    octave-econometrics octave-epstk octave-financial octave-fixed
@@ -364,15 +363,15 @@ if @general-use {
 	    octave-pfstools octave-plplot;
 
     # These don't exist in precise.
-    @!lenny @!precise
+    @!precise
     install octave-sockets;
 
-    @!lenny @!precise @!quantal
+    @!precise @!quantal
     install octave-ad octave-combinatorics octave-ftp octave-ident
             octave-informationtheory octave-irsa octave-multicore octave-nlwing2
             octave-outliers octave-pdb octave-simp octave-symband octave-sp;
 
-    @!lenny @!quantal
+    @!quantal
     install octave-parallel octave-time;
 
     # xml
@@ -398,10 +397,10 @@ if @general-use {
     install mutt alpine tin irssi
             @squeeze/lucid/maverick bsd-mailx procmail centerim fetchmail
             nn slrn spamassassin trn4
-            @lenny @!squeeze @!alpha pine;
+            @!squeeze @!alpha pine;
 
     # utilities
-    install rdiff tofrodos mc socat snmp @!lenny snmp-mibs-downloader
+    install rdiff tofrodos mc socat snmp snmp-mibs-downloader
             @!lucid @!maverick busybox-static/busybox
             @lucid/maverick busybox-static uboot-mkimage most
             bonnie++ latencytop time bsdmainutils dctrl-tools @!quantal ddrescue
@@ -466,11 +465,11 @@ if @X {
 
     # browsers
     install thunderbird/icedove epiphany-browser
-            @!lenny midori flashplugin-installer;
+            midori flashplugin-installer;
 
     # multimedia
     install audacity @!ubuntu kstreamripper audacious lmms k3b
-            @!lenny ardour imagemagick blender gthumb eog;
+            ardour imagemagick blender gthumb eog;
 
     # documents
     install fontforge xpdf evince djview4;
@@ -482,7 +481,7 @@ if @X {
     install carmetal;
 
     # cad
-    install xtrkcad @!lenny freecad pythoncad;
+    install xtrkcad freecad pythoncad;
 
     # gnome
     install gnome-themes-extras gnome-themes-standard gnome-themes-ubuntu
@@ -490,7 +489,7 @@ if @X {
 
     # kde
     install @!kdebase kdebase-runtime kdeutils
-            @lenny/squeeze kde-core @!lenny kdebase-workspace;
+            @squeeze kde-core kdebase-workspace;
 
     # xfce
     install xfce4;
@@ -506,7 +505,7 @@ if @X {
 
     # miscellaneous
     install gucharmap gmrun dzen2 xserver-xephyr xtightvncviewer
-            @lenny/squeeze wine;
+            @squeeze wine;
 };
 
 if @core {
@@ -521,11 +520,11 @@ if @core {
            @ubuntu gnome-keyring;
 
     # useless packages
-    remove winbind @!audio timidity @!lenny modemmanager
-           libpam-ldap @!lenny libpam-ldapd
+    remove winbind @!audio timidity modemmanager
+           libpam-ldap libpam-ldapd
 	   @!office isc-dhcp-client/dhcp3-client
-           @!lenny blcr-dkms
-           @!squeeze @!lenny @!wheezy apparmor @!squeeze @!lenny packagekit
+           blcr-dkms
+           @!squeeze @!wheezy apparmor @!squeeze packagekit
 	   sn;
 
     # X-only packages