diff --git a/stepmania/src/ScreenEz2SelectMusic.h b/stepmania/src/ScreenEz2SelectMusic.h
index 3d25062d19..f72868e126 100644
--- a/stepmania/src/ScreenEz2SelectMusic.h
+++ b/stepmania/src/ScreenEz2SelectMusic.h
@@ -17,7 +17,6 @@
 #include "TransitionStarWipe.h"
 #include "MenuElements.h"
 #include "TipDisplay.h"
-#include "RageSoundStream.h"
 #include "MusicBannerWheel.h"
 #include "MenuElements.h"
 #include "FootMeter.h"
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 5fbb38d842..fc1edd5851 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -18,7 +18,6 @@
 #include "Song.h"
 #include "NoteData.h"
 #include "MsdFile.h"
-#include "RageSoundStream.h"
 #include "RageSound.h"
 #include "RageException.h"
 #include "SongCacheIndex.h"
@@ -383,13 +382,9 @@ void Song::TidyUpData()
 	/* This must be done before radar calculation. */
 	if( HasMusic() )
 	{
-#if 1
-		RageSoundStream sound;
-		sound.Load( GetMusicPath() );
-#else
 		RageSound sound;
 		sound.Load( GetMusicPath(), false ); /* don't pre-cache */
-#endif
+
 		m_fMusicLengthSeconds = sound.GetLengthSeconds();
 		/* XXX: if(m_fMusicLengthSeconds == -1), warn and throw out the song */
 		if(m_fMusicLengthSeconds == 0)
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index ad51e1ea24..267efc8f79 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -266,14 +266,6 @@ SOURCE=.\RageSoundSample.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\RageSoundStream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\RageSoundStream.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\RageTexture.cpp
 # End Source File
 # Begin Source File
diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index 6af82a4b90..46b9b546ab 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -1185,12 +1185,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath=".\RageSoundSample.h">
 			</File>
-			<File
-				RelativePath=".\RageSoundStream.cpp">
-			</File>
-			<File
-				RelativePath=".\RageSoundStream.h">
-			</File>
 			<File
 				RelativePath=".\RageTexture.cpp">
 			</File>