diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 6ee494ef3e..1526693d2c 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -1326,10 +1326,10 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, int* iAnswers )
 				SCREENMAN->MiniMenu( &g_EditSongInfo, SM_BackFromEditSongInfo );
 			}
 			break;
-		case edit_bpm:
-			break;
-		case edit_stop:
-			break;
+//		case edit_bpm:
+//			break;
+//		case edit_stop:
+//			break;
 		case edit_bg_change:
 			{
 				//
diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h
index dfac56b7c9..6417305c64 100644
--- a/stepmania/src/ScreenEdit.h
+++ b/stepmania/src/ScreenEdit.h
@@ -107,8 +107,8 @@ public:
 		player_options,
 		song_options,
 		edit_song_info,
-		edit_bpm,
-		edit_stop,
+//		edit_bpm,
+//		edit_stop,
 		edit_bg_change,
 		play_preview_music,
 		exit,