diff --git a/server/masterserver/gsmgr.cc b/server/masterserver/gsmgr.cc
index 50a404b..7030151 100644
--- a/server/masterserver/gsmgr.cc
+++ b/server/masterserver/gsmgr.cc
@@ -98,7 +98,6 @@ void GSMgr::___GSReport(f8::JsonHttpRequest* request)
             RearrangeNode();
         }
         itr->second.alive_count = alive_count;
-        itr->second.channel = channel;
         itr->second.last_active_tick = a8::XGetTickCount();
     } else {
         GSNode gs;
@@ -252,7 +251,7 @@ void GSMgr::ClearTimeOutNode()
         }
     }
     for (GSNode* node : time_out_nodes) {
-        RemoveNodeRomSortedNodes(node);
+        RemoveNodeFromSortedNodes(node);
         {
             std::vector<std::string> deleted_teams;
             for (auto& pair : team_hash_) {
@@ -279,7 +278,7 @@ void GSMgr::AddNodeToSortedNodes(GSNode* node)
     }
 }
 
-void GSMgr::RemoveNodeRomSortedNodes(GSNode* node)
+void GSMgr::RemoveNodeFromSortedNodes(GSNode* node)
 {
     for (auto& pair : sorted_node_hash_) {
         std::vector<GSNode*>& node_list = pair.second;
@@ -304,6 +303,6 @@ std::vector<GSNode*>* GSMgr::GetSortedNodesByChannel(int channel)
 
 void GSMgr::OnChannelChange(GSNode* node)
 {
-    RemoveNodeRomSortedNodes(node);
+    RemoveNodeFromSortedNodes(node);
     AddNodeToSortedNodes(node);
 }
diff --git a/server/masterserver/gsmgr.h b/server/masterserver/gsmgr.h
index 2a3bac6..4232080 100644
--- a/server/masterserver/gsmgr.h
+++ b/server/masterserver/gsmgr.h
@@ -45,7 +45,7 @@ class GSMgr : public a8::Singleton<GSMgr>
     void RearrangeNode();
     void ClearTimeOutNode();
     void AddNodeToSortedNodes(GSNode* node);
-    void RemoveNodeRomSortedNodes(GSNode* node);
+    void RemoveNodeFromSortedNodes(GSNode* node);
     std::vector<GSNode*>* GetSortedNodesByChannel(int channel);
     void OnChannelChange(GSNode* node);