diff --git a/addons/main/config.cpp b/addons/main/config.cpp
index 13efc6f56..e64c40169 100644
--- a/addons/main/config.cpp
+++ b/addons/main/config.cpp
@@ -10,7 +10,7 @@ class CfgPatches {
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         // "CBA_XEH",  would create circular dependency, however XEH is required by CBA common in any case :)
-        requiredAddons[] = {"cba_common", "cba_arrays", "cba_hashes", "cba_strings", "cba_events", "cba_diagnostic", "cba_network", "cba_ai", "cba_vectors", "cba_ui", "cba_ui_helper", "cba_help"};
+        requiredAddons[] = {"cba_common", "cba_arrays", "cba_hashes", "cba_strings", "cba_events", "cba_diagnostic", "cba_network", "cba_ai", "cba_vectors", "cba_ui", "cba_help"};
         versionDesc = "C.B.A.";
         VERSION_CONFIG;
         authors[] = {};
diff --git a/addons/ui/config.cpp b/addons/ui/config.cpp
index b20629a84..4bc0a57cc 100644
--- a/addons/ui/config.cpp
+++ b/addons/ui/config.cpp
@@ -11,6 +11,9 @@ class CfgPatches {
         version = VERSION;
         authors[] = {"Dr Eyeball", "commy2"};
     };
+
+    // Backwards compatibility
+    class cba_ui_helper: ADDON {author = "";};
 };
 
 #include "CfgEventHandlers.hpp"
diff --git a/addons/ui/flexiMenu/DIKASCIIMap.hpp b/addons/ui/flexiMenu/DIKASCIIMap.hpp
index 329dd241c..a902b7cde 100644
--- a/addons/ui/flexiMenu/DIKASCIIMap.hpp
+++ b/addons/ui/flexiMenu/DIKASCIIMap.hpp
@@ -1,4 +1,3 @@
-//#include "\x\cba\addons\ui_helper\script_dikCodes.hpp"
 
 #define ICE_DIKASCIIMap [\
   [65, DIK_A],\
diff --git a/addons/ui/flexiMenu/fnc_add.sqf b/addons/ui/flexiMenu/fnc_add.sqf
index 37a013686..b992559e0 100644
--- a/addons/ui/flexiMenu/fnc_add.sqf
+++ b/addons/ui/flexiMenu/fnc_add.sqf
@@ -5,7 +5,7 @@ TRACE_1("",_this);
 
 private ["_msg", "_exit", "_list", "_key"];
 // _this = ["player", [DIK_LSHIFT], -3, ["mission\weapon_menuDef.sqf", ["main"]]]
-// Note: calling script may require this file for dik codes: #include "\x\cba\addons\ui_helper\script_dikCodes.hpp"
+// Note: calling script may require this file for dik codes: #include "\a3\editor_f\Data\Scripts\dikCodes.h"
 
 _msg = "FLEXIMENU: Unknown Error in fnc_add.sqf"; //Initialize
 _key = [];
diff --git a/addons/ui/flexiMenu/fnc_getMenuOption.sqf b/addons/ui/flexiMenu/fnc_getMenuOption.sqf
index 14d0c5081..fc04fc16f 100644
--- a/addons/ui/flexiMenu/fnc_getMenuOption.sqf
+++ b/addons/ui/flexiMenu/fnc_getMenuOption.sqf
@@ -2,7 +2,6 @@
 // _this = [_menuDefs select 0, _menuDefs select 1 select N] (header & one menu def)
 //-----------------------------------------------------------------------------
 #include "\x\cba\addons\ui\script_component.hpp"
-#include "\x\cba\addons\ui_helper\script_dikCodes.hpp"
 #include "DIKASCIIMap.hpp"
 
 #define _flexiMenuSeparatorLine "<img image='\x\cba\addons\ui\flexiMenu\data\popup\separator.paa'/>" //<t size='1'> </t>  <t underline='true'>a    c</t>
diff --git a/addons/ui/flexiMenu/fnc_keyDown.sqf b/addons/ui/flexiMenu/fnc_keyDown.sqf
index 4c317f93f..e1db2cb1d 100644
--- a/addons/ui/flexiMenu/fnc_keyDown.sqf
+++ b/addons/ui/flexiMenu/fnc_keyDown.sqf
@@ -1,6 +1,5 @@
 //#define DEBUG_MODE_FULL
 #include "\x\cba\addons\ui\script_component.hpp"
-#include "\x\cba\addons\ui_helper\script_dikCodes.hpp"
 
 #define _minObjDist(_var) (if (_var isKindOf "CAManBase") then {3} else {(2 max (1.4 + (sizeOf typeOf _var) / 2))}) // minimum object interaction distance: arbitrary distance. Might not work with very long/large vehicles. TODO: Find a very fast way to determine vehicle size.
 
diff --git a/addons/ui/flexiMenu/fnc_keyUp.sqf b/addons/ui/flexiMenu/fnc_keyUp.sqf
index dfc3a6de8..f68f5d52a 100644
--- a/addons/ui/flexiMenu/fnc_keyUp.sqf
+++ b/addons/ui/flexiMenu/fnc_keyUp.sqf
@@ -1,5 +1,4 @@
 #include "\x\cba\addons\ui\script_component.hpp"
-#include "\x\cba\addons\ui_helper\script_dikCodes.hpp"
 
 private ["_handled", /* "_ctrl", */ "_active", "_potentialKeyMatch"];
 params ["", "_dikCode", "_shift", "_ctrlKey", "_alt"];
