diff --git a/Core/ControlManager.cpp b/Core/ControlManager.cpp
index d21ee49d..42e2bf02 100644
--- a/Core/ControlManager.cpp
+++ b/Core/ControlManager.cpp
@@ -374,12 +374,8 @@ void ControlManager::StreamState(bool saving)
 		}
 	}
 
-	int32_t unusedMousePositionX = 0;
-	int32_t unusedMousePositionY = 0;
-	bool unusedRefreshState = false;
-
 	ArrayInfo<ControllerType> types = { controllerTypes, 4 };
-	Stream(unusedRefreshState, unusedMousePositionX, unusedMousePositionY, nesModel, expansionDevice, consoleType, types, hasFourScore, useNes101Hvc101Behavior, zapperDetectionRadius, _lagCounter, _pollCounter);
+	Stream(nesModel, expansionDevice, consoleType, types, hasFourScore, useNes101Hvc101Behavior, zapperDetectionRadius, _lagCounter, _pollCounter);
 
 	if(!saving) {
 		settings->SetNesModel(nesModel);
@@ -396,10 +392,8 @@ void ControlManager::StreamState(bool saving)
 		UpdateControlDevices();
 	}
 
-	if(GetStateVersion() >= 7) {
-		for(uint8_t i = 0; i < _controlDevices.size(); i++) {
-			SnapshotInfo device{ _controlDevices[i].get() };
-			Stream(device);
-		}
+	for(uint8_t i = 0; i < _controlDevices.size(); i++) {
+		SnapshotInfo device{ _controlDevices[i].get() };
+		Stream(device);
 	}
 }
diff --git a/Core/DeltaModulationChannel.cpp b/Core/DeltaModulationChannel.cpp
index 8fd5f33e..61533809 100644
--- a/Core/DeltaModulationChannel.cpp
+++ b/Core/DeltaModulationChannel.cpp
@@ -108,8 +108,7 @@ void DeltaModulationChannel::Clock()
 void DeltaModulationChannel::StreamState(bool saving)
 {
 	BaseApuChannel::StreamState(saving);
-	int32_t unused_enableOverclockCounter = 0;
-	Stream(_sampleAddr, _sampleLength, _outputLevel, _irqEnabled, _loopFlag, _currentAddr, _bytesRemaining, _readBuffer, _bufferEmpty, _shiftRegister, _bitsRemaining, _silenceFlag, _needToRun, unused_enableOverclockCounter);
+	Stream(_sampleAddr, _sampleLength, _outputLevel, _irqEnabled, _loopFlag, _currentAddr, _bytesRemaining, _readBuffer, _bufferEmpty, _shiftRegister, _bitsRemaining, _silenceFlag, _needToRun);
 }
 
 bool DeltaModulationChannel::IrqPending(uint32_t cyclesToRun)
diff --git a/Core/FDS.cpp b/Core/FDS.cpp
index d79b1d0b..5eeb2c5b 100644
--- a/Core/FDS.cpp
+++ b/Core/FDS.cpp
@@ -474,17 +474,11 @@ void FDS::StreamState(bool saving)
 {
 	BaseMapper::StreamState(saving);
 
-	bool unusedNeedIrq = false;
-	uint32_t unusedNewDiskNumber = 0;
-	uint32_t unusedNewDiskInsertDelay = 0;
-	bool unusedIsDirty = false;
-
 	SnapshotInfo audio{ _audio.get() };
 	
 	Stream(_irqReloadValue, _irqCounter, _irqEnabled, _irqRepeatEnabled, _diskRegEnabled, _soundRegEnabled, _writeDataReg, _motorOn, _resetTransfer,
 		_readMode, _crcControl, _diskReady, _diskIrqEnabled, _extConWriteReg, _badCrc, _endOfHead, _readWriteEnabled, _readDataReg, _diskWriteProtected,
-		_diskNumber, unusedNewDiskNumber, unusedNewDiskInsertDelay, _diskPosition, _delay, _previousCrcControlFlag, _gapEnded, _scanningDisk, unusedNeedIrq,
-		_transferComplete, unusedIsDirty, audio);
+		_diskNumber, _diskPosition, _delay, _previousCrcControlFlag, _gapEnded, _scanningDisk, _transferComplete, audio);
 
 	if(saving) {
 		vector<uint8_t> ipsData = CreateIpsPatch();
diff --git a/Core/PPU.cpp b/Core/PPU.cpp
index 08f5d115..a2f0a6f2 100644
--- a/Core/PPU.cpp
+++ b/Core/PPU.cpp
@@ -1330,18 +1330,14 @@ void PPU::StreamState(bool saving)
 		disableOamAddrBug = _settings->CheckFlag(EmulationFlags::DisableOamAddrBug);
 	}
 
