diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index 4266744a34..b1da516a68 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -470,25 +470,9 @@ void Course::AutogenOniFromArtist( CString sArtistName, CString sArtistNameTrans
 	}
 }
 
-/*
- * Difficult courses do the following:
- *
- * For entries with a meter range, bump it up by DIFFICULT_METER_CHANGE;
- * eg. 3..6 -> 5..8, with a minimum no higher than MAX_BOTTOM_RANGE.
- *
- * For entries with a difficulty class, use notes one class harder, if they
- * exist. This way, if a static song entry points to a difficulty, we'll always
- * play that song, even if we're on difficult and harder notes don't exist.  (The
- * exception is a static song entry with a meter range, but that's not very useful.)
- */
-bool Course::HasCourseDifficulty( StepsType st, CourseDifficulty cd ) const
-{
-	return GetTrail( st, cd ) != NULL;
-}
-
 bool Course::IsPlayableIn( StepsType st ) const
 {
-	return HasCourseDifficulty( st, COURSE_DIFFICULTY_REGULAR );
+	return GetTrail( st, COURSE_DIFFICULTY_REGULAR ) != NULL;
 }
 
 static vector<Song*> GetFilteredBestSongs( StepsType st )
@@ -834,9 +818,6 @@ void Course::GetTrails( vector<Trail*> &AddTo, StepsType st ) const
 {
 	FOREACH_CourseDifficulty( cd )
 	{
-		if( !HasCourseDifficulty(st, cd) )
-			continue;
-
 		Trail *pTrail = GetTrail( st, cd );
 		if( pTrail == NULL )
 			continue;
diff --git a/stepmania/src/Course.h b/stepmania/src/Course.h
index f55a48e586..31a991d704 100644
--- a/stepmania/src/Course.h
+++ b/stepmania/src/Course.h
@@ -102,7 +102,6 @@ public:
 	bool AllSongsAreFixed() const;
 
 	int GetEstimatedNumStages() const { return m_entries.size(); }
-	bool HasCourseDifficulty( StepsType st, CourseDifficulty cd ) const;
 	bool IsPlayableIn( StepsType st ) const;
 	bool CourseHasBestOrWorst() const;
 	RageColor GetColor() const;
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 2ce17e8f18..08487b4d51 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -1740,7 +1740,7 @@ bool GameState::ChangePreferredCourseDifficulty( PlayerNumber pn, int dir )
 			return false;
 		if( asDiff.find(cd) == asDiff.end() )
 			continue; /* not available */
-		if( !pCourse || pCourse->HasCourseDifficulty( GAMESTATE->GetCurrentStyleDef()->m_StepsType, cd ) )
+		if( !pCourse || pCourse->GetTrail( GAMESTATE->GetCurrentStyleDef()->m_StepsType, cd ) )
 			break;
 	}
 
diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp
index 51345310f0..37f22eaff3 100644
--- a/stepmania/src/Profile.cpp
+++ b/stepmania/src/Profile.cpp
@@ -301,9 +301,6 @@ int Profile::GetPossibleCourseDancePointsForStepsType( StepsType st ) const
 
 			FOREACH_ShownCourseDifficulty( cd )
 			{
-				if( !pCourse->HasCourseDifficulty(st,cd) )
-					continue;
-
 				Trail* pTrail = pCourse->GetTrail(st,cd);
 				if( pTrail == NULL )
 					continue;