diff --git a/src/net/common/servergamethread.cpp b/src/net/common/servergamethread.cpp
index d902f70f..702830ff 100644
--- a/src/net/common/servergamethread.cpp
+++ b/src/net/common/servergamethread.cpp
@@ -103,6 +103,7 @@ ServerGameThread::SendToAllPlayers(boost::shared_ptr<NetPacket> packet)
 void
 ServerGameThread::Main()
 {
+	SetState(SERVER_INITIAL_STATE::Instance());
 	GetSender().Run();
 
 	try
@@ -167,6 +168,7 @@ ServerGameThread::InternalStartGame()
 void
 ServerGameThread::InternalKickPlayer(unsigned playerId)
 {
+// TODO
 //	SessionWrapper tmpSession = GetSessionByUniquePlayerId(uniqueId);
 //	SessionError(tmpSession, ERR_NET_PLAYER_KICKED);
 }
@@ -174,6 +176,7 @@ ServerGameThread::InternalKickPlayer(unsigned playerId)
 void
 ServerGameThread::AddComputerPlayer(boost::shared_ptr<PlayerData> player)
 {
+	// TODO
 	m_computerPlayers.push_back(player);
 }
 
diff --git a/src/net/servergamethread.h b/src/net/servergamethread.h
index 93c9521d..cafae817 100644
--- a/src/net/servergamethread.h
+++ b/src/net/servergamethread.h
@@ -25,8 +25,6 @@
 #include <gui/guiinterface.h>
 #include <gamedata.h>
 
-#include <deque>
-
 #define GAME_THREAD_TERMINATE_TIMEOUT	200
 
 
@@ -62,8 +60,6 @@ public:
 
 protected:
 
-	typedef std::deque<SessionWrapper > SessionQueue;
-
 	// Main function of the thread.
 	virtual void Main();