diff --git a/addons/optionsmenu/README.md b/addons/optionsmenu/README.md
index f8d8c54d09..e274229053 100644
--- a/addons/optionsmenu/README.md
+++ b/addons/optionsmenu/README.md
@@ -1,7 +1,8 @@
 ace_optionsmenu
 ===============
 
-Adds the options menu used by other components.
+Previously held the options menu.
+Now just handles version display on main menu and debug/headbug on options menu.
 
 
 ## Maintainers
diff --git a/addons/optionsmenu/functions/fnc_debugDumpToClipboard.sqf b/addons/optionsmenu/functions/fnc_debugDumpToClipboard.sqf
index fcaca6a9de..a502934f50 100644
--- a/addons/optionsmenu/functions/fnc_debugDumpToClipboard.sqf
+++ b/addons/optionsmenu/functions/fnc_debugDumpToClipboard.sqf
@@ -55,15 +55,16 @@ if (isNull ace_player) then {"null"} else {animationState ace_player}];
 
 
 _text = format ["
-------ACE Settings------"];
+------ACE's CBA Settings------"];
 [_text] call _outputText;
 
-
+private _aceSettings = cba_settings_allSettings select {((_x select [0,4]) == "ace_") || {(_x select [0,5]) == "acex_"}};
+_aceSettings sort true;
 {
-    _var = missionNamespace getVariable [(_x select 0), "ERROR: Not Defined"];
-    _text = format ["%1 - %2", (_x select 0), _var];
+    _var = missionNamespace getVariable [_x, "ERROR: Not Defined"];
+    _text = format ["%1 - %2", _x, _var];
     [_text] call _outputText;
-} forEach EGVAR(common,settings);
+} forEach _aceSettings;
 
 
 _text = format ["
diff --git a/addons/optionsmenu/script_component.hpp b/addons/optionsmenu/script_component.hpp
index c13e915702..7ae6409e6c 100644
--- a/addons/optionsmenu/script_component.hpp
+++ b/addons/optionsmenu/script_component.hpp
@@ -20,10 +20,3 @@
 #define IDC_MAIN_INFO 80090
 #define IDC_MAIN_INFO_CURRENT_VERSION_INFO 80091
 #define IDC_MAIN_INFO_NEWEST_VERSION_INFO 80092
-
-#define MENU_TAB_OPTIONS 0
-#define MENU_TAB_COLORS 1
-
-#define MENU_TAB_SERVER_OPTIONS 10
-#define MENU_TAB_SERVER_COLORS 11
-#define MENU_TAB_SERVER_VALUES 12