diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 16a93139e1..9516739039 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -435,11 +435,6 @@ void GameState::EndGame()
 
 	PROFILEMAN->SaveMachineProfile();
 
-	// Reset the USB storage device numbers -after- saving
-	CHECKPOINT;
-//	MEMCARDMAN->FlushAndReset();
-	CHECKPOINT;
-
 	// make sure we don't execute EndGame twice.
 	m_timeGameStarted.SetZero();
 }
diff --git a/stepmania/src/ScreenServiceAction.cpp b/stepmania/src/ScreenServiceAction.cpp
index bf1a22440c..354b41b578 100644
--- a/stepmania/src/ScreenServiceAction.cpp
+++ b/stepmania/src/ScreenServiceAction.cpp
@@ -95,7 +95,6 @@ static CString ClearMemoryCardEdits()
 	}
 
 	MEMCARDMAN->UnmountCard(pn);
-	MEMCARDMAN->FlushAndReset();
 
 	return ssprintf("%d edits cleared, %d errors.",iNumSuccessful,iNumAttempted-iNumSuccessful);
 }
@@ -195,7 +194,6 @@ static CString TransferStatsMachineToMemoryCard()
 	bool bSaved = PROFILEMAN->GetMachineProfile()->SaveAllToDir( sDir, PREFSMAN->m_bSignProfileData );
 
 	MEMCARDMAN->UnmountCard(pn);
-	MEMCARDMAN->FlushAndReset();
 
 	if( bSaved )
 		return ssprintf("Machine stats saved to P%d card.",pn+1);
@@ -236,7 +234,6 @@ static CString TransferStatsMemoryCardToMachine()
 	}
 
 	MEMCARDMAN->UnmountCard(pn);
-	MEMCARDMAN->FlushAndReset();
 
 	return "Stats transferred to machine.";
 }
@@ -300,7 +297,6 @@ static CString CopyEditsMachineToMemoryCard()
 	CopyEdits( sFromDir, sToDir, iNumAttempted, iNumSuccessful, iNumOverwritten );
 	
 	MEMCARDMAN->UnmountCard(pn);
-	MEMCARDMAN->FlushAndReset();
 
 	// TODO: Make string themable
 	return ssprintf("Copied to P%d card:\n%d/%d copies OK (%d overwritten).",pn+1,iNumSuccessful,iNumAttempted,iNumOverwritten);
@@ -324,7 +320,6 @@ static CString CopyEditsMemoryCardToMachine()
 	CopyEdits( sFromDir, sToDir, iNumAttempted, iNumSuccessful, iNumOverwritten );
 	
 	MEMCARDMAN->UnmountCard(pn);
-	MEMCARDMAN->FlushAndReset();
 
 	// reload the machine profile
 	PROFILEMAN->SaveMachineProfile();