diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index 256d594145..0ec10803bd 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -77,12 +77,6 @@ void ScreenMapControllers::Init()
 		m_Line[b].RunCommands( (b%2)? ODD_LINE_IN : EVEN_LINE_IN );
 	}	
 
-	m_textError.SetName( "Error" );
-	m_textError.LoadFromFont( THEME->GetPathF("Common","normal") );
-	SET_XY_AND_ON_COMMAND( m_textError );
-	this->AddChild( &m_textError );
-
-
 	m_iCurController = 0;
 	m_iCurButton = 0;
 	m_iCurSlot = 0;
@@ -197,13 +191,8 @@ void ScreenMapControllers::Input( const InputEventPlus &input )
 		/* Don't allow function keys to be mapped. */
 		if( input.DeviceI.device == DEVICE_KEYBOARD && (input.DeviceI.button >= KEY_F1 && input.DeviceI.button <= KEY_F12) )
 		{
-			m_textError.SetText( "That key can not be mapped." );
+			SCREENMAN->SystemMessage( "That key can not be mapped." );
 			SCREENMAN->PlayInvalidSound();
-			m_textError.StopTweening();
-			m_textError.SetDiffuse( RageColor(0,1,0,1) );
-			m_textError.BeginTweening( 3 );
-			m_textError.BeginTweening( 1 );
-			m_textError.SetDiffuse( RageColor(0,1,0,0) );
 		}
 		else
 		{
diff --git a/stepmania/src/ScreenMapControllers.h b/stepmania/src/ScreenMapControllers.h
index 4af26e53bf..df2fc89598 100644
--- a/stepmania/src/ScreenMapControllers.h
+++ b/stepmania/src/ScreenMapControllers.h
@@ -31,7 +31,6 @@ private:
 	int m_iWaitingForPress;
 	DeviceInput m_DeviceIToMap;
 
-	BitmapText	m_textError;
 	BitmapText	m_textName[MAX_GAME_BUTTONS];
 	BitmapText	m_textName2[MAX_GAME_BUTTONS];
 	BitmapText	m_textMappedTo[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS][NUM_SHOWN_GAME_TO_DEVICE_SLOTS];