diff --git a/dist/sources/filter-modules.sh b/dist/sources/filter-modules.sh
index 457f47e7e930..fd44a5143cca 100755
--- a/dist/sources/filter-modules.sh
+++ b/dist/sources/filter-modules.sh
@@ -172,13 +172,6 @@ case $MODULEPKG in
 		# Now process the override list to bring those modules back into core
 		filter_override "$overrides"
 		;;
-	modules-public-removable-media )
-		# Filter all mods under /lib/modules/$kver/kernel/drivers/usb/storage
-		filter_mods "drivers/usb/" "storage" /
-		;;
-	modules-public )
-		filter_mods "drivers/gpu/drm/" "nouveau" /
-		;;
 	modules-private )
 		filter_mods "" "$privatemods" /
 		;;
diff --git a/dist/templates/kernel.template.spec b/dist/templates/kernel.template.spec
index c8463cd268f1..45046c68d824 100644
--- a/dist/templates/kernel.template.spec
+++ b/dist/templates/kernel.template.spec
@@ -259,32 +259,6 @@ Requires(postun): kmod
 %description modules
 This package provides commonly used kernel modules for the %{?2:%{2}-}core kernel package.
 
-### Kernel removable media module package
-%package modules-public-removable-media
-Summary: %{rpm_vendor} Kernel removable modules to match the %{rpm_name}-core kernel
-Provides: installonlypkg(kernel-module-removable-media)
-Requires: %{rpm_name} = %{version}-%{release}
-AutoReq: no
-AutoProv: yes
-Requires(pre): kmod
-Requires(postun): kmod
-%description modules-public-removable-media
-This package provides drivers for removable media, e.g. USB disks and CD-ROM,
-for %{name} of version %{version}-%{release}.
-
-### Kernel module public package
-%package modules-public
-Summary: %{rpm_vendor} Kernel modules public to match the %{rpm_name}-core kernel
-Provides: installonlypkg(kernel-module-public)
-Requires: %{rpm_name} = %{version}-%{release}
-AutoReq: no
-AutoProv: yes
-Requires(pre): kmod
-Requires(postun): kmod
-%description modules-public
-This package provides drivers for public release, e.g. nouveau.ko,
-for %{name} of version %{version}-%{release}.
-
 ### Kernel module private package
 %package modules-private
 Summary: %{rpm_vendor} Kernel modules private to match the %{rpm_name}-core kernel
@@ -1100,24 +1074,12 @@ CollectKernelFile() {
 	# Rest of the modules stay in core package
 	%SOURCE10 "%{buildroot}" "$KernUnameR" "%{_target_cpu}" "$_KernBuild/System.map" non-core-modules >> modules.list || exit $?
 
-	# Do module splitting for removable-media-modules
-	%SOURCE10 "%{buildroot}" "$KernUnameR" "%{_target_cpu}" "$_KernBuild/System.map" modules-public-removable-media >> modules-public-removable-media.list || exit $?
-
-	# Do module splitting for public release modules
-	%SOURCE10 "%{buildroot}" "$KernUnameR" "%{_target_cpu}" "$_KernBuild/System.map" modules-public >> modules-public.list || exit $?
-
 	# Do module splitting for public release modules
 	%SOURCE10 "%{buildroot}" "$KernUnameR" "%{_target_cpu}" "$_KernBuild/System.map" modules-private >> modules-private.list || exit $?
 
 	comm -23 core.list modules.list > core.list.tmp
 	mv core.list.tmp core.list
 
-	comm -23 core.list modules-public-removable-media.list > core.list.tmp
-	mv core.list.tmp core.list
-
-	comm -23 core.list modules-public.list > core.list.tmp
-	mv core.list.tmp core.list
-
 	comm -23 core.list modules-private.list > core.list.tmp
 	mv core.list.tmp core.list
 
@@ -1289,18 +1251,6 @@ fi
 depmod -a %{kernel_unamer}
 
 ### Module package
-%post modules-public-removable-media
-depmod -a %{kernel_unamer}
-
-%postun modules-public-removable-media
-depmod -a %{kernel_unamer}
-
-%post modules-public
-depmod -a %{kernel_unamer}
-
-%postun modules-public
-depmod -a %{kernel_unamer}
-
 %post modules-private
 depmod -a %{kernel_unamer}
 
@@ -1364,10 +1314,6 @@ fi
 %files modules -f modules.list
 %defattr(-,root,root)
 
-%files modules-public-removable-media -f modules-public-removable-media.list
-
-%files modules-public -f modules-public.list
-
 %files modules-private -f modules-private.list
 
 %if %{with_keypkg}