diff --git a/stepmania/src/CourseContentsList.cpp b/stepmania/src/CourseContentsList.cpp
index b6719ca296..b2f293bd28 100644
--- a/stepmania/src/CourseContentsList.cpp
+++ b/stepmania/src/CourseContentsList.cpp
@@ -19,7 +19,6 @@
 #include "Course.h"
 #include "SongManager.h"
 #include <math.h>
-#include "RageDisplay.h"
 #include "ThemeManager.h"
 #include "Notes.h"
 #include "GameState.h"
diff --git a/stepmania/src/CourseEntryDisplay.cpp b/stepmania/src/CourseEntryDisplay.cpp
index edcb32234c..3083902117 100644
--- a/stepmania/src/CourseEntryDisplay.cpp
+++ b/stepmania/src/CourseEntryDisplay.cpp
@@ -19,7 +19,6 @@
 #include "Course.h"
 #include "SongManager.h"
 #include <math.h>
-#include "RageDisplay.h"
 #include "ThemeManager.h"
 #include "Notes.h"
 #include "GameState.h"
diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp
index b78d865d89..fbc68a356d 100644
--- a/stepmania/src/LifeMeterBar.cpp
+++ b/stepmania/src/LifeMeterBar.cpp
@@ -15,7 +15,6 @@
 #include "RageException.h"
 #include "RageTimer.h"
 #include "GameState.h"
-#include "RageDisplay.h"
 #include <math.h>
 #include "ThemeManager.h"
 
diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index 87e04a45d5..34ded3be3c 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -23,7 +23,6 @@
 #include "RageLog.h"
 #include <math.h>
 #include "ThemeManager.h"
-#include "RageDisplay.h"
 #include "NoteFieldPositioning.h"
 
 
diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index 1ab0fbed81..98644b3210 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -12,7 +12,6 @@
 */
 
 #include "ScreenEz2SelectMusic.h"
-#include "RageDisplay.h"
 #include <math.h>
 #include "SDL.h"
 #include "SDL_opengl.h"
diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp
index 5d960fcae1..1537460cc5 100644
--- a/stepmania/src/ScreenStage.cpp
+++ b/stepmania/src/ScreenStage.cpp
@@ -22,7 +22,6 @@
 #include "GameState.h"
 #include "RageSoundManager.h"
 #include "ThemeManager.h"
-#include "RageDisplay.h"
 
 
 #define NEXT_SCREEN				THEME->GetMetric ("ScreenStage","NextScreen")
@@ -568,14 +567,7 @@ void ScreenStage::Update( float fDeltaTime )
 
 void ScreenStage::DrawPrimitives()
 {
-	//// Enable Zbuffering for the mask in the dance mode
-	//if( g_StageType == STAGE_TYPE_MAX )
-	//	DISPLAY->EnableZBuffer();
-
 	Screen::DrawPrimitives();
-
-	//if( g_StageType == STAGE_TYPE_MAX )
-	//	DISPLAY->DisableZBuffer();
 }
 
 void ScreenStage::HandleScreenMessage( const ScreenMessage SM )