diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp
index 71fb5e6e3f..17611271a4 100644
--- a/stepmania/src/ScreenAttract.cpp
+++ b/stepmania/src/ScreenAttract.cpp
@@ -1,5 +1,4 @@
 #include "global.h"
-
 #include "ScreenAttract.h"
 #include "ScreenManager.h"
 #include "GameConstantsAndTypes.h"
@@ -14,7 +13,6 @@
 #include "ThemeManager.h"
 #include "GameSoundManager.h"
 #include "CommonMetrics.h"
-#include "BGAnimation.h"
 
 #define NEXT_SCREEN					THEME->GetMetric (m_sName,"NextScreen")
 #define START_SCREEN(sScreenName)	THEME->GetMetric (sScreenName,"StartScreen")
diff --git a/stepmania/src/ScreenCredits.cpp b/stepmania/src/ScreenCredits.cpp
index 52b68964ea..137d7af2d1 100644
--- a/stepmania/src/ScreenCredits.cpp
+++ b/stepmania/src/ScreenCredits.cpp
@@ -271,7 +271,6 @@ ScreenCredits::ScreenCredits( CString sName ) : ScreenAttract( sName )
 
 	this->ClearMessageQueue( SM_BeginFadingOut );	// ignore ScreenAttract's SecsToShow
 	this->PostScreenMessage( SM_BeginFadingOut, fTime );
-//	this->PostScreenMessage( SM_BeginFadingOut, m_Background.GetLengthSeconds() );
 	SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("credits") );
 }
 
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 47cedbc489..6f3130a989 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -1220,8 +1220,6 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
 
 		if( OPTIONS_MENU_AVAILABLE )
 		{
-//			float fShowSeconds = m_Out.GetLengthSeconds();
-
 			// show "hold START for options"
 			m_sprOptionsMessage.SetHidden( false );
 			ON_COMMAND( m_sprOptionsMessage );
diff --git a/stepmania/src/ScreenTextEntry.h b/stepmania/src/ScreenTextEntry.h
index f18f698f94..35b2152368 100644
--- a/stepmania/src/ScreenTextEntry.h
+++ b/stepmania/src/ScreenTextEntry.h
@@ -8,7 +8,6 @@
 #include "Transition.h"
 #include "Quad.h"
 #include "RandomSample.h"
-#include "BGAnimation.h"
 #include "EnumHelper.h"
 
 enum KeyboardRow