diff --git a/server/wsproxy/app.cc b/server/wsproxy/app.cc
index 3d0668d..1e7ef82 100644
--- a/server/wsproxy/app.cc
+++ b/server/wsproxy/app.cc
@@ -304,10 +304,7 @@ void App::DispatchMsg()
             break;
         case SF_TargetServer:
             {
-#if MASTER_MODE
-#else
                 ProcessTargetServerMsg(hdr);
-#endif
             }
             break;
         case SF_MasterServer:
@@ -383,12 +380,11 @@ void App::ProcessClientMsg(f8::MsgHdr& hdr)
 #endif
 }
 
-#if MASTER_MODE
 void App::ProcessMasterServerMsg(f8::MsgHdr& hdr)
 {
 
 }
-#else
+
 void App::ProcessTargetServerMsg(f8::MsgHdr& hdr)
 {
     if (hdr.msgid < 100) {
@@ -400,7 +396,6 @@ void App::ProcessTargetServerMsg(f8::MsgHdr& hdr)
     }
     GCListener::Instance()->ForwardTargetConnMsg(hdr);
 }
-#endif
 
 void App::ProcessIMMsg()
 {
diff --git a/server/wsproxy/app.h b/server/wsproxy/app.h
index c8af816..6b8c333 100644
--- a/server/wsproxy/app.h
+++ b/server/wsproxy/app.h
@@ -44,9 +44,8 @@ private:
     void ProcessClientMsg(f8::MsgHdr& hdr);
 #if MASTER_MODE
     void ProcessMasterServerMsg(f8::MsgHdr& hdr);
-#else
-    void ProcessTargetServerMsg(f8::MsgHdr& hdr);
 #endif
+    void ProcessTargetServerMsg(f8::MsgHdr& hdr);
 
     void InitLog();
     void UnInitLog();
diff --git a/server/wsproxy/gameclientmgr.cc b/server/wsproxy/gameclientmgr.cc
index 4941b67..295b658 100644
--- a/server/wsproxy/gameclientmgr.cc
+++ b/server/wsproxy/gameclientmgr.cc
@@ -55,8 +55,6 @@ GameClient* GameClientMgr::GetGameClientBySocket(int sockhandle)
     return itr != socket_hash_.end() ? itr->second : nullptr;
 }
 
-#if MASTER_MODE
-#else
 void GameClientMgr::BindTargetConn(int socket_handle, int conn_instance_id)
 {
     TargetConn* conn = TargetConnMgr::Instance()->GetConnById(conn_instance_id);
@@ -72,4 +70,3 @@ void GameClientMgr::BindTargetConn(int socket_handle, int conn_instance_id)
         }
     }
 }
-#endif
diff --git a/server/wsproxy/gameclientmgr.h b/server/wsproxy/gameclientmgr.h
index 4d13800..28bbb71 100644
--- a/server/wsproxy/gameclientmgr.h
+++ b/server/wsproxy/gameclientmgr.h
@@ -16,10 +16,7 @@ class GameClientMgr : public a8::Singleton<GameClientMgr>
     void OnTargetServerDisconnect(a8::XParams& param);
     void OnTargetServerConnect(a8::XParams& param);
     GameClient* GetGameClientBySocket(int sockhande);
-#if MASTER_MODE
-#else
     void BindTargetConn(int socket_handle, int conn_instance_id);
-#endif
 
  private:
     std::map<int, GameClient*> socket_hash_;
diff --git a/server/wsproxy/mastersvrmgr.h b/server/wsproxy/mastersvrmgr.h
index 19555d1..639760a 100644
--- a/server/wsproxy/mastersvrmgr.h
+++ b/server/wsproxy/mastersvrmgr.h
@@ -35,6 +35,7 @@ class MasterSvrMgr : public a8::Singleton<MasterSvrMgr>
     MasterSvr* GetConnById(int instance_id);
 
  private:
+    int target_conn_id_ = 100;
     long long curr_context_id_ = 0;
     std::map<int, MasterSvr*> mastersvr_hash_;
     std::map<int, long long> pending_socket_hash_;