diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 612ffb969e..17de7a0957 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -2329,7 +2329,6 @@ m_pSoundMusic->StopPlaying();
 	m_sprUnderlay->PlayCommand( EditStateToString(em) );
 
 	m_Background.SetVisible( g_bEditorShowBGChangesPlay  &&  em != STATE_EDITING );
-	m_autoHeader->SetVisible( em == STATE_EDITING );
 	m_textInputTips.SetVisible( em == STATE_EDITING );
 	m_textInfo.SetVisible( em == STATE_EDITING );
 	// Play the OnCommands again so that these will be re-hidden if the OnCommand hides them.
diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp
index 5734b83e8c..b6c9c07cf0 100644
--- a/stepmania/src/ScreenWithMenuElements.cpp
+++ b/stepmania/src/ScreenWithMenuElements.cpp
@@ -37,19 +37,6 @@ void ScreenWithMenuElements::Init()
 
 	ASSERT( this->m_SubActors.empty() );	// don't call Init twice!
 
-	m_autoHeader.Load( THEME->GetPathG(m_sName,"header") );
-	m_autoHeader->SetName("Header");
-	LOAD_ALL_COMMANDS_AND_SET_XY( m_autoHeader );
-	this->AddChild( m_autoHeader );
-
-	if( SHOW_STAGE_DISPLAY )
-	{
-		m_sprStageDisplay.Load( THEME->GetPathG(m_sName,"StageDisplay") );
-		m_sprStageDisplay->SetName( "StageDisplay" );
-		LOAD_ALL_COMMANDS_AND_SET_XY( m_sprStageDisplay );
-		this->AddChild( m_sprStageDisplay );
-	}
-	
 	if( MEMORY_CARD_ICONS )
 	{
 		FOREACH_PlayerNumber( p )
@@ -76,11 +63,6 @@ void ScreenWithMenuElements::Init()
 		this->AddChild( m_MenuTimer );
 	}
 
-	m_autoFooter.Load( THEME->GetPathG(m_sName,"footer") );
-	m_autoFooter->SetName("Footer");
-	LOAD_ALL_COMMANDS_AND_SET_XY( m_autoFooter );
-	this->AddChild( m_autoFooter );
-
 	m_sprUnderlay.Load( THEME->GetPathB(m_sName,"underlay") );
 	m_sprUnderlay->SetName("Underlay");
 	m_sprUnderlay->SetDrawOrder( DRAW_ORDER_UNDERLAY );
@@ -164,11 +146,6 @@ void ScreenWithMenuElements::HandleScreenMessage( const ScreenMessage SM )
 
 void ScreenWithMenuElements::TweenOnScreen()
 {
-	ON_COMMAND( m_autoHeader );
-
-	if( SHOW_STAGE_DISPLAY && !m_sprStageDisplay->GetName().empty() )
-		ON_COMMAND( m_sprStageDisplay );
-
 	if( MEMORY_CARD_ICONS )
 	{
 		FOREACH_PlayerNumber( p )
@@ -178,7 +155,6 @@ void ScreenWithMenuElements::TweenOnScreen()
 	if( m_MenuTimer )
 		ON_COMMAND( m_MenuTimer );
 
-	ON_COMMAND( m_autoFooter );
 	m_sprUnderlay->PlayCommand("On");
 	m_sprOverlay->PlayCommand("On");
 	m_In.PlayCommand("On");
@@ -268,12 +244,9 @@ void ScreenWithMenuElements::TweenOffScreen()
 		OFF_COMMAND( m_MenuTimer );
 	}
 
-	OFF_COMMAND( m_autoHeader );
-	OFF_COMMAND( m_sprStageDisplay );
 	FOREACH_PlayerNumber( p )
 		if( m_MemoryCardDisplay[p] )
 			OFF_COMMAND( m_MemoryCardDisplay[p] );
-	OFF_COMMAND( m_autoFooter );
 	m_sprUnderlay->PlayCommand("Off");
 	m_sprOverlay->PlayCommand("Off");;
 
diff --git a/stepmania/src/ScreenWithMenuElements.h b/stepmania/src/ScreenWithMenuElements.h
index 4cd38a07e9..6ee5da76fb 100644
--- a/stepmania/src/ScreenWithMenuElements.h
+++ b/stepmania/src/ScreenWithMenuElements.h
@@ -45,11 +45,8 @@ protected:
 	virtual bool GenericTweenOff() const { return false; }
 
 	AutoActor			m_sprUnderlay;
-	AutoActor			m_autoHeader;
-	AutoActor			m_sprStageDisplay;
 	MemoryCardDisplay		*m_MemoryCardDisplay[NUM_PLAYERS];
 	MenuTimer			*m_MenuTimer;
-	AutoActor			m_autoFooter;
 	AutoActor			m_sprOverlay;
 
 	Transition			m_In;