diff --git a/manifests/iptables/tftp_client.pp b/manifests/iptables/tftp_client.pp
index d55ba3e9c4822b242384e7bce2e3a2124189faf8..da972fa5b871ae4228fc1b5c650cec2f1d208caa 100644
--- a/manifests/iptables/tftp_client.pp
+++ b/manifests/iptables/tftp_client.pp
@@ -1,17 +1,17 @@
 # iptables configuration for servers which want to run tftp client
 
 class base::iptables::tftp_client inherits base::iptables {
-    case $lsbdistcodename {
-        # lenny, squeeze use a different name
-        "lenny","squeeze": {
-            base::os::kernel_module { "nf_conntrack_tftp":
-                ensure => present,
-            }
-        }
-        default: {
-            base::os::kernel_module { "ip_conntrack_tftp":
-                ensure => present,
-            }
-        }
+  case $lsbdistcodename {
+    # squeeze uses a different name
+    'squeeze': {
+      base::os::kernel_module { "nf_conntrack_tftp":
+        ensure => present,
+      }
     }
+    default: {
+      base::os::kernel_module { "ip_conntrack_tftp":
+        ensure => present,
+      }
+    }
+  }
 }
diff --git a/manifests/os/debian.pp b/manifests/os/debian.pp
index a19574cf3acb8cb38378261e603a6692c2f5e81c..485dc9feb770e60ae788d1f1719e695517065010 100644
--- a/manifests/os/debian.pp
+++ b/manifests/os/debian.pp
@@ -57,31 +57,20 @@ class base::os::debian {
       notify  => Exec['aptitude update'];
   }
 
-  # Install APT preferences.  Preference handling has to be special-cased for
-  # lenny; once support for lenny is retired, we can move the preference
-  # handling into the same file block.  We should never use
-  # /etc/apt/preferences once the preferences.d directory is supported, since
-  # it makes it impossible to easily add a new pin without forking the default
-  # apt preferences file and not getting updates.
+  # Install APT preferences.  We should never use /etc/apt/preferences
+  # since the preferences.d directory is supported
   file { '/etc/apt/preferences.d':
     ensure  => directory,
     recurse => true,
     purge   => true,
   }
-  if $::lsbdistcodename == 'lenny' {
-    file { '/etc/apt/preferences':
-      source  => "puppet:///modules/base/os/etc/apt/preferences",
-      notify  => Exec['aptitude update'],
-    }
-  } else {
-    file {
-      '/etc/apt/preferences':
-        content => '';
-      '/etc/apt/preferences.d/backports':
-        content => template('base/os/preferences/backports.erb');
-      '/etc/apt/preferences.d/rsyslog':
-        content => template('base/os/preferences/rsyslog.erb');
-    }
+  file {
+    '/etc/apt/preferences':
+      content => '';
+    '/etc/apt/preferences.d/backports':
+      content => template('base/os/preferences/backports.erb');
+    '/etc/apt/preferences.d/rsyslog':
+      content => template('base/os/preferences/rsyslog.erb');
   }
 
   # lsb-release pulls in all of lsb unless we disable recommends handling
@@ -109,14 +98,10 @@ class base::os::debian {
   } else {
     include base::libstdc::v5
 
-    if $::lsbdistcodename == 'lenny' {
-      package { 'libsmbios-bin': ensure => present }
-    } else {
-      package { 'libsmbios-bin': ensure => absent }
-      package { 'smbios-utils':
-        ensure  => present,
-        require => Package['libsmbios-bin'],
-      }
+    package { 'libsmbios-bin': ensure => absent }
+    package { 'smbios-utils':
+      ensure  => present,
+      require => Package['libsmbios-bin'],
     }
   }
 
@@ -127,18 +112,8 @@ class base::os::debian {
 
   # Handle additional distribution-specific tweaks, usually related to the
   # default package set.
-  case $::lsbdistcodename {
-    'lenny': {
-      package {
-        'debian-backports-keyring': ensure => present;
-        'emacs21-nox':              ensure => present;
-        'libactiverecord-ruby':     ensure => present;
-      }
-    }
-    'squeeze', 'wheezy': {
-      package { 'emacs23-nox': ensure => present }
-    }
-  }
+  # FIXME - Move emacs23-nox to defaults class at some point
+  package { 'emacs23-nox': ensure => present }
 
   # Ensure this file exists, containing only a comment.
   file { '/etc/default/locale':