diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
index 72b0105b1..42c2b0e16 100644
--- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml
+++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
@@ -227,7 +227,6 @@
             <e p="ATAPI.cs" t="Include" />
             <e p="DeviceReport.cs" t="Include" />
             <e p="FireWire.cs" t="Include" />
-            <e p="NVMe.cs" t="Include" />
             <e p="PCMCIA.cs" t="Include" />
             <e p="SCSI" t="Include">
               <e p="General.cs" t="Include" />
diff --git a/DiscImageChef.Core/Devices/Report/NVMe.cs b/DiscImageChef.Core/Devices/Report/NVMe.cs
deleted file mode 100644
index 3d190c109..000000000
--- a/DiscImageChef.Core/Devices/Report/NVMe.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// /***************************************************************************
-// The Disc Image Chef
-// ----------------------------------------------------------------------------
-//
-// Filename       : NVMe.cs
-// Author(s)      : Natalia Portillo <claunia@claunia.com>
-//
-// Component      : Core algorithms.
-//
-// --[ Description ] ----------------------------------------------------------
-//
-//     Creates reports from NVMe devices.
-//
-// --[ License ] --------------------------------------------------------------
-//
-//     This program is free software: you can redistribute it and/or modify
-//     it under the terms of the GNU General Public License as
-//     published by the Free Software Foundation, either version 3 of the
-//     License, or (at your option) any later version.
-//
-//     This program is distributed in the hope that it will be useful,
-//     but WITHOUT ANY WARRANTY; without even the implied warranty of
-//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//     GNU General Public License for more details.
-//
-//     You should have received a copy of the GNU General Public License
-//     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// ----------------------------------------------------------------------------
-// Copyright © 2011-2018 Natalia Portillo
-// ****************************************************************************/
-
-using System;
-using DiscImageChef.CommonTypes.Metadata;
-using DiscImageChef.Devices;
-
-namespace DiscImageChef.Core.Devices.Report
-{
-    public static class Nvme
-    {
-        public static void Report(Device dev, ref DeviceReportV2 report, bool debug, ref bool removable)
-        {
-            if(report == null) return;
-
-            throw new NotImplementedException("NVMe devices not yet supported.");
-        }
-    }
-}
\ No newline at end of file
diff --git a/DiscImageChef.Core/DiscImageChef.Core.csproj b/DiscImageChef.Core/DiscImageChef.Core.csproj
index 04fb6c742..f6ca7cbe6 100644
--- a/DiscImageChef.Core/DiscImageChef.Core.csproj
+++ b/DiscImageChef.Core/DiscImageChef.Core.csproj
@@ -80,7 +80,6 @@
     <Compile Include="Devices\Report\ATAPI.cs" />
     <Compile Include="Devices\Report\FireWire.cs" />
     <Compile Include="Devices\Report\USB.cs" />
-    <Compile Include="Devices\Report\NVMe.cs" />
     <Compile Include="Devices\Report\SecureDigital.cs" />
     <Compile Include="Devices\Report\SCSI\MMC.cs" />
     <Compile Include="Devices\Report\SCSI\SSC.cs" />
diff --git a/DiscImageChef/Commands/DeviceReport.cs b/DiscImageChef/Commands/DeviceReport.cs
index d30f51890..0c4e10f28 100644
--- a/DiscImageChef/Commands/DeviceReport.cs
+++ b/DiscImageChef/Commands/DeviceReport.cs
@@ -145,7 +145,7 @@ namespace DiscImageChef.Commands
                     SecureDigital.Report(dev, ref report);
                     break;
                 case DeviceType.NVMe:
-                    Nvme.Report(dev, ref report, options.Debug, ref removable);
+                    throw new NotImplementedException("NVMe devices not yet supported.");
                     break;
                 case DeviceType.ATAPI:
                 case DeviceType.SCSI: