diff --git a/stepmania/src/InputFilter.cpp b/stepmania/src/InputFilter.cpp
index d657e079fb..30c8f5408a 100644
--- a/stepmania/src/InputFilter.cpp
+++ b/stepmania/src/InputFilter.cpp
@@ -103,9 +103,9 @@ void InputFilter::ButtonPressed( const DeviceInput &di, bool Down )
 		LOG->Warn( "Invalid device %i,%i", di.device, NUM_INPUT_DEVICES );
 		return;
 	}
-	if( di.button >= GetNumDeviceButtons(di.device) )
+	if( di.button >= NUM_DeviceButton )
 	{
-		LOG->Warn( "Invalid button %i,%i", di.button, GetNumDeviceButtons(di.device) );
+		LOG->Warn( "Invalid button %i,%i", di.button, NUM_DeviceButton );
 		return;
 	}
 
diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index 1e23a65963..07377a4a6b 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -625,7 +625,7 @@ void InputMapper::UpdateTempDItoGI()
 	// clear out m_tempDItoGI
 	FOREACH_InputDevice( d )
 	{
-		for( int b=0; b<GetNumDeviceButtons(d); b++ )
+		for( int b=0; b<NUM_DeviceButton; b++ )
 		{
 			m_tempDItoGI[d][b].MakeInvalid();
 		}
diff --git a/stepmania/src/RageInputDevice.cpp b/stepmania/src/RageInputDevice.cpp
index a899970aa2..16bec6dbb2 100644
--- a/stepmania/src/RageInputDevice.cpp
+++ b/stepmania/src/RageInputDevice.cpp
@@ -177,11 +177,6 @@ static const CString InputDeviceNames[] = {
 XToString( InputDevice, NUM_INPUT_DEVICES );
 StringToX( InputDevice );
 
-int GetNumDeviceButtons( InputDevice device )
-{
-	return NUM_DeviceButton;
-};
-
 CString DeviceInput::ToString() const
 {
 	if( device == DEVICE_NONE )
diff --git a/stepmania/src/RageInputDevice.h b/stepmania/src/RageInputDevice.h
index 24d0d0bf0a..b3bf831e72 100644
--- a/stepmania/src/RageInputDevice.h
+++ b/stepmania/src/RageInputDevice.h
@@ -258,8 +258,6 @@ enum DeviceButton
 CString DeviceButtonToString( DeviceButton i );
 DeviceButton StringToDeviceButton( const CString& s );
 
-int GetNumDeviceButtons( InputDevice device );
-
 const int MAX_DEVICE_BUTTONS = NUM_DeviceButton;
 
 struct DeviceInput