diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am
index 2fc7d8dae0..76c2700fbb 100644
--- a/stepmania/src/Makefile.am
+++ b/stepmania/src/Makefile.am
@@ -34,7 +34,6 @@ ScreenEditMenu.cpp ScreenEditMenu.h ScreenEnding.cpp ScreenEnding.h \
 ScreenEvaluation.cpp ScreenEvaluation.h \
 ScreenExit.cpp ScreenExit.h ScreenNetEvaluation.cpp ScreenNetEvaluation.h \
 ScreenNetSelectMusic.cpp ScreenNetSelectMusic.h ScreenNetSelectBase.cpp ScreenNetSelectBase.h ScreenNetRoom.cpp ScreenNetRoom.h \
-ScreenEz2SelectMusic.cpp ScreenEz2SelectMusic.h ScreenEz2SelectPlayer.cpp ScreenEz2SelectPlayer.h \
 ScreenGameplay.cpp ScreenGameplay.h \
 ScreenGameplayLesson.cpp ScreenGameplayLesson.h \
 ScreenGameplayNormal.cpp ScreenGameplayNormal.h \
@@ -289,7 +288,7 @@ EditMenu.cpp EditMenu.h FadingBanner.cpp FadingBanner.h \
 GradeDisplay.cpp GradeDisplay.h GraphDisplay.cpp GraphDisplay.h \
 GrooveRadar.cpp GrooveRadar.h GroupList.cpp GroupList.h HelpDisplay.cpp HelpDisplay.h \
 MemoryCardDisplay.cpp MemoryCardDisplay.h \
-MenuTimer.cpp MenuTimer.h ModeSwitcher.cpp ModeSwitcher.h MusicBannerWheel.cpp MusicBannerWheel.h \
+MenuTimer.cpp MenuTimer.h MusicBannerWheel.cpp MusicBannerWheel.h \
 MusicList.cpp MusicList.h MusicSortDisplay.cpp MusicSortDisplay.h MusicWheel.cpp MusicWheel.h \
 MusicWheelItem.cpp MusicWheelItem.h OptionIcon.cpp OptionIcon.h OptionIconRow.cpp OptionIconRow.h \
 OptionRow.cpp OptionRow.h OptionsCursor.cpp OptionsCursor.h \
diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj
index cddfd17a4e..63160e3d93 100644
--- a/stepmania/src/StepMania-net2003.vcproj
+++ b/stepmania/src/StepMania-net2003.vcproj
@@ -340,18 +340,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 			<File
 				RelativePath="ScreenExit.h">
 			</File>
-			<File
-				RelativePath="ScreenEz2SelectMusic.cpp">
-			</File>
-			<File
-				RelativePath="ScreenEz2SelectMusic.h">
-			</File>
-			<File
-				RelativePath="ScreenEz2SelectPlayer.cpp">
-			</File>
-			<File
-				RelativePath="ScreenEz2SelectPlayer.h">
-			</File>
 			<File
 				RelativePath="ScreenGameplay.cpp">
 			</File>
@@ -1418,12 +1406,6 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<File
 				RelativePath="MenuTimer.h">
 			</File>
-			<File
-				RelativePath="ModeSwitcher.cpp">
-			</File>
-			<File
-				RelativePath="ModeSwitcher.h">
-			</File>
 			<File
 				RelativePath="MusicBannerWheel.cpp">
 			</File>
diff --git a/stepmania/src/StepMania-net2005.vcproj b/stepmania/src/StepMania-net2005.vcproj
index ccf2539ede..6309975d90 100644
--- a/stepmania/src/StepMania-net2005.vcproj
+++ b/stepmania/src/StepMania-net2005.vcproj
@@ -434,22 +434,6 @@
 				RelativePath="ScreenExit.h"
 				>
 			</File>
-			<File
-				RelativePath="ScreenEz2SelectMusic.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenEz2SelectMusic.h"
-				>
-			</File>
-			<File
-				RelativePath="ScreenEz2SelectPlayer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ScreenEz2SelectPlayer.h"
-				>
-			</File>
 			<File
 				RelativePath="ScreenGameplay.cpp"
 				>
@@ -2514,14 +2498,6 @@
 				RelativePath="MenuTimer.h"
 				>
 			</File>
-			<File
-				RelativePath="ModeSwitcher.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ModeSwitcher.h"
-				>
-			</File>
 			<File
 				RelativePath="MusicBannerWheel.cpp"
 				>