diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl
index 38b1d0cde..c52069f01 100644
--- a/share/templates.d/99-generic/runtime-install.tmpl
+++ b/share/templates.d/99-generic/runtime-install.tmpl
@@ -117,19 +117,10 @@ installpkg tar xz curl bzip2
 installpkg systemd-sysv systemd-units
 installpkg rsyslog
 
-## filesystem tools
-installpkg btrfs-progs jfsutils xfsprogs ntfs-3g ntfsprogs dosfstools e2fsprogs f2fs-tools
-installpkg system-storage-manager
+## extra storage tools for rescue mode
 installpkg device-mapper-persistent-data
 installpkg xfsdump
 
-## extra storage packages
-# hostname is needed for iscsi to work, see RHBZ#1593917
-installpkg udisks2 udisks2-iscsi hostname
-
-## extra libblockdev plugins
-installpkg libblockdev-lvm-dbus
-
 ## needed for LUKS escrow
 installpkg volume_key
 installpkg nss-tools