diff --git a/addons/main/config.cpp b/addons/main/config.cpp
index 57e2c782b8..a013d8e971 100644
--- a/addons/main/config.cpp
+++ b/addons/main/config.cpp
@@ -564,10 +564,3 @@ class CfgMods {
 
 #include "CfgModuleCategories.hpp"
 #include "CfgVehicleClasses.hpp"
-
-// @todo delete this after CBA update, defines undefined global variable
-class Extended_PreStart_EventHandlers {
-    class ADDON {
-        init = "with uiNamespace do {SLX_XEH_COMPILE_NEW = CBA_fnc_compileFunction};";
-    };
-};
diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp
index 544cff6842..a64c8e014d 100644
--- a/addons/main/script_macros.hpp
+++ b/addons/main/script_macros.hpp
@@ -84,7 +84,7 @@
 #ifdef DISABLE_COMPILE_CACHE
     #define PREP(fncName) DFUNC(fncName) = compile preprocessFileLineNumbers QUOTE(PATHTOF(functions\DOUBLES(fnc,fncName).sqf))
 #else
-    #define PREP(fncName) [QUOTE(PATHTOF(functions\DOUBLES(fnc,fncName).sqf)), QFUNC(fncName)] call SLX_XEH_COMPILE_NEW
+    #define PREP(fncName) [QUOTE(PATHTOF(functions\DOUBLES(fnc,fncName).sqf)), QFUNC(fncName)] call CBA_fnc_compileFunction
 #endif
 
 #define PREP_MODULE(folder) [] call compile preprocessFileLineNumbers QUOTE(PATHTOF(folder\__PREP__.sqf))