-	uint16_t unusedSpriteDmaAddr = 0;
-	uint16_t unusedSpriteDmaCounter = 0;
-	bool unusedSkipScrollIncrement = false;
-
 	Stream(_state.Control, _state.Mask, _state.Status, _state.SpriteRamAddr, _state.VideoRamAddr, _state.XScroll, _state.TmpVideoRamAddr, _state.WriteToggle,
 		_state.HighBitShift, _state.LowBitShift, _flags.VerticalWrite, _flags.SpritePatternAddr, _flags.BackgroundPatternAddr, _flags.LargeSprites, _flags.VBlank,
 		_flags.Grayscale, _flags.BackgroundMask, _flags.SpriteMask, _flags.BackgroundEnabled, _flags.SpritesEnabled, _flags.IntensifyRed, _flags.IntensifyGreen,
 		_flags.IntensifyBlue, _paletteRamMask, _intensifyColorBits, _statusFlags.SpriteOverflow, _statusFlags.Sprite0Hit, _statusFlags.VerticalBlank, _scanline,
 		_cycle, _frameCount, _memoryReadBuffer, _currentTile.LowByte, _currentTile.HighByte, _currentTile.PaletteOffset, _nextTile.LowByte, _nextTile.HighByte,
 		_nextTile.PaletteOffset, _nextTile.TileAddr, _previousTile.LowByte, _previousTile.HighByte, _previousTile.PaletteOffset, _spriteIndex, _spriteCount,
-		_secondaryOAMAddr, _sprite0Visible, _oamCopybuffer, _spriteInRange, _sprite0Added, _spriteAddrH, _spriteAddrL, _oamCopyDone, _nesModel, unusedSpriteDmaAddr,
-		unusedSpriteDmaCounter, _prevRenderingEnabled, _renderingEnabled, _openBus, _ignoreVramRead, unusedSkipScrollIncrement, paletteRam, spriteRam, secondarySpriteRam,
+		_secondaryOAMAddr, _sprite0Visible, _oamCopybuffer, _spriteInRange, _sprite0Added, _spriteAddrH, _spriteAddrL, _oamCopyDone, _nesModel,
+		_prevRenderingEnabled, _renderingEnabled, _openBus, _ignoreVramRead, paletteRam, spriteRam, secondarySpriteRam,
 		openBusDecayStamp, _cyclesNeeded, disablePpu2004Reads, disablePaletteRead, disableOamAddrBug, _overflowBugCounter, _updateVramAddr, _updateVramAddrDelay,
 		_needStateUpdate, _ppuBusAddress);
 
diff --git a/Core/VsControlManager.cpp b/Core/VsControlManager.cpp
index 9e076d9b..b519c3df 100644
--- a/Core/VsControlManager.cpp
+++ b/Core/VsControlManager.cpp
@@ -32,10 +32,8 @@ void VsControlManager::StreamState(bool saving)
 {
 	ControlManager::StreamState(saving);
 
-	VsInputType unusedInputType = VsInputType::Default;
-
 	uint32_t dipSwitches = _console->GetSettings()->GetDipSwitches();
-	Stream(_prgChrSelectBit, _protectionCounter, _refreshState, unusedInputType, dipSwitches);
+	Stream(_prgChrSelectBit, _protectionCounter, _refreshState, dipSwitches);
 	
 	if(!saving) {
 		_console->GetSettings()->SetDipSwitches(dipSwitches);