diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 7694ae44a7..d09e57acad 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -949,9 +949,6 @@ void PlayerMinus::Step( int col, RageTimer tm )
 			int ms_error = (int) roundf( fSecondsFromPerfect * 1000 );
 			ms_error = min( ms_error, MAX_PRO_TIMING_ERROR );
 
-			// TODO: Remove use of PlayerNumber.
-			PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
-
 			if( m_pPlayerStageStats )
 				m_pPlayerStageStats->iTotalError += ms_error;
 			if (!m_pPlayerState->m_PlayerOptions.m_fBlind)
@@ -1100,9 +1097,6 @@ void PlayerMinus::OnRowCompletelyJudged( int iIndexThatWasSteppedOn )
 		}
 		else
 		{
-			// TODO: Remove use of PlayerNumber.
-			PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
-
 			bool bBright = m_pPlayerStageStats && m_pPlayerStageStats->iCurCombo>(int)BRIGHT_GHOST_COMBO_THRESHOLD;
 			if( m_pNoteField )
 				m_pNoteField->DidTapNote( c, score, bBright );
@@ -1163,9 +1157,6 @@ void PlayerMinus::UpdateTapNotesMissedOlderThan( float fMissIfOlderThanSeconds )
 				MissedNoteOnThisRow = true;
 				m_NoteData.SetTapNoteScore( t, r, TNS_MISS );
 
-				// TODO: Remove use of PlayerNumber.
-				PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
-
 				if( m_pPlayerStageStats )
 				{
 					m_pPlayerStageStats->iTotalError += MAX_PRO_TIMING_ERROR;
diff --git a/stepmania/src/ScoreDisplayRave.cpp b/stepmania/src/ScoreDisplayRave.cpp
index 538cebbbc1..eccb224de0 100644
--- a/stepmania/src/ScoreDisplayRave.cpp
+++ b/stepmania/src/ScoreDisplayRave.cpp
@@ -58,8 +58,6 @@ void ScoreDisplayRave::Update( float fDelta )
 {
 	ScoreDisplay::Update( fDelta );
 
-	PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
-
 	float fLevel = m_pPlayerState->m_fSuperMeter;
 	AttackLevel level = (AttackLevel)(int)fLevel;