diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index 6358cede48..2f5771ad7a 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -1,27 +1,24 @@
 #include "global.h"
 #include "ScreenNameEntry.h"
-#include "SongManager.h"
 #include "GameConstantsAndTypes.h"
 #include "RageUtil.h"
 #include "PrefsManager.h"
 #include "GameManager.h"
 #include "RageLog.h"
-#include "GameState.h"
 #include "GameSoundManager.h"
+#include "GameState.h"
 #include "ThemeManager.h"
 #include "Course.h"
 #include "AnnouncerManager.h"
 #include "ProfileManager.h"
 #include "Profile.h"
 #include "StageStats.h"
-#include "Game.h"
 #include "ScreenDimensions.h"
 #include "PlayerState.h"
 #include "Style.h"
 #include "NoteSkinManager.h"
 #include "InputEventPlus.h"
-#include "RageSoundManager.h"
-#include "RageDisplay.h"
+#include "InputMapper.h"
 
 
 //
@@ -115,20 +112,18 @@ float ScreenNameEntry::ScrollingText::GetClosestCharYOffset( float fFakeBeat ) c
 }
 
 REGISTER_SCREEN_CLASS( ScreenNameEntry );
-ScreenNameEntry::ScreenNameEntry()
+
+void ScreenNameEntry::Init()
 {
 #if 0
-		// DEBUGGING STUFF
+	// DEBUGGING STUFF
 	GAMESTATE->m_pCurGame.Set( GAMEMAN->GetDefaultGame() );
 	GAMESTATE->m_pCurStyle.Set( GAMEMAN->GetHowToPlayStyleForGame(GAMESTATE->m_pCurGame) );
 	GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR );
 	GAMESTATE->m_bSideIsJoined[PLAYER_1] = true;
 	GAMESTATE->m_MasterPlayerNumber = PLAYER_1;
 #endif
-}
-
-void ScreenNameEntry::Init()
-{
+	
 	ScreenWithMenuElements::Init();
 
 	// update cache
@@ -279,11 +274,6 @@ bool ScreenNameEntry::AnyStillEntering() const
 	return false;
 }
 
-ScreenNameEntry::~ScreenNameEntry()
-{
-	LOG->Trace( "ScreenNameEntry::~ScreenNameEntry()" );
-}
-
 void ScreenNameEntry::Update( float fDelta )
 {
 	if( m_bFirstUpdate )
@@ -297,8 +287,6 @@ void ScreenNameEntry::Update( float fDelta )
 
 void ScreenNameEntry::Input( const InputEventPlus &input )
 {
-	LOG->Trace( "ScreenNameEntry::Input()" );
-
 	if( IsTransitioning() )
 		return;	
 
diff --git a/stepmania/src/ScreenNameEntry.h b/stepmania/src/ScreenNameEntry.h
index 0e6e104474..69db01a024 100644
--- a/stepmania/src/ScreenNameEntry.h
+++ b/stepmania/src/ScreenNameEntry.h
@@ -5,17 +5,13 @@
 
 #include "ScreenWithMenuElements.h"
 #include "BitmapText.h"
-#include "Transition.h"
 #include "ReceptorArrowRow.h"
-#include "MenuTimer.h"
+#include "RageSound.h"
 
 class ScreenNameEntry : public ScreenWithMenuElements
 {
 public:
-	ScreenNameEntry();
-	void Init();
-	virtual ~ScreenNameEntry();
-
+	virtual void Init();
 	virtual void Update( float fDeltaTime );
 	virtual void Input( const InputEventPlus &input );
 	virtual void HandleScreenMessage( const ScreenMessage SM );
@@ -24,7 +20,6 @@ public:
 
 	virtual void MenuStart( const InputEventPlus &input );
 
-	enum { ABS_MAX_RANKING_NAME_LENGTH = 10 };
 private:
 	class ScrollingText : public Actor
 	{
@@ -45,7 +40,7 @@ private:
 		static RString	g_sNameChars;
 	};
 	
-	
+	static const int ABS_MAX_RANKING_NAME_LENGTH = 10;
 	bool AnyStillEntering() const;
 
 	ReceptorArrowRow	m_ReceptorArrowRow[NUM_PLAYERS];