diff --git a/Packages/MIES/MIES_WaveDataFolderGetters.ipf b/Packages/MIES/MIES_WaveDataFolderGetters.ipf
index 5c14179ff2..a5e6459ccb 100644
--- a/Packages/MIES/MIES_WaveDataFolderGetters.ipf
+++ b/Packages/MIES/MIES_WaveDataFolderGetters.ipf
@@ -3031,27 +3031,14 @@ Function/WAVE GetTPStorage(device)
 	elseif(WaveExists(wv))
 		Redimension/N=(-1, NUM_HEADSTAGES, 31)/D wv
 
-		if(WaveVersionIsSmaller(wv, 10))
-			wv[][][17]     = NaN
-			wv[][][20, 21] = NaN
-		endif
-		if(WaveVersionIsSmaller(wv, 11))
-			wv[][][22] = NaN
-		endif
-		// no size change on version 12
-		if(WaveVersionIsSmaller(wv, 13))
-			wv[][][23] = NaN
-		endif
-		if(WaveVersionIsSmaller(wv, 14))
-			wv[][][24] = NaN
-		endif
 		if(WaveVersionIsSmaller(wv, 15))
-			wv[][][25, 30] = NaN
+			wv[][][17]     = NaN
+			wv[][][20, 30] = NaN
 		endif
 	else
 		Make/N=(MINIMUM_WAVE_SIZE_LARGE, NUM_HEADSTAGES, 31)/D dfr:TPStorage/WAVE=wv
 
-		wv = NaN
+		FastOp wv = (NaN)
 
 		SetNumberInWaveNote(wv, NOTE_INDEX, 0)
 	endif