diff --git a/stepmania/src/ScreenAppearanceOptions.cpp b/stepmania/src/ScreenAppearanceOptions.cpp
index 83fdd703e8..3ec5843e65 100644
--- a/stepmania/src/ScreenAppearanceOptions.cpp
+++ b/stepmania/src/ScreenAppearanceOptions.cpp
@@ -239,8 +239,3 @@ void ScreenAppearanceOptions::GoToNextState()
 	PREFSMAN->SaveGamePrefsToDisk();
 	GoToPrevState();
 }
-
-
-
-
-
diff --git a/stepmania/src/ScreenAutogenOptions.cpp b/stepmania/src/ScreenAutogenOptions.cpp
index 9a4136ba9e..4d4a8e5150 100644
--- a/stepmania/src/ScreenAutogenOptions.cpp
+++ b/stepmania/src/ScreenAutogenOptions.cpp
@@ -70,4 +70,3 @@ void ScreenAutogenOptions::GoToNextState()
 	PREFSMAN->SaveGlobalPrefsToDisk();
 	GoToPrevState();
 }
-
diff --git a/stepmania/src/ScreenBackgroundOptions.cpp b/stepmania/src/ScreenBackgroundOptions.cpp
index ad776a2200..55daa95e60 100644
--- a/stepmania/src/ScreenBackgroundOptions.cpp
+++ b/stepmania/src/ScreenBackgroundOptions.cpp
@@ -87,4 +87,3 @@ void ScreenBackgroundOptions::GoToNextState()
 	PREFSMAN->SaveGlobalPrefsToDisk();
 	GoToPrevState();
 }
-
diff --git a/stepmania/src/ScreenGameplayOptions.cpp b/stepmania/src/ScreenGameplayOptions.cpp
index 95f601b13d..b657e759f8 100644
--- a/stepmania/src/ScreenGameplayOptions.cpp
+++ b/stepmania/src/ScreenGameplayOptions.cpp
@@ -87,4 +87,3 @@ void ScreenGameplayOptions::GoToNextState()
 	PREFSMAN->SaveGlobalPrefsToDisk();
 	GoToPrevState();
 }
-
diff --git a/stepmania/src/ScreenGraphicOptions.cpp b/stepmania/src/ScreenGraphicOptions.cpp
index 114badb669..f0618f4053 100644
--- a/stepmania/src/ScreenGraphicOptions.cpp
+++ b/stepmania/src/ScreenGraphicOptions.cpp
@@ -177,4 +177,3 @@ void ScreenGraphicOptions::GoToNextState()
 	ApplyGraphicOptions();
 	GoToPrevState();
 }
-
diff --git a/stepmania/src/ScreenInputOptions.cpp b/stepmania/src/ScreenInputOptions.cpp
index d5bbb2aa02..ddf8164b98 100644
--- a/stepmania/src/ScreenInputOptions.cpp
+++ b/stepmania/src/ScreenInputOptions.cpp
@@ -102,4 +102,3 @@ void ScreenInputOptions::GoToNextState()
 	PREFSMAN->SaveGlobalPrefsToDisk();
 	GoToPrevState();
 }
-
diff --git a/stepmania/src/ScreenMachineOptions.cpp b/stepmania/src/ScreenMachineOptions.cpp
index cfa4a21efa..b58f58b130 100644
--- a/stepmania/src/ScreenMachineOptions.cpp
+++ b/stepmania/src/ScreenMachineOptions.cpp
@@ -209,4 +209,3 @@ void ScreenMachineOptions::GoToNextState()
 	PREFSMAN->SaveGlobalPrefsToDisk();
 	GoToPrevState();
 }
-
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index a5e4201613..b896370df0 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -797,5 +797,3 @@ void ScreenOptions::MenuDown( PlayerNumber pn )
 	m_SoundNextRow.Play();
 	OnChange();
 }
-
-
diff --git a/stepmania/src/ScreenRaveOptions.cpp b/stepmania/src/ScreenRaveOptions.cpp
index 62b1e1b4b7..0ccd0b5fb3 100644
--- a/stepmania/src/ScreenRaveOptions.cpp
+++ b/stepmania/src/ScreenRaveOptions.cpp
@@ -84,4 +84,3 @@ void ScreenRaveOptions::GoToNextState()
 {
 	SCREENMAN->SetNewScreen( NEXT_SCREEN(GAMESTATE->m_PlayMode) );
 }
-
diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp
index 6557e449b4..e7b1aed8b8 100644
--- a/stepmania/src/ScreenSongOptions.cpp
+++ b/stepmania/src/ScreenSongOptions.cpp
@@ -127,7 +127,3 @@ void ScreenSongOptions::GoToNextState()
 	else
 		SCREENMAN->SetNewScreen( NEXT_SCREEN(GAMESTATE->m_PlayMode) );
 }
-
-
-
-
diff --git a/stepmania/src/ScreenSoundOptions.cpp b/stepmania/src/ScreenSoundOptions.cpp
index 661bfac674..67580381ec 100644
--- a/stepmania/src/ScreenSoundOptions.cpp
+++ b/stepmania/src/ScreenSoundOptions.cpp
@@ -81,4 +81,3 @@ void ScreenSoundOptions::GoToNextState()
 	PREFSMAN->SaveGlobalPrefsToDisk();
 	GoToPrevState();
 }
-