diff --git a/stepmania/src/BGAnimation.cpp b/stepmania/src/BGAnimation.cpp
index 1698b0ce5c..fc4257a9e1 100644
--- a/stepmania/src/BGAnimation.cpp
+++ b/stepmania/src/BGAnimation.cpp
@@ -5,7 +5,6 @@
 #include "RageUtil.h"
 #include "ActorUtil.h"
 #include "Foreach.h"
-#include "Command.h"
 #include "LuaManager.h"
 
 BGAnimation::BGAnimation()
diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp
index 60f06ad44d..69d641a4f7 100644
--- a/stepmania/src/Background.cpp
+++ b/stepmania/src/Background.cpp
@@ -16,7 +16,6 @@
 #include "ScreenDimensions.h"
 #include "ThemeMetric.h"
 #include "PlayerState.h"
-#include "Command.h"
 #include "ActorUtil.h"
 #include <set>
 #include <float.h>
diff --git a/stepmania/src/Combo.cpp b/stepmania/src/Combo.cpp
index 70596abffa..113accf8c1 100644
--- a/stepmania/src/Combo.cpp
+++ b/stepmania/src/Combo.cpp
@@ -4,7 +4,6 @@
 #include "StatsManager.h"
 #include "GameState.h"
 #include "song.h"
-#include "Command.h"
 #include "PlayerState.h"
 
 Combo::Combo()
diff --git a/stepmania/src/Command.cpp b/stepmania/src/Command.cpp
index 96fc361dda..32555a55ac 100644
--- a/stepmania/src/Command.cpp
+++ b/stepmania/src/Command.cpp
@@ -7,14 +7,6 @@
 #include "Foreach.h"
 
 
