diff --git a/addons/infantry/CfgVehicles.hpp b/addons/infantry/CfgVehicles.hpp
index 8d951e31..d2e6ca0b 100644
--- a/addons/infantry/CfgVehicles.hpp
+++ b/addons/infantry/CfgVehicles.hpp
@@ -378,30 +378,6 @@ class CfgVehicles {
 
         trait = "Medic";
     };
-    class Cav_B_MedicTeamLeader_F: Cav_B_Rifleman_F {
-        _generalMacro = "Cav_B_Medic_F";
-        scope = 2;
-        scopeCurator = 2;
-        displayName = CSTRING(Cav_B_MedicTeamLeader_F);
-        author = ECSTRING(Main,ModTeam);
-
-        icon = "iconManLeader";
-        role = "CombatLifeSaver";
-
-        trait = "Medic";
-    };
-    class Cav_B_MedicTeamMember_F: Cav_B_Rifleman_F {
-        _generalMacro = "Cav_B_MedicTeamMember_F";
-        scope = 2;
-        scopeCurator = 2;
-        displayName = CSTRING(Cav_B_MedicTeamMember_F);
-        author = ECSTRING(Main,ModTeam);
-
-        icon = "iconManMedic";
-        role = "CombatLifeSaver";
-
-        trait = "Medic";
-    };
     class Cav_B_Surgeon_F: Cav_B_Rifleman_F {
         _generalMacro = "Cav_B_Surgeon_F";
         scope = 2;
diff --git a/addons/infantry_bravo/CfgGroups.hpp b/addons/infantry_bravo/CfgGroups.hpp
index e7d1ad90..019fcc9b 100644
--- a/addons/infantry_bravo/CfgGroups.hpp
+++ b/addons/infantry_bravo/CfgGroups.hpp
@@ -4,7 +4,7 @@ class CfgGroups {
             class Cav_infantry_bravo_squads_f {
                 name = CSTRING(Cav_infantry_bravo_squads_f);
                 INFANTRY_GROUP_9(Cav_B_B_Group_Mechnaized_F,Cav_B_B_SquadLeader_F,Cav_B_B_FireTeamLeader_F,Cav_B_B_AutomaticRifleman_F,Cav_B_B_Grenadier_F,Cav_B_B_Rifleman_F,Cav_B_B_FireTeamLeader_F,Cav_B_B_AutomaticRifleman_F,Cav_B_B_Grenadier_F,Cav_B_B_CombatLifeSaver_F);
-                INFANTRY_TEAM_IFVCREW_2(Cav_B_B_Group_Mechnaized_Crew_F,Cav_B_B_IFV_Driver_F,Cav_B_B_IFV_Commander_F);
+                INFANTRY_TEAM_IFVCREW_2(Cav_B_B_Group_Mechnaized_Crew_F,Cav_B_B_IFV_Commander_F,Cav_B_B_IFV_Driver_F);
             };
             class Cav_medical_bravo_squads_f {
                 name = CSTRING(Cav_medical_bravo_squads_f);
diff --git a/addons/infantry_bravo/CfgVehicles.hpp b/addons/infantry_bravo/CfgVehicles.hpp
index 7e748775..d25de53a 100644
--- a/addons/infantry_bravo/CfgVehicles.hpp
+++ b/addons/infantry_bravo/CfgVehicles.hpp
@@ -218,8 +218,7 @@ class CfgVehicles {
         cav_company = "bravo";
     };
 
-    class Cav_B_MedicTeamLeader_F;
-    class Cav_B_B_MedicTeamLeader_F: Cav_B_MedicTeamLeader_F {
+    class Cav_B_B_MedicTeamLeader_F: Cav_B_B_Medic_F  {
         _generalMacro = "Cav_B_B_MedicTeamLeader_F";
         scope = 2;
         scopeCurator = 2;
@@ -229,8 +228,7 @@ class CfgVehicles {
         cav_company = "bravo";
     };
 
-    class Cav_B_MedicTeamMember_F;
-    class Cav_B_B_MedicTeamMember_F: Cav_B_MedicTeamMember_F {
+    class Cav_B_B_MedicTeamMember_F: Cav_B_B_Medic_F  {
         _generalMacro = "Cav_B_B_MedicTeamMember_F";
         scope = 2;
         scopeCurator = 2;
diff --git a/addons/infantry_bravo_labeled/CfgVehicles.hpp b/addons/infantry_bravo_labeled/CfgVehicles.hpp
index 9d2d0ca9..908e64be 100644
--- a/addons/infantry_bravo_labeled/CfgVehicles.hpp
+++ b/addons/infantry_bravo_labeled/CfgVehicles.hpp
@@ -1,6 +1,4 @@
 class CfgVehicles {
-    class Cav_B_B_Medic_F;
-
     class Cav_B_B_MedicTeamLeader_F;
     class Cav_B_B_MedicTeamMember_F;
     class Cav_B_B_Surgeon_F;
@@ -107,11 +105,15 @@ class CfgVehicles {
 
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Commander_2_1_F,Cav_B_B_IFV_Commander_F,2,1);
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Driver_2_1_F,Cav_B_B_IFV_Driver_F,2,1);
+    //UNIT_BRAVO_MECH(Cav_B_B_IFV_Gunner_2_1_F,Cav_B_B_IFV_Gunner_F,2,1);
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Commander_2_2_F,Cav_B_B_IFV_Commander_F,2,2);
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Driver_2_2_F,Cav_B_B_IFV_Driver_F,2,2);
+    //UNIT_BRAVO_MECH(Cav_B_B_IFV_Gunner_2_2_F,Cav_B_B_IFV_Gunner_F,2,2);
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Commander_2_3_F,Cav_B_B_IFV_Commander_F,2,3);
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Driver_2_3_F,Cav_B_B_IFV_Driver_F,2,3);
+    //UNIT_BRAVO_MECH(Cav_B_B_IFV_Gunner_2_3_F,Cav_B_B_IFV_Gunner_F,2,3);
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Commander_2_4_F,Cav_B_B_IFV_Commander_F,2,4);
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Driver_2_4_F,Cav_B_B_IFV_Driver_F,2,4);
+    ///UNIT_BRAVO_MECH(Cav_B_B_IFV_Gunner_2_4_F,Cav_B_B_IFV_Gunner_F,2,4);
 
 };
\ No newline at end of file