diff --git a/addons/client/XEH_postInit.sqf b/addons/client/XEH_postInit.sqf
index c0342bb..82c7f3a 100644
--- a/addons/client/XEH_postInit.sqf
+++ b/addons/client/XEH_postInit.sqf
@@ -4,34 +4,11 @@ if (!hasInterface) exitWith {};
 
 _local_address = "armatak" callExtension ["local_ip", []] select 0;
 
-CALLEXT(websocket:start);
+"armatak" callExtension ["websocket:start", []];
 
 SETVAR(player,GVAR(localAddress),_local_address);
+SETVAR(player,GVAR(eudConnected),false);
 
 [{
-	"armatak" callExtension ["websocket:location", [player call FUNC(extractClientPosition)]];
+	"armatak" callExtension ["websocket:location", [player call armatak_client_fnc_extractClientPosition]];
 }, 1, []] call CBA_fnc_addPerFrameHandler;
-
-addMissionEventHandler ["ExtensionCallback", {
-	params ["_name", "_function", "_data"];
-
-	if (_name == "WEBSOCKET") then {
-		switch (_function) do {
-			case "EUD connected": {
-				SETVAR(player,GVAR(eudConnected),true);
-			};
-			case "EUD disconnected": {
-				SETVAR(player,GVAR(eudConnected),false);
-			};
-			default { };
-		};
-	};
-
-	if (_name == "WEBSOCKET WARNING") then {
-		[_function, "warning", "WEBSOCKET"] call armatak_main_fnc_notify;
-	};
-
-	if (_name == "WEBSOCKET ERROR") then {
-		[_function, "error", _name] call armatak_main_fnc_notify;
-	};
-}];
diff --git a/addons/main/CfgFunctions.hpp b/addons/main/CfgFunctions.hpp
index 1112a1f..47e9836 100644
--- a/addons/main/CfgFunctions.hpp
+++ b/addons/main/CfgFunctions.hpp
@@ -1,9 +1,6 @@
 class CfgFunctions {
 	class armatak {
 		class functions {
-			class log_message {
-				file = "\armatak\armatak\addons\main\functions\fn_log_message.sqf";
-			};
 			class send_digital_pointer_cot {
 				file = "\armatak\armatak\addons\main\functions\api\fn_send_digital_pointer_cot.sqf";
 			};
diff --git a/addons/main/XEH_postInit.sqf b/addons/main/XEH_postInit.sqf
index bd8861d..e67d3b6 100644
--- a/addons/main/XEH_postInit.sqf
+++ b/addons/main/XEH_postInit.sqf
@@ -1,35 +1,43 @@
 #include "script_component.hpp"
 
-missionNamespace setVariable ["have_this_runned", true];
-
 addMissionEventHandler ["ExtensionCallback", {
 	params ["_name", "_function", "_data"];
 
 	if (_name == "WEBSOCKET") then {
-		[_function, "success", _name] call armatak_main_fnc_notify;
+		[_function, "success", _name] call FUNC(notify);
+
+		switch (_function) do {
+			case "EUD connected": {
+				SETVAR(player,EGVAR(client,eudConnected),true);
+			};
+			case "EUD disconnected": {
+				SETVAR(player,GVAR(eudConnected),false);
+			};
+			default {};
+		};
 	};
 
 	if (_name == "WEBSOCKET WARNING") then {
-		[_function, "warning", "WEBSOCKET"] call armatak_main_fnc_notify;
+		[_function, "warning", "WEBSOCKET"] call FUNC(notify);
 	};
 
 	if (_name == "WEBSOCKET ERROR") then {
-		[_function, "error", _name] call armatak_main_fnc_notify;
+		[_function, "error", _name] call FUNC(notify);
 	};
 
 	if (_name == "TCP SOCKET") then {
-		[_function, "success", _name] call armatak_main_fnc_notify;
+		[_function, "success", _name] call FUNC(notify);
 	};
 
 	if (_name == "TCP SOCKET ERROR") then {
-		[_function, "error", _name] call armatak_main_fnc_notify;
+		[_function, "error", _name] call FUNC(notify);
 	};
 
 	if (_name == "VIDEO") then {
-		[_function, "success", _name] call armatak_main_fnc_notify;
+		[_function, "success", _name] call FUNC(notify);
 	};
 
 	if (_name == "VIDEO ERROR") then {
-		[_function, "error", _name] call armatak_main_fnc_notify;
+		[_function, "error", _name] call FUNC(notify);
 	};
 }];
\ No newline at end of file