diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 506e1d9f..d7aab53b 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -33,7 +33,7 @@ removepkg nc net-snmp-libs
 removepkg net-snmp-utils netcf-libs nfs-utils-lib nss-sysinit nss-tools ntp
 removepkg numactl oddjob passwd
 removepkg pexpect pinentry pkgconfig ppp pth
-removepkg ricci rmt rpcbind samba-common setuptool
+removepkg ricci rmt rpcbind setuptool
 removepkg sg3_utils sg3_utils-libs sgml-common sgpio shadow-utils
 removepkg shared-mime-info
 removepkg squashfs-tools system-config-firewall-base system-config-users
@@ -366,7 +366,6 @@ removefrom report /usr/bin/* /usr/include/* /usr/${libdir}/libstrata_*
 removefrom report /usr/share/locale/*
 removefrom rpm /usr/bin/* /usr/lib/rpm/platform/* /usr/share/locale/*
 removefrom rsync /etc/*
-removefrom samba-winbind-clients /${libdir}/libnss_* /usr/${libdir}/libnss_*
 removefrom sed /usr/share/locale/*
 removefrom selinux-policy-targeted /usr/share/selinux/*
 removefrom smartmontools /etc/* /usr/sbin/smartd
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index 6e8ffefa..6eb6094a 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -96,10 +96,6 @@ installpkg wget rsync rsh bind-utils ftp mtr vconfig rdate
 ## I'm keeping them here with commentary until I'm sure they're not needed.
 ## Why would we need firstboot in anaconda?
 installpkg firstboot
-## Cleanup leaves only pam_smbpass.so, which AFAIK we don't use
-installpkg samba-common
-## Cleanup leaves only pam_winbind.so and /usr/lib/libwbclient.so.0
-installpkg samba-winbind-clients
 
 ## actually install all the requested packages
 run_pkg_transaction