-void IncorrectNumberArgsWarning( const Command &command, int iMaxIndexAccessed )
-{
-	const RString sError = ssprintf( "Actor::HandleCommand: Wrong number of arguments in command '%s'.  Expected %d but there are %u.",
-		command.GetOriginalCommandString().c_str(), iMaxIndexAccessed+1, unsigned(command.m_vsArgs.size()) );
-	LOG->Warn( sError );
-	Dialog::OK( sError );
-}
-
 RString Command::GetName() const 
 {
 	if( m_vsArgs.empty() )
diff --git a/stepmania/src/Command.h b/stepmania/src/Command.h
index ebb7d644a4..7ae3730b85 100644
--- a/stepmania/src/Command.h
+++ b/stepmania/src/Command.h
@@ -45,23 +45,6 @@ public:
 void ParseCommands( const RString &sCmds, Commands &vCmdsOut );
 Commands ParseCommands( const RString &sCmds );
 
-
-#define BeginHandleArgs int iMaxIndexAccessed = 0;
-#define GET_ARG(type,i) iMaxIndexAccessed = max( i, iMaxIndexAccessed ); command.GetArg##type( i );
-#define sArg(i) GetArg<RString>(command,i,iMaxIndexAccessed)
-#define fArg(i) GetArg<float>(command,i,iMaxIndexAccessed)
-#define iArg(i) GetArg<int>(command,i,iMaxIndexAccessed)
-#define bArg(i) GetArg<bool>(command,i,iMaxIndexAccessed)
-#define EndHandleArgs if( iMaxIndexAccessed != (int)command.m_vsArgs.size()-1 ) { IncorrectNumberArgsWarning( command, iMaxIndexAccessed ); }
-void IncorrectNumberArgsWarning( const Command& command, int iMaxIndexAccessed );
-
-template<class T>
-inline T GetArg( const Command& command, int iIndex, int& iMaxIndexAccessedOut )
-{
-	iMaxIndexAccessedOut = max( iIndex, iMaxIndexAccessedOut );
-	return (T)command.GetArg(iIndex);
-}
-
 #endif
 
 /*
diff --git a/stepmania/src/DifficultyList.cpp b/stepmania/src/DifficultyList.cpp
index 4bf6dcdc54..f0fa7d697b 100644
--- a/stepmania/src/DifficultyList.cpp
+++ b/stepmania/src/DifficultyList.cpp
@@ -11,7 +11,6 @@
 #include "ThemeManager.h"
 #include "StepsUtil.h"
 #include "CommonMetrics.h"
-#include "Command.h"
 #include "Foreach.h"
 #include "SongUtil.h"
 #include "XmlFile.h"
diff --git a/stepmania/src/PaneDisplay.cpp b/stepmania/src/PaneDisplay.cpp
index 37dfe517ff..94fa0f18ae 100644
--- a/stepmania/src/PaneDisplay.cpp
+++ b/stepmania/src/PaneDisplay.cpp
@@ -9,7 +9,6 @@
 #include "Profile.h"
 #include "Course.h"
 #include "Style.h"
-#include "Command.h"
 #include "ActorUtil.h"
 #include "Foreach.h"
 #include "PercentageDisplay.h"
diff --git a/stepmania/src/ScoreDisplayBattle.cpp b/stepmania/src/ScoreDisplayBattle.cpp
index 258c93934c..3352ad01c1 100644
--- a/stepmania/src/ScoreDisplayBattle.cpp
+++ b/stepmania/src/ScoreDisplayBattle.cpp
@@ -6,7 +6,6 @@
 #include "GameState.h"
 #include "ThemeManager.h"
 #include "PlayerState.h"
-#include "Command.h"
 
 #define ITEM_X( i )				THEME->GetMetricF("ScoreDisplayBattle",ssprintf("Item%dX",i+1))
 #define ITEM_Y( i )				THEME->GetMetricF("ScoreDisplayBattle",ssprintf("Item%dY",i+1))
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index aa5ba5629a..935dda669d 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -27,7 +27,6 @@
 #include "Style.h"
 #include "MemoryCardManager.h"
 #include "PlayerState.h"
-#include "Command.h"
 #include "CommonMetrics.h"
 #include "ScoreKeeperNormal.h"
 #include "InputEventPlus.h"
diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index b2598ebdca..5adb7233e2 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -19,7 +19,6 @@
 #include "ScreenDimensions.h"
 #include "ScreenPrompt.h"
 #include "PlayerState.h"
-#include "Command.h"
 #include "RageLog.h"
 #include "song.h"
 #include "InputEventPlus.h"
diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index 404e2b5512..39cd64e445 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -10,7 +10,6 @@
 #include "ThemeManager.h"
 #include "Game.h"
 #include "ScreenDimensions.h"
-#include "Command.h"
 #include "InputEventPlus.h"
 #include "LocalizedString.h"
 
diff --git a/stepmania/src/ScreenNetRoom.cpp b/stepmania/src/ScreenNetRoom.cpp
index 078634c3a8..9e287af62b 100644
--- a/stepmania/src/ScreenNetRoom.cpp
+++ b/stepmania/src/ScreenNetRoom.cpp
@@ -7,7 +7,6 @@
 #include "GameState.h"
 #include "ThemeManager.h"
 #include "ScreenTextEntry.h"
-#include "Command.h"
 #include "WheelItemBase.h"
 #include "InputEventPlus.h"
 #include "LocalizedString.h"
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 4b84bc7480..e4d4b7f197 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -10,7 +10,6 @@
 #include "InputMapper.h"
 #include "ActorUtil.h"
 #include "ScreenDimensions.h"
-#include "Command.h"
 #include "GameCommand.h"
 #include "OptionRowHandler.h"
 #include "LuaBinding.h"
diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index ac64a53070..3ff70f34d9 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -8,7 +8,6 @@
 #include "ThemeManager.h"
 #include "GameCommand.h"
 #include "LightsManager.h"
-#include "Command.h"
 #include "InputEventPlus.h"
 
 #define CHOICE_NAMES		THEME->GetMetric (m_sName,"ChoiceNames")
diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp
index b6184538b9..a0db46341c 100644
--- a/stepmania/src/ScreenSelectCharacter.cpp
+++ b/stepmania/src/ScreenSelectCharacter.cpp
@@ -10,7 +10,6 @@
 #include "Character.h"
 #include "PrefsManager.h"
 #include "RageTextureManager.h"
-#include "Command.h"
 #include "CharacterManager.h"
 
 
diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp
index 9992ce169a..c0886ee4ac 100644
--- a/stepmania/src/ScreenSelectDifficulty.cpp
+++ b/stepmania/src/ScreenSelectDifficulty.cpp
@@ -9,7 +9,6 @@
 #include "GameCommand.h"
 #include "ActorUtil.h"
 #include "ScreenDimensions.h"
-#include "Command.h"
 
 #define NUM_CHOICES_ON_PAGE_1			THEME->GetMetricI(m_sName,"NumChoicesOnPage1")
 #define LOCK_INPUT_SECONDS			THEME->GetMetricF(m_sName,"LockInputSeconds")
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index c9c9228078..d47c691490 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -24,7 +24,6 @@
 #include "Foreach.h"
 #include "Style.h"
 #include "PlayerState.h"
-#include "Command.h"
 #include "CommonMetrics.h"
 #include "BannerCache.h"
 #include "song.h"
diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp
index ee68a2a050..3e8620bfe6 100644
--- a/stepmania/src/ScreenSelectStyle.cpp
+++ b/stepmania/src/ScreenSelectStyle.cpp
@@ -10,7 +10,6 @@
 #include "ActorUtil.h"
 #include "LightsManager.h"
 #include "CommonMetrics.h"
-#include "Command.h"
 #include "LocalizedString.h"
 
 
diff --git a/stepmania/src/ScreenSystemLayer.cpp b/stepmania/src/ScreenSystemLayer.cpp
index 9cf6531fc8..03143a3c78 100644
--- a/stepmania/src/ScreenSystemLayer.cpp
+++ b/stepmania/src/ScreenSystemLayer.cpp
@@ -10,7 +10,6 @@
 #include "ProfileManager.h"
 #include "RageDisplay.h"
 #include "RageLog.h"
-#include "Command.h"
 #include "ScreenDimensions.h"
 
 
diff --git a/stepmania/src/TextBanner.cpp b/stepmania/src/TextBanner.cpp
index 0027fe8ef5..3fb26593d8 100644
--- a/stepmania/src/TextBanner.cpp
+++ b/stepmania/src/TextBanner.cpp
@@ -7,7 +7,6 @@
 #include "RageTextureManager.h"
 #include "ActorUtil.h"
 #include "ThemeMetric.h"
-#include "Command.h"
 
 
 void TextBanner::Load( RString sType )