diff --git a/stepmania/src/GhostArrow.cpp b/stepmania/src/GhostArrow.cpp
index 63e0c73313..768077193d 100644
--- a/stepmania/src/GhostArrow.cpp
+++ b/stepmania/src/GhostArrow.cpp
@@ -13,7 +13,6 @@
 
 #include "GhostArrow.h"
 #include "NoteSkinManager.h"
-#include "GameState.h"
 
 GhostArrow::GhostArrow()
 {
@@ -38,20 +37,20 @@ void GhostArrow::Load( CString sNoteSkin, CString sButton, CString sElement )
 			sPath = NOTESKIN->GetPathToFromNoteSkinAndButton(sNoteSkin, sButton, sElement);	// not optional
 		m_spr[i].Load( sPath );
 	}
-}
-
-void GhostArrow::Init( PlayerNumber pn )
-{
-	m_PlayerNumber = pn;
 
 	for( int i=0; i<NUM_TAP_NOTE_SCORES; i++ )
 	{
 		CString sJudge = TapNoteScoreToString( (TapNoteScore)i );
 		CString sCommand = Capitalize(sJudge)+"Command";
-		m_sScoreCommand[i] = NOTESKIN->GetMetric(GAMESTATE->m_PlayerOptions[pn].m_sNoteSkin,m_sName,sCommand);
+		m_sScoreCommand[i] = NOTESKIN->GetMetric( sNoteSkin, m_sName, sCommand );
 	}
 }
 
+void GhostArrow::Init( PlayerNumber pn )
+{
+	m_PlayerNumber = pn;
+}
+
 void GhostArrow::Step( TapNoteScore score )
 {
 	for( int i=0; i<NUM_TAP_NOTE_SCORES; i++ )