diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index 15560819d0..6490d5e96b 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -5,12 +5,9 @@
 #include "RageException.h"
 #include "RageTimer.h"
 #include "RageUtil.h"
-#include "Game.h"
 #include "IniFile.h"
 #include "RageTimer.h"
-#include "Font.h"
 #include "FontCharAliases.h"
-#include "RageDisplay.h"
 #include "arch/Dialog/Dialog.h"
 #include "RageFile.h"
 #include "ScreenManager.h"
@@ -763,13 +760,6 @@ CString ThemeManager::GetLanguageIniPath( const CString &sThemeName, const CStri
 	return GetThemeDirFromName(sThemeName) + LANGUAGES_SUBDIR + sLanguage + ".ini";
 }
 
-// TODO: remove these and update the places that use them
-CString ThemeManager::GetPathToB( const CString &sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathB(sClassName,sElement,bOptional); }
-CString ThemeManager::GetPathToF( const CString &sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathF(sClassName,sElement,bOptional); }
-CString ThemeManager::GetPathToG( const CString &sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathG(sClassName,sElement,bOptional); }
-CString ThemeManager::GetPathToS( const CString &sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathS(sClassName,sElement,bOptional); }
-CString ThemeManager::GetPathToO( const CString &sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathO(sClassName,sElement,bOptional); }
-
 void ThemeManager::GetModifierNames( vector<CString>& AddTo )
 {
 	for( deque<Theme>::const_iterator iter = g_vThemes.begin();
diff --git a/stepmania/src/ThemeManager.h b/stepmania/src/ThemeManager.h
index c3e7805f7e..3df3a5a95b 100644
--- a/stepmania/src/ThemeManager.h
+++ b/stepmania/src/ThemeManager.h
@@ -4,7 +4,6 @@
 #define THEMEMANAGER_H
 
 #include "RageTypes.h"
-#include "RageTimer.h"
 #include <set>
 #include <deque>
 #include "Command.h"
@@ -62,13 +61,6 @@ public:
 	CString GetPathO( const CString &sClassName, const CString &sElement, bool bOptional=false ) { return GetPath(EC_OTHER,sClassName,sElement,bOptional); };
 	void ClearThemePathCache();
 
-	// TODO: remove these and update the places that use them
-	CString GetPathToB( const CString &sFileName, bool bOptional=false );
-	CString GetPathToF( const CString &sFileName, bool bOptional=false );
-	CString GetPathToG( const CString &sFileName, bool bOptional=false );
-	CString GetPathToS( const CString &sFileName, bool bOptional=false );
-	CString GetPathToO( const CString &sFileName, bool bOptional=false );
-
 	// TODO: Make these return values const refs.
 	bool		HasMetric( const CString &sClassName, const CString &sValueName );
 	CString		GetMetricRaw( const CString &sClassName, const CString &sValueName );