diff --git a/stepmania/src/ScoreKeeper5th.cpp b/stepmania/src/ScoreKeeper5th.cpp
index 46c5108428..7f230b7d1e 100644
--- a/stepmania/src/ScoreKeeper5th.cpp
+++ b/stepmania/src/ScoreKeeper5th.cpp
@@ -202,15 +202,10 @@ void ScoreKeeper5th::AddScore( TapNoteScore score )
 
 	// What does this do?  "Don't use a multiplier if 
 	// the player has failed"?
-	// Also, why does this switch on score again instead
-	// of just adding p?  -Chris
 	if( GAMESTATE->m_CurStageStats.bFailed[m_PlayerNumber] )
-		switch( score )
-		{
-			case TNS_MARVELOUS:	m_iScore += 10;		break;
-			case TNS_PERFECT:	m_iScore += MarvelousEnabled? 9:10; break;
-			case TNS_GREAT:		m_iScore += 5;		break;
-		}
+	{
+		m_iScore += p;
+	}
 	else
 	{
 		m_iScore += GetScore(p, B, sum, m_iTapNotesHit);
diff --git a/stepmania/src/ScoreKeeperMAX2.cpp b/stepmania/src/ScoreKeeperMAX2.cpp
index aef31dd8c9..c41589fcd2 100644
--- a/stepmania/src/ScoreKeeperMAX2.cpp
+++ b/stepmania/src/ScoreKeeperMAX2.cpp
@@ -33,11 +33,7 @@ ScoreKeeperMAX2::ScoreKeeperMAX2( const vector<Steps*>& apNotes_, const CStringA
 	int iTotalPossibleDancePoints = 0;
 	for( unsigned i=0; i<apNotes.size(); i++ )
 	{
-//		Steps* pSteps = apNotes[0];
-		Steps* pSteps = apNotes[i];  // this should reflect the
-		// song's steps since in oni mode all songs don't necessarily
-		// have the same number of steps
-
+		Steps* pSteps = apNotes[i];
 		NoteData notedata;
 		pSteps->GetNoteData( &notedata );