diff --git a/src/CFBG.cpp b/src/CFBG.cpp
index 0e0cb7a..b7d13aa 100644
--- a/src/CFBG.cpp
+++ b/src/CFBG.cpp
@@ -363,7 +363,7 @@ void CFBG::ValidatePlayerForBG(Battleground* bg, Player* player)
 
     TeamId teamId{ player->GetBgTeamId() };
 
-    if (player->GetTeamId(true) == teamId)
+    if (player->GetTeamId() == teamId)
         return;
 
     BGData& bgdata = player->GetBGData();
@@ -432,15 +432,15 @@ CFBG::RandomSkinInfo CFBG::GetRandomRaceMorph(TeamId team, uint8 playerClass, ui
 
 void CFBG::SetFakeRaceAndMorph(Player* player)
 {
-    if (!player->InBattleground() || player->GetTeamId(true) == player->GetBgTeamId() || IsPlayerFake(player))
+    if (!player->InBattleground() || player->GetTeamId() == player->GetBgTeamId() || IsPlayerFake(player))
         return;
 
     // generate random race and morph
-    RandomSkinInfo skinInfo{ GetRandomRaceMorph(player->GetTeamId(true), player->getClass(), player->getGender()) };
+    RandomSkinInfo skinInfo{ GetRandomRaceMorph(player->GetTeamId(), player->getClass(), player->getGender()) };
 
     uint8 selectedRace = player->GetPlayerSetting("mod-cfbg", SETTING_CFBG_RACE).value;
 
-    if (!RandomizeRaces() && selectedRace && IsRaceValidForFaction(player->GetTeamId(true), selectedRace))
+    if (!RandomizeRaces() && selectedRace && IsRaceValidForFaction(player->GetTeamId(), selectedRace))
     {
         skinInfo.first = selectedRace;
         skinInfo.second = GetMorphFromRace(skinInfo.first, player->getGender());
@@ -451,7 +451,7 @@ void CFBG::SetFakeRaceAndMorph(Player* player)
         skinInfo.first,
         skinInfo.second,
         player->TeamIdForRace(skinInfo.first),
-        player->getRace(true),
+        player->getRace(),
         player->GetDisplayId(),
         player->GetNativeDisplayId(),
         player->GetTeamId(true)
@@ -586,7 +586,7 @@ bool CFBG::SendRealNameQuery(Player* player)
     data << uint8(0);                                           // added in 3.1; if > 1, then end of packet
     data << player->GetName();                                  // played name
     data << uint8(0);                                           // realm name for cross realm BG usage
-    data << uint8(player->getRace(true));
+    data << uint8(player->getRace());
     data << uint8(player->getGender());
     data << uint8(player->getClass());
     data << uint8(0);                                           // is not declined
@@ -597,7 +597,7 @@ bool CFBG::SendRealNameQuery(Player* player)
 
 bool CFBG::IsPlayingNative(Player* player)
 {
-    return player->GetTeamId(true) == player->GetBGData().bgTeamId;
+    return player->GetTeamId() == player->GetBGData().bgTeamId;
 }
 
 bool CFBG::CheckCrossFactionMatch(BattlegroundQueue* queue, BattlegroundBracketId bracket_id, uint32 minPlayers, uint32 maxPlayers)
diff --git a/src/CFBG_SC.cpp b/src/CFBG_SC.cpp
index bee6bc5..6230ed9 100644
--- a/src/CFBG_SC.cpp
+++ b/src/CFBG_SC.cpp
@@ -117,7 +117,7 @@ class CFBG_Player : public PlayerScript
             return;
         }
 
-        if (player->GetTeamId(true) != player->GetBgTeamId())
+        if (player->GetTeamId() != player->GetBgTeamId())
         {
             sCFBG->FitPlayerInTeam(player, player->GetBattleground() && !player->GetBattleground()->isArena(), player->GetBattleground());
         }
@@ -179,7 +179,7 @@ class CFBG_Player : public PlayerScript
     bool OnReputationChange(Player* player, uint32 factionID, int32& standing, bool /*incremental*/) override
     {
         uint32 repGain = player->GetReputation(factionID);
-        TeamId teamId = player->GetTeamId(true);
+        TeamId teamId = player->GetTeamId();
 
         if ((factionID == FACTION_FROSTWOLF_CLAN && teamId == TEAM_ALLIANCE) ||
             (factionID == FACTION_STORMPIKE_GUARD && teamId == TEAM_HORDE))