diff --git a/Heroes.ReplayParser/MPQFiles/ReplayServerBattlelobby.cs b/Heroes.ReplayParser/MPQFiles/ReplayServerBattlelobby.cs
index 74cf30a..97aa240 100644
--- a/Heroes.ReplayParser/MPQFiles/ReplayServerBattlelobby.cs
+++ b/Heroes.ReplayParser/MPQFiles/ReplayServerBattlelobby.cs
@@ -22,8 +22,8 @@ public static void Parse(Replay replay, byte[] buffer)
                 var bitReader = new BitReader(stream);
 
                 // 52124 and 52381 are non-tested ptr builds
-                if (replay.ReplayBuild < 38793 ||
-                    replay.ReplayBuild == 52124 || replay.ReplayBuild == 52381 ||
+                if (replay.ReplayBuild < 47479 ||
+                    replay.ReplayBuild < 47903 || replay.ReplayBuild == 52124 || replay.ReplayBuild == 52381 ||
                     replay.GameMode == GameMode.Unknown)
                 {
                     GetBattleTags(replay, bitReader);
@@ -127,13 +127,6 @@ private static void DetailedParse(BitReader bitReader, Replay replay, uint s2maC
 
             // Player info 
             // ------------------------
-            if (replay.ReplayBuild <= 43905 || replay.ReplayBuild == 47801)
-            {
-                // Builds that are not yet supported for detailed parsing
-                // build 47801 is a ptr build that had new data in the battletag section, the data was changed in 47944 (patch for 47801)
-                GetBattleTags(replay, bitReader);
-                return;
-            }
 
             // m_randomSeed, set it if it hasn't been set
             if (replay.RandomValue == 0)
@@ -143,12 +136,6 @@ private static void DetailedParse(BitReader bitReader, Replay replay, uint s2maC
 
             bitReader.ReadBytes(4);
 
-            if (replay.ReplayBuild <= 47479 || replay.ReplayBuild == 47903)
-            {
-                ExtendedBattleTagParsingOld(replay, bitReader);
-                return;
-            }
-
             uint playerListLength = bitReader.Read(5);
 
             for (uint i = 0; i < playerListLength; i++)