diff --git a/CHANGELIST.md b/CHANGELIST.md
index f9125b8b..8fbbb34d 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -166,6 +166,7 @@
 - Fix logic for PS1-5 system information
 - Fix setting PS1-5 version on invalid
 - Fix setting Python 2 version on invalid
+- Clean up some ProcessSystem cases
 
 ### 3.1.9a (2024-05-21)
 
diff --git a/MPF.Frontend/Tools/SubmissionGenerator.cs b/MPF.Frontend/Tools/SubmissionGenerator.cs
index 34bdf1a6..92c31e46 100644
--- a/MPF.Frontend/Tools/SubmissionGenerator.cs
+++ b/MPF.Frontend/Tools/SubmissionGenerator.cs
@@ -621,23 +621,9 @@ namespace MPF.Frontend.Tools
                     info.CommonDiscInfo!.Region ??= Region.UnitedKingdom;
                     break;
 
-                case RedumpSystem.AppleMacintosh:
-                case RedumpSystem.EnhancedCD:
-                case RedumpSystem.IBMPCcompatible:
-                case RedumpSystem.PalmOS:
-                case RedumpSystem.PocketPC:
-                case RedumpSystem.RainbowDisc:
-                case RedumpSystem.SonyElectronicBook:
-                    if (system == RedumpSystem.EnhancedCD)
-                        info.CommonDiscInfo!.Category ??= DiscCategory.Audio;
-
-                    if (system == RedumpSystem.SonyElectronicBook)
-                        info.CommonDiscInfo!.Category ??= DiscCategory.Multimedia;
-
-                    break;
-
                 case RedumpSystem.AudioCD:
                 case RedumpSystem.DVDAudio:
+                case RedumpSystem.EnhancedCD:
                 case RedumpSystem.SuperAudioCD:
                     info.CommonDiscInfo!.Category ??= DiscCategory.Audio;
                     break;
@@ -686,6 +672,7 @@ namespace MPF.Frontend.Tools
 
                 case RedumpSystem.HasbroVideoNowXP:
                 case RedumpSystem.PhotoCD:
+                case RedumpSystem.SonyElectronicBook:
                     info.CommonDiscInfo!.Category ??= DiscCategory.Multimedia;
                     break;