diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 1853dfc2e1..ca00e7e40d 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -496,18 +496,6 @@ void ScreenOptions::MenuUp( PlayerNumber pn )
 			return;	// can't go up any more
 
 		m_iCurrentRow[p]--;
-
-
-//	Chris:  Will add back in later
-//		/* Find the prev row with any un-dimmed entries. */
-//		int new_row = m_iCurrentRow[p];
-//		do {
-///			if(--new_row < 0)
-//				new_row = m_iNumOptionRows-1; // wrap around
-//			if(!RowCompletelyDimmed(new_row)) break;
-//		} while(new_row != m_iCurrentRow[p]);
-//		m_iCurrentRow[p] = new_row;
-
 		TweenCursor( (PlayerNumber)p );
 	}
 	m_SoundPrevRow.Play();
@@ -526,17 +514,6 @@ void ScreenOptions::MenuDown( PlayerNumber pn )
 			return;	// can't go down any more
 
 		m_iCurrentRow[p]++;
-
-// Chris:  Commented this out, but will add back in later.
-//		/* Find the next row with any un-dimmed entries. */
-//		int new_row = m_iCurrentRow[p];
-//		do {
-//			if( ++new_row == m_iNumOptionRows )
-//				new_row = 0; // wrap around
-//			if(!RowCompletelyDimmed(new_row)) break;
-//		} while(new_row != m_iCurrentRow[p]);
-//		m_iCurrentRow[p] = new_row;
-
 		TweenCursor( (PlayerNumber)p );
 	}
 	m_SoundNextRow.Play();
diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h
index f3b6c66a8a..017b412d0a 100644
--- a/stepmania/src/ScreenOptions.h
+++ b/stepmania/src/ScreenOptions.h
@@ -91,8 +91,6 @@ protected:
 	BitmapText		m_textOptionLineTitles[MAX_OPTION_LINES];
 	BitmapText		m_textOptions[MAX_OPTION_LINES][MAX_OPTIONS_PER_LINE];	// this array has to be big enough to hold all of the options
 	bool			m_OptionDim[MAX_OPTION_LINES][MAX_OPTIONS_PER_LINE];
-	void DimOption(int line, int option, bool dim);
-	bool RowCompletelyDimmed(int line) const;
 
 	int m_iSelectedOption[NUM_PLAYERS][MAX_OPTION_LINES];
 	int m_iCurrentRow[NUM_PLAYERS];