diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp
index 3e7758891d..f735baf045 100644
--- a/stepmania/src/GameConstantsAndTypes.cpp
+++ b/stepmania/src/GameConstantsAndTypes.cpp
@@ -47,70 +47,6 @@ DifficultyClass StringToDifficultyClass( CString sDC )
 	return CLASS_INVALID;
 }
 
-
-int NotesTypeToNumTracks( NotesType nt )
-{
-	switch( nt )
-	{
-	case NOTES_TYPE_DANCE_SINGLE:		return 4;
-	case NOTES_TYPE_DANCE_DOUBLE:		return 8;
-	case NOTES_TYPE_DANCE_COUPLE:		return 8;
-	case NOTES_TYPE_DANCE_SOLO:			return 6;
-	case NOTES_TYPE_PUMP_SINGLE:		return 5;
-	case NOTES_TYPE_PUMP_DOUBLE:		return 10;
-	case NOTES_TYPE_EZ2_SINGLE:			return 5; // Single: TL,LHH,D,RHH,TR
-	case NOTES_TYPE_EZ2_SINGLE_HARD:	return 5; // Single: TL,LHH,D,RHH,TR
-	case NOTES_TYPE_EZ2_DOUBLE:			return 10; // Double: Single x2
-	case NOTES_TYPE_EZ2_REAL:			return 7; // Real: TL,LHH,LHL,D,RHL,RHH,TR
-//	case NOTES_TYPE_EZ2_SINGLE_VERSUS:	return 10;	
-//	case NOTES_TYPE_EZ2_SINGLE_HARD_VERSUS:		return 10; 
-//	case NOTES_TYPE_EZ2_REAL_VERSUS:	return 10;
-	default:	ASSERT(0);		return -1;	// invalid NotesType
-	}
-}
-
-NotesType StringToNotesType( CString sNotesType )
-{
-	sNotesType.MakeLower();
-	if     ( sNotesType == "dance-single" )	return NOTES_TYPE_DANCE_SINGLE;
-	else if( sNotesType == "dance-double" )	return NOTES_TYPE_DANCE_DOUBLE;
-	else if( sNotesType == "dance-couple" )	return NOTES_TYPE_DANCE_COUPLE;
-	else if( sNotesType == "dance-solo" )	return NOTES_TYPE_DANCE_SOLO;
-	else if( sNotesType == "pump-single" )	return NOTES_TYPE_PUMP_SINGLE;
-	else if( sNotesType == "pump-double" )	return NOTES_TYPE_PUMP_DOUBLE;
-	else if( sNotesType == "ez2-single" )	return NOTES_TYPE_EZ2_SINGLE;
-	else if( sNotesType == "ez2-single-hard" )	return NOTES_TYPE_EZ2_SINGLE_HARD;
-	else if( sNotesType == "ez2-double" )	return NOTES_TYPE_EZ2_DOUBLE;
-	else if( sNotesType == "ez2-real" )		return NOTES_TYPE_EZ2_REAL;
-// 	else if( sNotesType == "ez2-real-versus" )		return NOTES_TYPE_EZ2_REAL_VERSUS;
-//	else if( sNotesType == "ez2-single-versus" )		return NOTES_TYPE_EZ2_SINGLE_VERSUS;
-	else	ASSERT(0);	return NOTES_TYPE_DANCE_SINGLE;	// invalid NotesType
-}
-
-CString NotesTypeToString( NotesType nt )
-{
-	switch( nt )
-	{
-	case NOTES_TYPE_DANCE_SINGLE:	return "dance-single";
-	case NOTES_TYPE_DANCE_DOUBLE:	return "dance-double";
-	case NOTES_TYPE_DANCE_COUPLE:	return "dance-couple";
-	case NOTES_TYPE_DANCE_SOLO:		return "dance-solo";
-	case NOTES_TYPE_PUMP_SINGLE:	return "pump-single";
-	case NOTES_TYPE_PUMP_DOUBLE:	return "pump-double";
-	case NOTES_TYPE_EZ2_SINGLE:		return "ez2-single";
-	case NOTES_TYPE_EZ2_SINGLE_HARD:		return "ez2-single-hard";
-	case NOTES_TYPE_EZ2_DOUBLE:		return "ez2-double";
-	case NOTES_TYPE_EZ2_REAL:		return "ez2-real";
-//	case NOTES_TYPE_EZ2_REAL_VERSUS:		return "ez2-real-versus";
-//	case NOTES_TYPE_EZ2_SINGLE_VERSUS:		return "ez2-single-versus";
-//	case NOTES_TYPE_EZ2_SINGLE_HARD_VERSUS:		return "ez2-single-hard-versus";
-	default:	ASSERT(0);		return "";	// invalid NotesType
-	}
-}
-
-
-
-
 D3DXCOLOR PlayerToColor( const PlayerNumber p ) 
 {
 	switch( p )
diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h
index 32ad15f0b0..7e1fa3695e 100644
--- a/stepmania/src/GameConstantsAndTypes.h
+++ b/stepmania/src/GameConstantsAndTypes.h
@@ -76,15 +76,9 @@ enum NotesType
 //	NOTES_TYPE_EZ2_REAL_VERSUS,
 	NUM_NOTES_TYPES,		// leave this at the end
 	NOTES_TYPE_INVALID,
+	NOTES_TYPE_PUMP_COUPLE,
 };
 
-int NotesTypeToNumTracks( NotesType nt );
-
-NotesType StringToNotesType( CString sNotesType );
-
-CString NotesTypeToString( NotesType nt );
-
-
 //////////////////////////
 // Play mode stuff
 //////////////////////////