diff --git a/stepmania/src/HoldGhostArrow.cpp b/stepmania/src/HoldGhostArrow.cpp
index 9dc55c5cc0..c7756acfe3 100644
--- a/stepmania/src/HoldGhostArrow.cpp
+++ b/stepmania/src/HoldGhostArrow.cpp
@@ -12,11 +12,7 @@
 */
 
 #include "HoldGhostArrow.h"
-#include "PrefsManager.h"
-#include "RageException.h"
-#include "RageTimer.h"
 #include "NoteSkinManager.h"
-#include "GameState.h"
 
 HoldGhostArrow::HoldGhostArrow()
 {
@@ -26,8 +22,7 @@ HoldGhostArrow::HoldGhostArrow()
 void HoldGhostArrow::Load( CString sNoteSkin, CString sButton, CString sElement )
 {
 	Sprite::Load( NOTESKIN->GetPathToFromNoteSkinAndButton(sNoteSkin, sButton, sElement) );	// not optional
-	m_sOnCommand = NOTESKIN->GetMetric(sNoteSkin,"HoldGhostArrow","OnCommand");
-	this->Command( m_sOnCommand );
+	this->Command( NOTESKIN->GetMetric(sNoteSkin,"HoldGhostArrow","OnCommand") );
 }
 
 void HoldGhostArrow::Update( float fDeltaTime )
@@ -36,11 +31,3 @@ void HoldGhostArrow::Update( float fDeltaTime )
 	
 	m_bHoldIsActive = false;
 }
-
-void HoldGhostArrow::DrawPrimitives()
-{
-	if( !m_bHoldIsActive )
-		return;
-
-	Sprite::DrawPrimitives();
-}
diff --git a/stepmania/src/HoldGhostArrow.h b/stepmania/src/HoldGhostArrow.h
index 1d955612e1..6258841008 100644
--- a/stepmania/src/HoldGhostArrow.h
+++ b/stepmania/src/HoldGhostArrow.h
@@ -13,7 +13,6 @@
 */
 
 #include "Sprite.h"
-#include "PlayerNumber.h"
 
 class HoldGhostArrow : public Sprite
 {
@@ -23,12 +22,12 @@ public:
 	virtual void Load( CString sNoteSkin, CString sButton, CString sElement );
 
 	virtual void Update( float fDeltaTime );
-	virtual void DrawPrimitives();
+	virtual bool EarlyAbortDraw() { return !m_bHoldIsActive; }
 
 	void  SetHoldIsActive( bool bHoldIsActive ) { m_bHoldIsActive = bHoldIsActive; }
 
+private:
 	bool m_bHoldIsActive;
-	CString m_sOnCommand;
 };