diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp
index 9cae7d4c9d..3c69155dc7 100644
--- a/stepmania/src/MusicWheelItem.cpp
+++ b/stepmania/src/MusicWheelItem.cpp
@@ -289,12 +289,12 @@ void MusicWheelItem::RefreshGrades()
 		else
 			dc = GAMESTATE->m_PreferredDifficulty[p];
 
-		HighScore hs;
+		ProfileSlot ps = ProfileSlot_Machine;
 		if( PROFILEMAN->IsPersistentProfile(p) )
-			PROFILEMAN->GetHighScoreForDifficulty( data->m_pSong, GAMESTATE->GetCurrentStyle(), (ProfileSlot)p, dc, hs );
-		else
-			PROFILEMAN->GetHighScoreForDifficulty( data->m_pSong, GAMESTATE->GetCurrentStyle(), ProfileSlot_Machine, dc, hs );
+			ps = (ProfileSlot)p;
 
+		HighScore hs;
+		PROFILEMAN->GetHighScoreForDifficulty( data->m_pSong, GAMESTATE->GetCurrentStyle(), ps, dc, hs );
 		m_pGradeDisplay[p]->SetGrade( p, hs.GetGrade() );
 	}
 }
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index f4687e2edc..ec869ab93a 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -32,8 +32,6 @@
 
 const int NUM_SCORE_DIGITS	=	9;
 
-#define SCORE_SORT_CHANGE_COMMAND(i) 		THEME->GetMetricA( m_sName, ssprintf("ScoreP%iSortChangeCommand", i+1) )
-#define SCORE_FRAME_SORT_CHANGE_COMMAND(i)	THEME->GetMetricA( m_sName, ssprintf("ScoreFrameP%iSortChangeCommand", i+1) )
 #define METER_TYPE				THEME->GetMetric ( m_sName, "MeterType" )
 #define SHOW_OPTIONS_MESSAGE_SECONDS		THEME->GetMetricF( m_sName, "ShowOptionsMessageSeconds" )
 
@@ -247,15 +245,6 @@ ScreenSelectMusic::~ScreenSelectMusic()
 
 }
 
-void ScreenSelectMusic::TweenScoreOnAndOffAfterChangeSort()
-{
-	FOREACH_HumanPlayer( p )
-	{
-		m_textHighScore[p].RunCommands( SCORE_SORT_CHANGE_COMMAND(p) );
-		m_sprHighScoreFrame[p].RunCommands( SCORE_FRAME_SORT_CHANGE_COMMAND(p) );
-	}
-}
-
 /* If bForce is true, the next request will be started even if it might cause a skip. */
 void ScreenSelectMusic::CheckBackgroundRequests( bool bForce )
 {
@@ -776,7 +765,7 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
 	}
 	else if( SM == SM_SortOrderChanging ) /* happens immediately */
 	{
-		TweenScoreOnAndOffAfterChangeSort();
+		this->PlayCommand( "SortChange" );
 	}
 	else if( SM == SM_GainFocus )
 	{
diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h
index a4b6d357ca..7e23c66699 100644
--- a/stepmania/src/ScreenSelectMusic.h
+++ b/stepmania/src/ScreenSelectMusic.h
@@ -46,7 +46,6 @@ public:
 protected:
 	virtual bool GenericTweenOn() const { return true; }
 	virtual bool GenericTweenOff() const { return true; }
-	void TweenScoreOnAndOffAfterChangeSort();
 	void UpdateSelectButton();
 
 	void ChangeDifficulty( PlayerNumber pn, int dir );