diff --git a/stepmania/src/ScreenNetRoom.cpp b/stepmania/src/ScreenNetRoom.cpp
index d906db7036..8721854624 100644
--- a/stepmania/src/ScreenNetRoom.cpp
+++ b/stepmania/src/ScreenNetRoom.cpp
@@ -40,7 +40,6 @@ void ScreenNetRoom::Init()
 	m_soundChangeSel.Load( THEME->GetPathS("ScreenNetRoom","change sel"));
 
 	m_iRoomPlace = 0;
-	m_SelectMode = SelectRooms;
 
 	m_sprTitleBG.Load( THEME->GetPathG( m_sName, "TitleBG" ) );
 	m_sprTitleBG.SetName( "TitleBG" );
@@ -65,12 +64,6 @@ void ScreenNetRoom::Init()
 	this->MoveToHead( &m_RoomWheel );
 	ON_COMMAND( m_RoomWheel );
 
-	//CreateRoom Sprite
-	m_sprCreateRoom.Load( THEME->GetPathG( m_sName, "CreateRoom" ) );
-	m_sprCreateRoom.SetName( "CreateRoom" );
-	SET_XY_AND_ON_COMMAND( m_sprCreateRoom );
-	this->AddChild( &m_sprCreateRoom );
-
 	NSMAN->ReportNSSOnOff(7);
 }
 
@@ -171,21 +164,14 @@ void ScreenNetRoom::Update( float fDeltaTime )
 
 void ScreenNetRoom::MenuStart( PlayerNumber pn )
 {
-	switch( m_SelectMode )
-	{
-	case SelectRooms:
-		NSMAN->m_SMOnlinePacket.ClearPacket();
-		NSMAN->m_SMOnlinePacket.Write1( 1 );
-		NSMAN->m_SMOnlinePacket.Write1( 1 ); //Type (enter a room)
-		m_RoomWheel.Select();
+	NSMAN->m_SMOnlinePacket.ClearPacket();
+	NSMAN->m_SMOnlinePacket.Write1( 1 );
+	NSMAN->m_SMOnlinePacket.Write1( 1 ); //Type (enter a room)
+	m_RoomWheel.Select();
+	if (m_RoomWheel.LastSelected() != NULL)
 		NSMAN->m_SMOnlinePacket.WriteNT( m_RoomWheel.LastSelected()->m_sText );
-		NSMAN->SendSMOnline( );
-		ScreenNetSelectBase::MenuStart( pn );
-		break;
-	case SelectMakeRoom:
-		SCREENMAN->TextEntry( SM_BackFromRoomName, "Enter Room Name:", "", 255 );
-		break;
-	};
+	NSMAN->SendSMOnline( );
+	ScreenNetSelectBase::MenuStart( pn );
 }
 
 void ScreenNetRoom::MenuBack( PlayerNumber pn )
@@ -209,25 +195,16 @@ void ScreenNetRoom::MenuDown( PlayerNumber pn, const InputEventType type )
 
 void ScreenNetRoom::MenuLeft( PlayerNumber pn, const InputEventType type )
 {
-	switch (m_SelectMode)
-	{
-	case SelectRooms:
-		if (type == IET_FIRST_PRESS)
-			m_RoomWheel.Move(-1);
-		break;
-	};
+	if (type == IET_FIRST_PRESS)
+		m_RoomWheel.Move(-1);
 	ScreenNetSelectBase::MenuLeft( pn );
 }
 
 void ScreenNetRoom::MenuRight( PlayerNumber pn, const InputEventType type )
 {
-	switch( m_SelectMode )
-	{
-	case SelectRooms:
-		if (type == IET_FIRST_PRESS)
-			m_RoomWheel.Move(1);
-		break;
-	};
+	if (type == IET_FIRST_PRESS)
+		m_RoomWheel.Move(1);
+
 	ScreenNetSelectBase::MenuRight( pn );
 }
 
diff --git a/stepmania/src/ScreenNetRoom.h b/stepmania/src/ScreenNetRoom.h
index 3396824369..0629ccaabc 100644
--- a/stepmania/src/ScreenNetRoom.h
+++ b/stepmania/src/ScreenNetRoom.h
@@ -46,23 +46,12 @@ private:
 	void MenuLeft( PlayerNumber pn, const InputEventType type );
 	void MenuRight( PlayerNumber pn, const InputEventType type );
 	void CreateNewRoom( const CString& rName,  const CString& rDesc );
-
-	enum NetSelectModes
-	{
-		SelectRooms = 0,
-		SelectMakeRoom,
-		SelectModes,
-	};
-
-	NetSelectModes m_SelectMode;
 		
 	RageSound m_soundChangeSel;
 	
 	BitmapText m_textTitle;
 	Sprite m_sprTitleBG;
 
-	Sprite m_sprCreateRoom;
-
 	vector < BitmapText > m_RoomList;
 	vector < RoomData > m_Rooms;
 	int m_iRoomPlace;