diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index db436ab0..28e49bf9 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -2701,7 +2701,6 @@ void Room::OnTeamPartChg(Human* hum)
 int Room::InitWithCustomBattle(long ip_saddr, int socket_handle, std::shared_ptr<cs::CMJoin> msg,
                                std::shared_ptr<CustomBattle> p)
 {
-#if 1
     std::vector<std::shared_ptr<Team>> room_teams;
     std::vector<std::shared_ptr<CustomTeam>> net_teams;
     p->TraverseTeamList
@@ -2736,115 +2735,6 @@ int Room::InitWithCustomBattle(long ip_saddr, int socket_handle, std::shared_ptr
              }
              );
     }
-#else
-    std::vector<std::shared_ptr<Team>> room_teams;
-    std::vector<std::shared_ptr<CustomTeam>> net_teams;
-    p->TraverseTeamList
-        (
-         [this, &room_teams, &net_teams] (std::shared_ptr<CustomTeam> team) -> bool
-         {
-             auto new_team = NewTeam();
-             new_team->SetInitTeamMemberNum(0);
-             new_team->SetAutoFill(true);
-             room_teams.push_back(new_team);
-             net_teams.push_back(team);
-             return true;
-         });
-    if (room_teams.empty()) {
-        abort();
-    }
-    if (IsMobaModeRoom() &&
-        room_teams.size() > 2) {
-        abort();
-    }
-    cs::CMJoin join_msg = *msg;
-    for (size_t i = 0; i < net_teams.size(); ++i) {
-        auto net_team = net_teams.at(i);
-        auto room_team = room_teams.at(i);
-        room_team->SetInitTeamMemberNum(net_team->GetMemberNum());
-        net_team->TraverseMember
-            (
-             [join_msg, p, room_team] (std::shared_ptr<CustomMember> m) mutable -> bool
-             {
-                 Player* hum = InternalCreatePlayer(p, m, room_team, join_msg);
-                 return true;
-             }
-             );
-    }
-    if (IsMobaModeRoom()) {
-        if (room_teams.size() < 2) {
-             auto new_team = NewTeam();
-             new_team->SetInitTeamMemberNum(0);
-             new_team->SetAutoFill(true);
-             room_teams.push_back(new_team);
-        }
-        int side = a8::RandEx(1, 2);
-        for (size_t i = 0; i < 2; ++i) {
-            auto team = room_teams.at(i);
-            if (team->GetMemberNum() < MAX_TEAM_NUM) {
-                CreateAndroid(MAX_TEAM_NUM - team->GetMemberNum(), team);
-            }
-            if (i == 0) {
-                moba_team_a_ = team.get();
-            } else {
-                moba_team_b_ = team.get();
-            }
-            team->TraverseMembers
-                (
-                 [this, side] (Human* hum) -> bool
-                 {
-                     hum->side = side;
-                     std::shared_ptr<BornPoint> born_point = std::make_shared<BornPoint>();
-                     born_point->wo_meta = std::get<0>(GetMapMeta()->moba_born_points.at(side - 1));
-                     hum->SetBornPoint(born_point);
-                     hum->InitMobaRoad();
-#ifdef MYDEBUG
-                     a8::XPrintf("moba init uniid:%d team_id:%d side:%d wo_meta:%d\n",
-                                 {
-                                     hum->GetUniId(),
-                                         hum->GetTeam()->GetTeamId(),
-                                         hum->side,
-                                         (long long)hum->GetBornPoint()->wo_meta.get()
-                                         });
-#endif
-                     return true;
-                 });
-            if (side == 1) {
-                side = 2;
-            } else {
-                side = 1;
-            }
-        }
-    }
-    {
-        p->TraverseObList
-            (
-             [this, join_msg, p] (std::shared_ptr<CustomMember> m) mutable -> bool
-             {
-                 auto new_team = NewViewTeam();
-                 new_team->SetInitTeamMemberNum(0);
-                 new_team->SetAutoFill(true);
-                 Player* hum = InternalCreatePlayer(p, m, new_team, join_msg,
-                                                    [p] (Player* hum)
-                                                    {
-                                                        a8::SetBitFlag(hum->status, CS_IsOb);
-                                                        p->GetRoom()->GetRoomOb()->AddOb(hum);
-                                                    });
-                 return true;
-             });
-    }
-    {
-        auto hum = GetPlayerByAccountId(msg->account_id());
-        if (hum) {
-            hum->ReJoin(ip_saddr, socket_handle);
-        } else {
-            auto hum = p->GetRoom()->GetRoomOb()->GetByAccountId(msg->account_id());
-            if (hum) {
-                hum->ReJoin(ip_saddr, socket_handle);
-            }
-        }
-    }
-#endif
     return 0;
 }