diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index edd000abc..29b130ff0 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -2603,37 +2603,6 @@ void CClient::OnDemoPlayerMessage(void *pData, int Size)
 	if(!Sys)
 		GameClient()->OnMessage(Msg, &Unpacker, CONN_MAIN, false);
 }
-/*
-const IDemoPlayer::CInfo *client_demoplayer_getinfo()
-{
-	static DEMOPLAYBACK_INFO ret;
-	const DEMOREC_PLAYBACKINFO *info = m_DemoPlayer.Info();
-	ret.first_tick = info->first_tick;
-	ret.last_tick = info->last_tick;
-	ret.current_tick = info->current_tick;
-	ret.paused = info->paused;
-	ret.speed = info->speed;
-	return &ret;
-}*/
-
-/*
-void DemoPlayer()->SetPos(float percent)
-{
-	demorec_playback_set(percent);
-}
-
-void DemoPlayer()->SetSpeed(float speed)
-{
-	demorec_playback_setspeed(speed);
-}
-
-void DemoPlayer()->SetPause(int paused)
-{
-	if(paused)
-		demorec_playback_pause();
-	else
-		demorec_playback_unpause();
-}*/
 
 void CClient::UpdateDemoIntraTimers()
 {
@@ -3082,11 +3051,6 @@ void CClient::Run()
 	// init the editor
 	m_pEditor->Init();
 
-	// load and save a map to fix it
-	/*if(m_pEditor->Load(arg, IStorage::TYPE_ALL))
-		m_pEditor->Save(arg);
-	return;*/
-
 	m_ServerBrowser.OnInit();
 	// loads the existing ddnet info file if it exists
 	LoadDDNetInfo();
@@ -3110,13 +3074,6 @@ void CClient::Run()
 		m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf, ColorRGBA(0.7f, 0.7f, 1, 1.0f));
 	}
 
-	// connect to the server if wanted
-	/*
-	if(config.cl_connect[0] != 0)
-		Connect(config.cl_connect);
-	config.cl_connect[0] = 0;
-	*/
-
 	//
 	m_FpsGraph.Init(0.0f, 120.0f);