diff --git a/addons/ui/flexiMenu/fnc_menuShortcut.sqf b/addons/ui/flexiMenu/fnc_menuShortcut.sqf
index 52d71bdfa..290c8e199 100644
--- a/addons/ui/flexiMenu/fnc_menuShortcut.sqf
+++ b/addons/ui/flexiMenu/fnc_menuShortcut.sqf
@@ -1,7 +1,6 @@
 // Desc: "keyDown" EH for menu dialog
 //-----------------------------------------------------------------------------
 #include "\x\cba\addons\ui\script_component.hpp"
-#include "\x\cba\addons\ui_helper\script_dikCodes.hpp"
 
 if (isDedicated || !dialog) exitWith {};
 
diff --git a/addons/ui/flexiMenu/fnc_openMenuByDef.sqf b/addons/ui/flexiMenu/fnc_openMenuByDef.sqf
index ead296195..5fbcb5963 100644
--- a/addons/ui/flexiMenu/fnc_openMenuByDef.sqf
+++ b/addons/ui/flexiMenu/fnc_openMenuByDef.sqf
@@ -1,5 +1,4 @@
 #include "\x\cba\addons\ui\script_component.hpp"
-#include "\x\cba\addons\ui_helper\script_dikCodes.hpp"
 
 #define _minObjDist(_var) (if (_var isKindOf "CAManBase") then {3} else {(2 max (1.4 + (sizeOf typeOf _var) / 2))}) // minimum object interaction distance: arbitrary distance. Might not work with very long/large vehicles. TODO: Find a very fast way to determine vehicle size.
 
diff --git a/addons/ui/script_component.hpp b/addons/ui/script_component.hpp
index 48559bef0..dcef8b91e 100644
--- a/addons/ui/script_component.hpp
+++ b/addons/ui/script_component.hpp
@@ -14,6 +14,7 @@
 #include "\x\cba\addons\main\script_macros.hpp"
 
 #include "\a3\ui_f\hpp\defineCommonGrids.inc"
+#include "\a3\ui_f\hpp\defineDIKCodes.inc"
 #include "\a3\ui_f\hpp\defineResincl.inc"
 
 #define IDC_ADDON_CONTROLS 127303
diff --git a/addons/ui_helper/$PBOPREFIX$ b/addons/ui_helper/$PBOPREFIX$
deleted file mode 100644
index c03ab2b3d..000000000
--- a/addons/ui_helper/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-x\cba\addons\ui_helper
diff --git a/addons/ui_helper/CfgRscStd.hpp b/addons/ui_helper/CfgRscStd.hpp
deleted file mode 100644
index 99b10c322..000000000
--- a/addons/ui_helper/CfgRscStd.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-class RscListBox;
-class RscButtonMenuOK;
-
-class RscStandardDisplay;
-class RscDisplayMultiplayer: RscStandardDisplay {
-    class Controls {
-        class CA_Join: RscButtonMenuOK {
-            onMouseButtonDown = "uiNamespace setVariable ['CBA_isCached', nil]";
-            onKeyDown = "uiNamespace setVariable ['CBA_isCached', nil]";
-        };
-        class CA_ValueSessions: RscListBox {
-            onMouseButtonDown = "uiNamespace setVariable ['CBA_isCached', nil]";
-        };
-    };
-};
diff --git a/addons/ui_helper/config.cpp b/addons/ui_helper/config.cpp
deleted file mode 100644
index 6ba744ee5..000000000
--- a/addons/ui_helper/config.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
-    class ADDON {
-        author = "$STR_CBA_Author";
-        name = ECSTRING(ui,component);
-        url = "$STR_CBA_URL";
-        units[] = {};
-        weapons[] = {};
-        worlds[] = {};
-        requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_common", "A3_UI_F"};
-    };
-};
-
-#include "CfgRscStd.hpp"
diff --git a/addons/ui_helper/onLoad.sqf b/addons/ui_helper/onLoad.sqf
deleted file mode 100644
index 1c90819d1..000000000
--- a/addons/ui_helper/onLoad.sqf
+++ /dev/null
@@ -1,7 +0,0 @@
-//diag_log [diag_tickTime, diag_frameno, time];
-uiNamespace setVariable ["CBA_isCached", nil];
-
-//is TKOH active
-if (isClass (configFile >> "CfgPatches" >> "hsim_data_h")) then {
-    ["onLoad", _this, "RscDisplayMultiplayerSetup"] call compile preprocessFileLineNumbers "hsim\ui_h\scripts\init_GUI.sqf";
-};
diff --git a/addons/ui_helper/script_component.hpp b/addons/ui_helper/script_component.hpp
deleted file mode 100644
index 7e3cd8753..000000000
--- a/addons/ui_helper/script_component.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#define COMPONENT ui_helper
-#include "\x\cba\addons\main\script_mod.hpp"
-
-#ifdef DEBUG_ENABLED_UI_HELPER
-    #define DEBUG_MODE_FULL
-#endif
-
-#ifdef DEBUG_SETTINGS_UI_HELPER
-    #define DEBUG_SETTINGS DEBUG_SETTINGS_UI_HELPER
-#endif
-
-#include "\x\cba\addons\main\script_macros.hpp"
diff --git a/addons/ui_helper/script_dikCodes.hpp b/addons/ui_helper/script_dikCodes.hpp
deleted file mode 100644
index fc020a580..000000000
--- a/addons/ui_helper/script_dikCodes.hpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// #include "\ca\editor\Data\Scripts\dikCodes.h"
-// #include "\hsim\editor_h\Data\Scripts\dikCodes.h"
-#include "\a3\editor_f\Data\Scripts\dikCodes.h"