diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj
index 4e7a414d0f..91751a488b 100644
--- a/stepmania/src/StepMania-net2003.vcproj
+++ b/stepmania/src/StepMania-net2003.vcproj
@@ -334,12 +334,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 			<File
 				RelativePath="ScreenEvaluation.h">
 			</File>
-			<File
-				RelativePath=".\ScreenEvaluationMultiplayer.cpp">
-			</File>
-			<File
-				RelativePath=".\ScreenEvaluationMultiplayer.h">
-			</File>
 			<File
 				RelativePath="ScreenExit.cpp">
 			</File>
@@ -358,12 +352,6 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<File
 				RelativePath=".\ScreenGameplayLesson.h">
 			</File>
-			<File
-				RelativePath=".\ScreenGameplayMultiplayer.cpp">
-			</File>
-			<File
-				RelativePath=".\ScreenGameplayMultiplayer.h">
-			</File>
 			<File
 				RelativePath=".\ScreenGameplayNormal.cpp">
 			</File>
@@ -388,12 +376,6 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<File
 				RelativePath="ScreenInstructions.h">
 			</File>
-			<File
-				RelativePath=".\ScreenJoinMultiplayer.cpp">
-			</File>
-			<File
-				RelativePath=".\ScreenJoinMultiplayer.h">
-			</File>
 			<File
 				RelativePath="ScreenJukebox.cpp">
 			</File>
diff --git a/stepmania/src/StepMania-net2005.vcproj b/stepmania/src/StepMania-net2005.vcproj
index 2ccd3797d9..0b93b93ec8 100644
--- a/stepmania/src/StepMania-net2005.vcproj
+++ b/stepmania/src/StepMania-net2005.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
@@ -80,7 +80,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 &quot;$(intdir)\verstub.obj&quot;"
 				AdditionalDependencies="shell32.lib gdi32.lib user32.lib ole32.lib advapi32.lib"
-				OutputFile="../../piu/Program/StepMania-debug.exe"
+				OutputFile="../Program/StepMania-debug.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
@@ -190,7 +190,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 &quot;$(intdir)\verstub.obj&quot;"
 				AdditionalDependencies="shell32.lib gdi32.lib user32.lib ole32.lib advapi32.lib"
-				OutputFile="../../piu/Program/StepMania.exe"
+				OutputFile="../Program/StepMania.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
@@ -292,7 +292,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 &quot;$(intdir)\verstub.obj&quot;"
 				AdditionalDependencies="shell32.lib gdi32.lib user32.lib ole32.lib advapi32.lib"
-				OutputFile="../../piu/Program/StepMania-fastdebug.exe"
+				OutputFile="../Program/StepMania-fastdebug.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
@@ -304,7 +304,6 @@
 				MapFileName="$(IntDir)\$(TargetName).map"
 				MapExports="true"
 				SubSystem="2"
-				FixedBaseAddress="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -435,14 +434,6 @@
 				RelativePath="ScreenEvaluation.h"
 				>
 			</File>
-			<File
-				RelativePath=".\ScreenEvaluationMultiplayer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ScreenEvaluationMultiplayer.h"
-				>
-			</File>
 			<File
 				RelativePath="ScreenExit.cpp"
 				>
@@ -463,14 +454,6 @@
 				RelativePath=".\ScreenGameplayLesson.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\ScreenGameplayMultiplayer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ScreenGameplayMultiplayer.h"
-				>
-			</File>
 			<File
 				RelativePath=".\ScreenGameplayNormal.cpp"
 				>
@@ -511,14 +494,6 @@
 				RelativePath="ScreenInstructions.h"
 				>
 			</File>
-			<File
-				RelativePath=".\ScreenJoinMultiplayer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ScreenJoinMultiplayer.h"
-				>
-			</File>
 			<File
 				RelativePath="ScreenJukebox.cpp"
 				>
@@ -1123,6 +1098,14 @@
 				RelativePath="CommonMetrics.h"
 				>
 			</File>
+			<File
+				RelativePath=".\ControllerStateDisplay.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ControllerStateDisplay.h"
+				>
+			</File>
 			<File
 				RelativePath="Course.cpp"
 				>
@@ -2539,14 +2522,6 @@
 				RelativePath="ComboGraph.h"
 				>
 			</File>
-			<File
-				RelativePath=".\ControllerStateDisplay.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ControllerStateDisplay.h"
-				>
-			</File>
 			<File
 				RelativePath="CourseContentsList.cpp"
 				>
@@ -3311,14 +3286,6 @@
 				RelativePath=".\RageSoundReader_ChannelSplit.h"
 				>
 			</File>
-			<File
-				RelativePath=".\RageSoundReader_DetectPitch.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\RageSoundReader_DetectPitch.h"
-				>
-			</File>
 			<File
 				RelativePath=".\RageSoundReader_Extend.cpp"
 				>
@@ -6967,22 +6934,6 @@
 			RelativePath="archutils\Win32\DialogErrorHeader.bmp"
 			>
 		</File>
-		<File
-			RelativePath=".\PitchDetectionTest.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\PitchDetectionTest.h"
-			>
-		</File>
-		<File
-			RelativePath=".\PitchDetectionTestUtil.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\PitchDetectionTestUtil.h"
-			>
-		</File>
 		<File
 			RelativePath="StepMania.xpm"
 			>