diff --git a/stepmania/src/GhostArrow.cpp b/stepmania/src/GhostArrow.cpp
index 67aeb752bd..ae3a614d5c 100644
--- a/stepmania/src/GhostArrow.cpp
+++ b/stepmania/src/GhostArrow.cpp
@@ -36,11 +36,6 @@ void GhostArrow::Load( CString sNoteSkin, CString sButton, CString sElement )
 	}
 }
 
-void GhostArrow::Init( PlayerNumber pn )
-{
-	m_PlayerNumber = pn;
-}
-
 void GhostArrow::Step( TapNoteScore score )
 {
 	FOREACH_TapNoteScore( i )
diff --git a/stepmania/src/GhostArrow.h b/stepmania/src/GhostArrow.h
index e59ce6d80e..63f31308f8 100644
--- a/stepmania/src/GhostArrow.h
+++ b/stepmania/src/GhostArrow.h
@@ -15,12 +15,10 @@ public:
 	GhostArrow();
 
 	void Load( CString sNoteSkin, CString sButton, CString sFile );
-	virtual void Init( PlayerNumber pn );
 
 	void Step( TapNoteScore score );
 
 protected:
-	PlayerNumber m_PlayerNumber;
 	Sprite	m_spr[NUM_TAP_NOTE_SCORES];
 	apActorCommands m_acScoreCommand[NUM_TAP_NOTE_SCORES];
 };
diff --git a/stepmania/src/GhostArrowRow.cpp b/stepmania/src/GhostArrowRow.cpp
index 9ebe9b25ec..7de62917f6 100644
--- a/stepmania/src/GhostArrowRow.cpp
+++ b/stepmania/src/GhostArrowRow.cpp
@@ -32,8 +32,6 @@ void GhostArrowRow::Load( const PlayerState* pPlayerState, CString NoteSkin, flo
 	// init arrows
 	for( int c=0; c<m_iNumCols; c++ ) 
 	{
-		// TODO: Remove indexing by PlayerNumber;
-		PlayerNumber pn = pPlayerState->m_PlayerNumber;
 		CString Button = GAMESTATE->GetCurrentGame()->ColToButtonName( c );
 
 		m_GhostDim.push_back( new GhostArrow );
@@ -44,10 +42,6 @@ void GhostArrowRow::Load( const PlayerState* pPlayerState, CString NoteSkin, flo
 		m_GhostBright[c]->SetName( "GhostArrowBright" );
 		m_HoldGhost[c]->SetName( "HoldGhostArrow" );
 		
-		m_GhostDim[c]->Init( pn );
-		m_GhostBright[c]->Init( pn );
-		//m_HoldGhost[c]->Init( pn );
-
 		m_GhostDim[c]->Load( NoteSkin, Button, "tap explosion dim" );
 		m_GhostBright[c]->Load( NoteSkin, Button, "tap explosion bright" );
 		m_HoldGhost[c]->Load( NoteSkin, Button, "hold explosion" );