diff --git a/es-app/src/CollectionSystemsManager.h b/es-app/src/CollectionSystemsManager.h
index 17ce39309..a27e40ae9 100644
--- a/es-app/src/CollectionSystemsManager.h
+++ b/es-app/src/CollectionSystemsManager.h
@@ -34,7 +34,7 @@ class Window;
 struct SystemEnvironmentData;
 
 enum CollectionSystemType {
-    AUTO_ALL_GAMES, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+    AUTO_ALL_GAMES,
     AUTO_LAST_PLAYED,
     AUTO_FAVORITES,
     CUSTOM_COLLECTION
diff --git a/es-app/src/MetaData.h b/es-app/src/MetaData.h
index c4e2ef6bb..4ae9fabe6 100644
--- a/es-app/src/MetaData.h
+++ b/es-app/src/MetaData.h
@@ -56,7 +56,7 @@ struct MetaDataDecl {
 };
 
 enum MetaDataListType {
-    GAME_METADATA, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+    GAME_METADATA,
     FOLDER_METADATA
 };
 
diff --git a/es-app/src/main.cpp b/es-app/src/main.cpp
index 7838446ed..eff59ad09 100644
--- a/es-app/src/main.cpp
+++ b/es-app/src/main.cpp
@@ -67,14 +67,14 @@ namespace
     bool settingsNeedSaving {false};
 
     enum loadSystemsReturnCode {
-        LOADING_OK, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+        LOADING_OK,
         INVALID_FILE,
         NO_ROMS
     };
 
 #if defined(_WIN64)
     enum win64ConsoleType {
-        NO_CONSOLE, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+        NO_CONSOLE,
         PARENT_CONSOLE,
         ALLOCATED_CONSOLE
     };
diff --git a/es-app/src/scrapers/Scraper.h b/es-app/src/scrapers/Scraper.h
index 5649e8506..89c0adaba 100644
--- a/es-app/src/scrapers/Scraper.h
+++ b/es-app/src/scrapers/Scraper.h
@@ -28,7 +28,7 @@ class FileData;
 class SystemData;
 
 enum downloadStatus {
-    NOT_STARTED, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+    NOT_STARTED,
     IN_PROGRESS,
     COMPLETED
 };
diff --git a/es-app/src/views/ViewController.h b/es-app/src/views/ViewController.h
index e883e694c..d72f1d6fd 100644
--- a/es-app/src/views/ViewController.h
+++ b/es-app/src/views/ViewController.h
@@ -86,14 +86,14 @@ public:
     void render(const glm::mat4& parentTrans) override;
 
     enum ViewMode {
-        NOTHING, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+        NOTHING,
         START_SCREEN,
         SYSTEM_SELECT,
         GAMELIST
     };
 
     enum GamelistViewStyle {
-        AUTOMATIC, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+        AUTOMATIC,
         BASIC,
         DETAILED,
         VIDEO
diff --git a/es-core/src/AsyncHandle.h b/es-core/src/AsyncHandle.h
index 5630890c0..89d382c4e 100644
--- a/es-core/src/AsyncHandle.h
+++ b/es-core/src/AsyncHandle.h
@@ -12,7 +12,7 @@
 #include <string>
 
 enum AsyncHandleStatus {
-    ASYNC_IN_PROGRESS, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+    ASYNC_IN_PROGRESS,
     ASYNC_ERROR,
     ASYNC_DONE
 };
diff --git a/es-core/src/InputConfig.h b/es-core/src/InputConfig.h
index be7a06ee3..df34b11dd 100644
--- a/es-core/src/InputConfig.h
+++ b/es-core/src/InputConfig.h
@@ -20,7 +20,7 @@
 #define DEVICE_CEC -2
 
 enum InputType {
-    TYPE_AXIS, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+    TYPE_AXIS,
     TYPE_BUTTON,
     TYPE_KEY,
     TYPE_CEC_BUTTON,
diff --git a/es-core/src/Log.h b/es-core/src/Log.h
index ea259db06..3319fe771 100644
--- a/es-core/src/Log.h
+++ b/es-core/src/Log.h
@@ -24,7 +24,7 @@
         Log().get(level)
 
 enum LogLevel {
-    LogError, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+    LogError,
     LogWarning,
     LogInfo,
     LogDebug
diff --git a/es-core/src/components/ComponentGrid.h b/es-core/src/components/ComponentGrid.h
index 7e5999202..aafcd4e57 100644
--- a/es-core/src/components/ComponentGrid.h
+++ b/es-core/src/components/ComponentGrid.h
@@ -15,7 +15,7 @@
 namespace GridFlags
 {
     enum UpdateType {
-        UPDATE_ALWAYS, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+        UPDATE_ALWAYS,
         UPDATE_WHEN_SELECTED,
         UPDATE_NEVER
     };
diff --git a/es-core/src/components/ComponentList.h b/es-core/src/components/ComponentList.h
index a8827690f..cd9f044d1 100644
--- a/es-core/src/components/ComponentList.h
+++ b/es-core/src/components/ComponentList.h
@@ -62,7 +62,7 @@ public:
     ComponentList();
 
     enum ScrollIndicator {
-        SCROLL_NONE, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+        SCROLL_NONE,
         SCROLL_UP,
         SCROLL_UP_DOWN,
         SCROLL_DOWN
diff --git a/es-core/src/components/DateTimeEditComponent.h b/es-core/src/components/DateTimeEditComponent.h
index 12b4329d4..4dbf33391 100644
--- a/es-core/src/components/DateTimeEditComponent.h
+++ b/es-core/src/components/DateTimeEditComponent.h
@@ -20,7 +20,7 @@ class DateTimeEditComponent : public GuiComponent
 {
 public:
     enum DisplayMode {
-        DISP_DATE, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+        DISP_DATE,
         DISP_DATE_TIME,
         DISP_RELATIVE_TO_NOW
     };
diff --git a/es-core/src/components/GameSelectorComponent.h b/es-core/src/components/GameSelectorComponent.h
index 783aff0e8..e6b42e741 100644
--- a/es-core/src/components/GameSelectorComponent.h
+++ b/es-core/src/components/GameSelectorComponent.h
@@ -34,7 +34,7 @@ public:
     }
 
     enum class GameSelection {
-        RANDOM, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+        RANDOM,
         LAST_PLAYED,
         MOST_PLAYED
     };
diff --git a/es-core/src/components/IList.h b/es-core/src/components/IList.h
index a4e9b2a22..ff0fd307e 100644
--- a/es-core/src/components/IList.h
+++ b/es-core/src/components/IList.h
@@ -14,12 +14,12 @@
 #include "utils/StringUtil.h"
 
 enum class CursorState {
-    CURSOR_STOPPED, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+    CURSOR_STOPPED,
     CURSOR_SCROLLING
 };
 
 enum class ListLoopType {
-    LIST_ALWAYS_LOOP, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+    LIST_ALWAYS_LOOP,
     LIST_PAUSE_AT_END,
     LIST_PAUSE_AT_END_ON_JUMP,
     LIST_NEVER_LOOP
diff --git a/es-core/src/components/ImageGridComponent.h b/es-core/src/components/ImageGridComponent.h
index 689052728..c4ce3bcbd 100644
--- a/es-core/src/components/ImageGridComponent.h
+++ b/es-core/src/components/ImageGridComponent.h
@@ -18,12 +18,12 @@
 #define EXTRAITEMS 2
 
 enum ScrollDirection {
-    SCROLL_VERTICALLY, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+    SCROLL_VERTICALLY,
     SCROLL_HORIZONTALLY
 };
 
 enum ImageSource {
-    THUMBNAIL, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+    THUMBNAIL,
     IMAGE,
     MIXIMAGE,
     SCREENSHOT,
diff --git a/es-core/src/components/primary/CarouselComponent.h b/es-core/src/components/primary/CarouselComponent.h
index 4d388f8fd..6d9abfaa3 100644
--- a/es-core/src/components/primary/CarouselComponent.h
+++ b/es-core/src/components/primary/CarouselComponent.h
@@ -40,7 +40,7 @@ public:
     using Entry = typename IList<CarouselEntry, T>::Entry;
 
     enum class CarouselType {
-        HORIZONTAL, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+        HORIZONTAL,
         VERTICAL,
         VERTICAL_WHEEL,
         HORIZONTAL_WHEEL,
diff --git a/es-core/src/components/primary/PrimaryComponent.h b/es-core/src/components/primary/PrimaryComponent.h
index 32a64bb86..7d3945631 100644
--- a/es-core/src/components/primary/PrimaryComponent.h
+++ b/es-core/src/components/primary/PrimaryComponent.h
@@ -13,12 +13,12 @@ template <typename T> class PrimaryComponent : public virtual GuiComponent
 {
 public:
     enum class PrimaryType {
-        CAROUSEL, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+        CAROUSEL,
         TEXTLIST
     };
 
     enum class PrimaryAlignment {
-        ALIGN_LEFT, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+        ALIGN_LEFT,
         ALIGN_CENTER,
         ALIGN_RIGHT
     };
diff --git a/es-core/src/renderers/Renderer.h b/es-core/src/renderers/Renderer.h
index 0d7a5dbe2..e0ca1d1a6 100644
--- a/es-core/src/renderers/Renderer.h
+++ b/es-core/src/renderers/Renderer.h
@@ -22,7 +22,7 @@ class Renderer
 {
 public:
     enum class TextureType {
-        RGBA, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+        RGBA,
         BGRA,
         RED
     };
diff --git a/es-core/src/utils/PlatformUtil.h b/es-core/src/utils/PlatformUtil.h
index 1dd319f5c..6ff1b550e 100644
--- a/es-core/src/utils/PlatformUtil.h
+++ b/es-core/src/utils/PlatformUtil.h
@@ -20,7 +20,7 @@ namespace Utils
     namespace Platform
     {
         enum QuitMode {
-            QUIT = 0, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
+            QUIT = 0,
             REBOOT = 1,
             POWEROFF = 2
         };