diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp
index a90c4c094d..43aea8ad7e 100644
--- a/stepmania/src/GameCommand.cpp
+++ b/stepmania/src/GameCommand.cpp
@@ -561,28 +561,6 @@ void GameCommand::Apply( PlayerNumber pn ) const
 	Apply( vpns );
 }
 
-
-/* Hack: if this GameCommand would set the screen, clear the setting and return
- * the screen that would have been set. */
-CString GameCommand::GetAndClearScreen()
-{
-	CString sRet;
-	FOREACH( Command, m_Commands.v, cmd )
-	{
-		CString sName = cmd->GetName();
-		if( sName == "screen" )
-		{
-			sRet = CString( cmd->GetArg(1) );
-			m_Commands.v.erase( cmd );
-			break;
-		}
-	}
-
-	m_sScreen = "";
-
-	return sRet;
-}
-
 void GameCommand::Apply( const vector<PlayerNumber> &vpns ) const
 {
 	if( m_Commands.v.size() )
diff --git a/stepmania/src/GameCommand.h b/stepmania/src/GameCommand.h
index 3bff3e8c22..a8d3c20b20 100644
--- a/stepmania/src/GameCommand.h
+++ b/stepmania/src/GameCommand.h
@@ -39,7 +39,6 @@ public:
 	bool DescribesCurrentModeForAllPlayers() const;
 	bool IsPlayable( CString *why = NULL ) const;
 	bool IsZero() const;
-	CString GetAndClearScreen();
 	
 	/* If true, Apply() will apply m_sScreen.  If false, it won't, and you need
 	 * to do it yourself. */
diff --git a/stepmania/src/ScreenOptionsMaster.h b/stepmania/src/ScreenOptionsMaster.h
index a4f11e88ce..ba0647f642 100644
--- a/stepmania/src/ScreenOptionsMaster.h
+++ b/stepmania/src/ScreenOptionsMaster.h
@@ -14,7 +14,6 @@ public:
 
 protected:
 	int m_iChangeMask;
-	bool m_bExportWillSetANewScreen;	// from an OptionRowHandler
 
 	vector<OptionRowHandler*> m_OptionRowHandlers;