diff --git a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
index afdd95df4..bf757200b 100644
--- a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
+++ b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
@@ -67,7 +67,7 @@ namespace DiscImageChef.Core.Devices.Dumping
         ///     Dumps a compact disc
         /// </summary>
         /// <param name="dskType">Disc type as detected in MMC layer</param>
-        internal void CompactDisc(ref MediaType dskType, bool dumpFirstTrackPregap)
+        internal void CompactDisc(ref MediaType dskType)
         {
             uint               subSize;
             DateTime           start;
diff --git a/DiscImageChef.Core/Devices/Dumping/Dump.cs b/DiscImageChef.Core/Devices/Dumping/Dump.cs
index d73c4600c..45b7ccc25 100644
--- a/DiscImageChef.Core/Devices/Dumping/Dump.cs
+++ b/DiscImageChef.Core/Devices/Dumping/Dump.cs
@@ -18,7 +18,6 @@ namespace DiscImageChef.Core.Devices.Dumping
         readonly string devicePath;
 
         readonly bool                       doResume;
-        readonly bool                       dumpFirstTrackPregap;
         readonly DumpLog                    dumpLog;
         readonly bool                       dumpRaw;
         readonly Encoding                   encoding;
@@ -33,6 +32,7 @@ namespace DiscImageChef.Core.Devices.Dumping
         readonly CICMMetadataType           preSidecar;
         readonly ushort                     retryPasses;
         readonly bool                       stopOnError;
+        bool                                dumpFirstTrackPregap;
         Resume                              resume;
         uint                                skip;
 
diff --git a/DiscImageChef.Core/Devices/Dumping/MMC.cs b/DiscImageChef.Core/Devices/Dumping/MMC.cs
index 55bd56037..6cc37b88f 100644
--- a/DiscImageChef.Core/Devices/Dumping/MMC.cs
+++ b/DiscImageChef.Core/Devices/Dumping/MMC.cs
@@ -67,10 +67,10 @@ namespace DiscImageChef.Core.Devices.Dumping
         /// <param name="dumpLog">Dump logger</param>
         /// <param name="encoding">Encoding to use when analyzing dump</param>
         /// <param name="dskType">Disc type as detected in MMC layer</param>
-        /// <param name="dumpLeadIn">Try to read and dump as much Lead-in as possible</param>
+        /// <param name="dumpFirstTrackPregap">Try to read and dump as much Lead-in as possible</param>
         /// <param name="outputPath">Path to output file</param>
         /// <param name="formatOptions">Formats to pass to output file plugin</param>
-        internal void Mmc(ref MediaType dskType, bool dumpLeadIn)
+        internal void Mmc(ref MediaType dskType)
         {
             bool   sense;
             byte[] tmpBuf;
@@ -182,7 +182,7 @@ namespace DiscImageChef.Core.Devices.Dumping
 
             if(compactDisc)
             {
-                CompactDisc(ref dskType, dumpLeadIn);
+                CompactDisc(ref dskType);
                 return;
             }
 
diff --git a/DiscImageChef.Core/Devices/Dumping/SCSI.cs b/DiscImageChef.Core/Devices/Dumping/SCSI.cs
index acfcfeab1..c2547429a 100644
--- a/DiscImageChef.Core/Devices/Dumping/SCSI.cs
+++ b/DiscImageChef.Core/Devices/Dumping/SCSI.cs
@@ -30,7 +30,6 @@
 // Copyright © 2011-2019 Natalia Portillo
 // ****************************************************************************/
 
-using System;
 using System.Threading;
 using DiscImageChef.CommonTypes;
 using DiscImageChef.CommonTypes.Interfaces;
@@ -62,7 +61,6 @@ namespace DiscImageChef.Core.Devices.Dumping
         /// <param name="dumpFirstTrackPregap">Try to read and dump as much Lead-in as possible</param>
         /// <param name="outputPath">Path to output file</param>
         /// <param name="formatOptions">Formats to pass to output file plugin</param>
-        /// <exception cref="ArgumentException">If you asked to dump long sectors from a SCSI Streaming device</exception>
         public void Scsi()
         {
             MediaType dskType = MediaType.Unknown;
@@ -219,7 +217,7 @@ namespace DiscImageChef.Core.Devices.Dumping
                     Ssc();
                     return;
                 case PeripheralDeviceTypes.MultiMediaDevice:
-                    if(outputPlugin is IWritableOpticalImage opticalPlugin) Mmc(ref dskType, dumpFirstTrackPregap);
+                    if(outputPlugin is IWritableOpticalImage opticalPlugin) Mmc(ref dskType);
                     else
                         StoppingErrorMessage
                           ?.Invoke("The specified plugin does not support storing optical disc images.");