diff --git a/exile_vemf_reloaded/sqf/aiKilled.sqf b/exile_vemf_reloaded/sqf/aiKilled.sqf
index 9054a8d..dbb1000 100644
--- a/exile_vemf_reloaded/sqf/aiKilled.sqf
+++ b/exile_vemf_reloaded/sqf/aiKilled.sqf
@@ -2,7 +2,7 @@
 	VEMF AI Killed by Vampire, rewritten by IT07
 
 	Description:
-	removes launchers if desired and announces the kill if enabled in config.cpp
+	executed upon AI unit death
 
 	Params:
 	_this: ARRAY
@@ -13,47 +13,39 @@
 	nothing
 */
 
-if (_this isEqualType []) then
-{
-	_target = param [0, objNull, [objNull]];
-	_killer = param [1, objNull, [objNull]];
-	if not(isNull _target AND isNull _killer) then
+_target = param [0, objNull, [objNull]];
+_killer = param [1, objNull, [objNull]];
+if (_killer isKindOf "Man") then // Roadkill or regular kill
 	{
-		if isPlayer _killer then // Only allow this function to work if killer is an actual player
-		{
-			if (_killer isKindOf "Man") then // Roadkill or regular kill
+		if (vehicle _killer isEqualTo _killer) then // If on foot
 			{
-				if (vehicle _killer isEqualTo _killer) then // If on foot
-				{
-					if (vehicle _target isEqualTo _target) then
+				if (vehicle _target isEqualTo _target) then
 					{
-						[_target, _killer] ExecVM "exile_vemf_reloaded\sqf\handleRespectGain.sqf";
-						_sayKilled = "sayKilled" call VEMFr_fnc_getSetting;
-						if (_sayKilled > 0) then // Send kill message if enabled
-						{
-							[_target, _killer, _sayKilled] ExecVM "exile_vemf_reloaded\sqf\sayKilledWeapon.sqf";
-						};
+						if (("respectReward" call VEMFr_fnc_getSetting) > 0) then
+						   {
+								[_target, _killer] ExecVM "exile_vemf_reloaded\sqf\handleRespectGain.sqf";
+							};
+						[_target, _killer] ExecVM "exile_vemf_reloaded\sqf\sayKilledWeapon.sqf";
 					} else
 					{
 						if (typeOf (vehicle _target) isEqualTo "Steerable_Parachute_F") then
-						{
-							if ("logCowardKills" call VEMFr_fnc_getSetting isEqualTo 1) then
 							{
-								["fn_aiKilled", 1, format["A coward (%1 @ %2) killed a parachuting AI", name _killer, mapGridPosition _killer]] ExecVM "exile_vemf_reloaded\sqf\log.sqf";
-							};
-						} else
-						{
-							[_target, _killer] ExecVM "exile_vemf_reloaded\sqf\handleRespectGain.sqf";
-							_sayKilled = "sayKilled" call VEMFr_fnc_getSetting;
-							if (_sayKilled > 0) then // Send kill message if enabled
+								if ("logCowardKills" call VEMFr_fnc_getSetting isEqualTo 1) then
+									{
+										["fn_aiKilled", 1, format["A coward (%1 @ %2) killed a parachuting AI", name _killer, mapGridPosition _killer]] ExecVM "exile_vemf_reloaded\sqf\log.sqf";
+									};
+							} else
 							{
-								[_target, _killer, _sayKilled] ExecVM "exile_vemf_reloaded\sqf\sayKilledWeapon.sqf";
+								if (("respectReward" call VEMFr_fnc_getSetting) > 0) then
+								   {
+										[_target, _killer] ExecVM "exile_vemf_reloaded\sqf\handleRespectGain.sqf";
+									};
+								[_target, _killer] ExecVM "exile_vemf_reloaded\sqf\sayKilledWeapon.sqf";
 							};
-						};
 					};
-				} else // If in vehicle (a.k.a. roadkill)
-				{
-					if (("punishRoadKills" call VEMFr_fnc_getSetting) isEqualTo 1) then
+			} else // If in vehicle (a.k.a. roadkill)
+			{
+				if (("punishRoadKills" call VEMFr_fnc_getSetting) isEqualTo 1) then
 					{
 						_respectDeduct = "respectRoadKillDeduct" call VEMFr_fnc_getSetting;
 						_curRespect = _killer getVariable ["ExileScore", 0];
@@ -67,57 +59,53 @@ if (_this isEqualType []) then
 						format["setAccountMoneyAndRespect:%1:%2:%3", _killer getVariable ["ExileMoney", 0], _newRespect, (getPlayerUID _killer)] call ExileServer_system_database_query_fireAndForget;
 
 						if (("sayKilled" call VEMFr_fnc_getSetting) isEqualTo 1) then
-						{
-							_kMsg = format["(VEMFr) %1 [Roadkill] AI", name _killer];
-							[_kMsg, [], "sys"] ExecVM "exile_vemf_reloaded\sqf\broadcast.sqf";
-						};
-					};
-				};
-			} else // If kill from vehicle (NOT a roadkill)
-			{
-				if (typeOf (vehicle _target) isEqualTo "Steerable_Parachute_F") then
-					{
-						if ("logCowardKills" call VEMFr_fnc_getSetting isEqualTo 1) then
 							{
-								["fn_aiKilled", 1, format["A coward (%1 @ %2) killed a parachuting AI", name _killer, mapGridPosition _killer]] ExecVM "exile_vemf_reloaded\sqf\log.sqf";
-							};
-					} else
-					{
-						_killer = effectiveCommander _killer;
-						[_target, _killer] ExecVM "exile_vemf_reloaded\sqf\handleRespectGain.sqf";
-						_sayKilled = "sayKilled" call VEMFr_fnc_getSetting;
-						if (_sayKilled > 0) then // Send kill message if enabled
-							{
-								[_target, _killer, _sayKilled] ExecVM "exile_vemf_reloaded\sqf\sayKilledWeapon.sqf";
+								[format["(VEMFr) %1 [Roadkill] AI", name _killer]] ExecVM "exile_vemf_reloaded\sqf\systemChatToClient.sqf";
 							};
 					};
 			};
-		};
+	} else // If kill from vehicle (NOT a roadkill)
+	{
+		if (typeOf (vehicle _target) isEqualTo "Steerable_Parachute_F") then
+			{
+				if ("logCowardKills" call VEMFr_fnc_getSetting isEqualTo 1) then
+					{
+						["fn_aiKilled", 1, format["A coward (%1 @ %2) killed a parachuting AI", name _killer, mapGridPosition _killer]] ExecVM "exile_vemf_reloaded\sqf\log.sqf";
+					};
+			} else
+			{
+				_killer = effectiveCommander _killer;
+				if (("respectReward" call VEMFr_fnc_getSetting) > 0) then
+					{
+						[_target, _killer] ExecVM "exile_vemf_reloaded\sqf\handleRespectGain.sqf";
+					};
+				[_target, _killer] ExecVM "exile_vemf_reloaded\sqf\sayKilledWeapon.sqf";
+			};
+	};
 
