diff --git a/src/GameConstantsAndTypes.h b/src/GameConstantsAndTypes.h
index 1d86aa9b27..639c061a9a 100644
--- a/src/GameConstantsAndTypes.h
+++ b/src/GameConstantsAndTypes.h
@@ -103,7 +103,6 @@ enum StepsType
 	StepsType_techno_double8,
 	StepsType_popn_five,
 	StepsType_popn_nine,
-	StepsType_guitar_five,
 	StepsType_lights_cabinet,
 	NUM_StepsType,		// leave this at the end
 	StepsType_Invalid,
diff --git a/src/GameInput.h b/src/GameInput.h
index 8ee0532c02..5a474f0e71 100644
--- a/src/GameInput.h
+++ b/src/GameInput.h
@@ -163,15 +163,6 @@ GameButton StringToGameButton( const InputScheme* pInputs, const RString& s );
 #define POPN_BUTTON_RIGHT_YELLOW	GAME_BUTTON_CUSTOM_08
 #define POPN_BUTTON_RIGHT_WHITE		GAME_BUTTON_CUSTOM_09
 #define NUM_POPN_BUTTONS			GAME_BUTTON_CUSTOM_10
-// guitar
-#define GUITAR_BUTTON_FRET1			GAME_BUTTON_CUSTOM_01
-#define GUITAR_BUTTON_FRET2			GAME_BUTTON_CUSTOM_02
-#define GUITAR_BUTTON_FRET3			GAME_BUTTON_CUSTOM_03
-#define GUITAR_BUTTON_FRET4			GAME_BUTTON_CUSTOM_04
-#define GUITAR_BUTTON_FRET5			GAME_BUTTON_CUSTOM_05
-#define GUITAR_BUTTON_STRUM_UP		GAME_BUTTON_CUSTOM_06
-#define GUITAR_BUTTON_STRUM_DOWN	GAME_BUTTON_CUSTOM_07
-#define NUM_GUITAR_BUTTONS			GAME_BUTTON_CUSTOM_08
 
 #define LIGHTS_BUTTON_MARQUEE_UP_LEFT	GAME_BUTTON_CUSTOM_01
 #define LIGHTS_BUTTON_MARQUEE_UP_RIGHT	GAME_BUTTON_CUSTOM_02
diff --git a/src/GameManager.cpp b/src/GameManager.cpp
index 4616c6f7a7..533eb41865 100644
--- a/src/GameManager.cpp
+++ b/src/GameManager.cpp
@@ -2801,7 +2801,6 @@ static const Game *g_Games[] =
 	&g_Game_Maniax,
 	&g_Game_Techno,
 	&g_Game_Popn,
-	//&g_Game_Guitar,	// nope, still broken. -aj
 	&g_Game_Lights,
 };
 
diff --git a/src/Song.h b/src/Song.h
index 5f17ad8969..989f13a19f 100644
--- a/src/Song.h
+++ b/src/Song.h
@@ -42,7 +42,7 @@ enum BackgroundLayer
 /** @brief A custom foreach loop for the different background layers. */
 #define FOREACH_BackgroundLayer( bl ) FOREACH_ENUM( BackgroundLayer, bl )
 
-/** @brief The different instrument tracks for band type games. */
+/** @brief Different instrument tracks for band type games. */
 enum InstrumentTrack
 {
 	InstrumentTrack_Guitar,