diff --git a/CreatePBOs.bat b/CreatePBOs.bat
index 5935222..11db009 100644
--- a/CreatePBOs.bat
+++ b/CreatePBOs.bat
@@ -7,8 +7,8 @@ cd d:\Git_Repo\Arma3_Repo\Server
 
 
 REM Create @A3EAI PBO
-:: %PBO% -pack .\@A3EAI\addons\a3eai_config .\@A3EAI\addons\a3eai_config.pbo
-:: %PBO% -pack .\@A3EAI\addons\a3eai .\@A3EAI\addons\a3eai.pbo
+%PBO% -pack .\@A3EAI\addons\a3eai_config .\@A3EAI\addons\a3eai_config.pbo
+%PBO% -pack .\@A3EAI\addons\a3eai .\@A3EAI\addons\a3eai.pbo
 
 REM Create a3_vemf_reloaded
 :: %PBO% -pack .\@epochhive\addons\a3_vemf_reloaded .\@epochhive\addons\a3_vemf_reloaded.pbo
diff --git a/Server/@A3EAI/addons/a3eai/compile/A3EAI_group_functions/A3EAI_generateLootOnDeath.sqf b/Server/@A3EAI/addons/a3eai/compile/A3EAI_group_functions/A3EAI_generateLootOnDeath.sqf
index 222e56d..8ed63fd 100644
--- a/Server/@A3EAI/addons/a3eai/compile/A3EAI_group_functions/A3EAI_generateLootOnDeath.sqf
+++ b/Server/@A3EAI/addons/a3eai/compile/A3EAI_group_functions/A3EAI_generateLootOnDeath.sqf
@@ -19,13 +19,16 @@ _toolLoot = [];
 
 _loadout = _unit getVariable ["loadout",[[],[]]];
 _primaryWeapon = [_loadout select 0,0,""] call A3EAI_param;
+//addition by Zepheris
+_unit removeWeapon _primaryWeapon;
+//end addition by Zepheris
 
 //Generate a pistol if one wasn't assigned with loadout script.
 if ((getNumber (configFile >> "CfgWeapons" >> _primaryWeapon >> "type")) != 2) then {
 	_pistol = A3EAI_pistolList call A3EAI_selectRandom;
 	_magazine = getArray (configFile >> "CfgWeapons" >> _pistol >> "magazines") select 0;
-	_unit addMagazine _magazine;	
-	_unit addWeapon _pistol;
+	//_unit addMagazine _magazine;	
+	//_unit addWeapon _pistol;
 	if (A3EAI_debugLevel > 1) then {
 		_weaponLoot pushBack _pistol;
 		_weaponLoot pushBack _magazine