-		_settings = [["aiCleanup"],["removeLaunchers","aiDeathRemovalEffect","removeHeadGear"]] call VEMFr_fnc_getSetting;
-		_removeLaunchers = _settings select 0;
-		if (_removeLaunchers isEqualTo 1) then
+	_settings = [["aiCleanup"],["removeLaunchers","aiDeathRemovalEffect","removeHeadGear"]] call VEMFr_fnc_getSetting;
+	_removeLaunchers = _settings select 0;
+	if (_removeLaunchers isEqualTo 1) then
 		{
 			_secWeapon = secondaryWeapon _target;
 			if not(_secWeapon isEqualTo "") then
-			{
-				_target removeWeaponGlobal _secWeapon;
-				_missiles = getArray (configFile >> "cfgWeapons" >> _secWeapon >> "magazines");
 				{
-					if (_x in _missiles) then
+					_target removeWeaponGlobal _secWeapon;
+					_missiles = getArray (configFile >> "cfgWeapons" >> _secWeapon >> "magazines");
 					{
-						_target removeMagazineGlobal _x;
-					};
-				} forEach (magazines _target);
-			};
+						if (_x in _missiles) then
+							{
+								_target removeMagazineGlobal _x;
+							};
+					} forEach (magazines _target);
+				};
 		};
-
-		if (_settings select 2 isEqualTo 1) then // If removeHeadGear setting is enabled
+	if (_settings select 2 isEqualTo 1) then // If removeHeadGear setting is enabled
 		{
 			removeHeadGear _target;
 		};
 
-		if (_settings select 1 isEqualTo 1) then // If killEffect enabled
+	if (_settings select 1 isEqualTo 1) then // If killEffect enabled
 		{
 			playSound3D ["A3\Missions_F_Bootcamp\data\sounds\vr_shutdown.wss", _target, false, getPosASL _target, 2, 1, 60];
 			for "_u" from 1 to 12 do
@@ -138,8 +126,3 @@ if (_this isEqualType []) then
 		};
 
 		_target removeAllEventHandlers "MPKilled";
-	} else
-	{
-		["fn_aiKilled", 0, "_target or _killer isNull"] ExecVM "exile_vemf_reloaded\sqf\log.sqf";
-	};
-};