diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index 9d6fbb0df9..861eba141c 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -329,11 +329,6 @@ float FindLastDisplayedBeat( PlayerNumber pn, int iLastPixelToDraw )
 	float fSearchDistance = 10;
 	float fLastBeatToDraw = GAMESTATE->m_fSongBeat+fSearchDistance;	
 
-	/* With a song that starts with a negative offset, fSearchDistance here can put
-	 * the result out of range.  XXX: 0 does, too; try setting an #OFFSET to -100. */
-//	if( GAMESTATE->m_fSongBeat < 0 )
-//		fLastBeatToDraw = 0; //fSearchDistance;
-
 	const int NUM_ITERATIONS = 20;
 
 	for( int i=0; i<NUM_ITERATIONS; i++ )
@@ -345,8 +340,6 @@ float FindLastDisplayedBeat( PlayerNumber pn, int iLastPixelToDraw )
 		else	// on screen
 			fLastBeatToDraw += fSearchDistance;
 
-//		float fOffBy = fYPosWOReverse - iLastPixelToDraw;
-		
 		fSearchDistance /= 2;
 	}
 
diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp
index d219a62b01..a7b91a74ef 100644
--- a/stepmania/src/PlayerOptions.cpp
+++ b/stepmania/src/PlayerOptions.cpp
@@ -297,10 +297,6 @@ void PlayerOptions::FromString( CString sOptions )
 			m_sNoteSkin = sBit;
 		else if( sBit == "noteskin" && !on ) /* "no noteskin" */
 			m_sNoteSkin = "default";
-
-		// XXX: this warns about song options
-		//else
-		//	LOG->Warn( "Modifier '%s' not recognized.", sBit.c_str() );
 	}
 }
 
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 5e3770135e..c25e79bcbe 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -631,7 +631,6 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
 			if( iCol >= m_NoteFieldEdit.GetNumTracks() )	// this button is not in the range of columns for this StyleDef
 				break;
 
-			/* XXX: easier to do with 4s */
 			// check for to see if the user intended to remove a HoldNote
 			bool bRemovedAHoldNote = false;
 			for( int i=0; i<m_NoteFieldEdit.GetNumHoldNotes(); i++ )	// for each HoldNote
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index f7bfc9d8d1..23289f5ee3 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -936,9 +936,7 @@ void Song::ReCalculateRadarValuesAndLastBeat()
 		// calculate first/last beat
 		//
 		/* Many songs have stray, empty song patterns.  Ignore them, so
-		 * they don't force the first beat of the whole song to 0.  XXX Should
-		 * we just delete them, now that new patterns can be created quickly
-		 * in the editor? */
+		 * they don't force the first beat of the whole song to 0. */
 		
 		if(tempNoteData.GetLastRow() == 0)
 			continue;