diff --git a/BizHawk.Emulation.DiscSystem/CDFS/EndianBitConverter.cs b/BizHawk.Emulation.DiscSystem/CDFS/EndianBitConverter.cs
index f7cd0b47eb..b8413f01e5 100644
--- a/BizHawk.Emulation.DiscSystem/CDFS/EndianBitConverter.cs
+++ b/BizHawk.Emulation.DiscSystem/CDFS/EndianBitConverter.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace BizHawk.Emulation.DiscSystem
 {
diff --git a/BizHawk.Emulation.DiscSystem/CDFS/ISODirectoryNode.cs b/BizHawk.Emulation.DiscSystem/CDFS/ISODirectoryNode.cs
index 78728d90d3..e2bbfb000c 100644
--- a/BizHawk.Emulation.DiscSystem/CDFS/ISODirectoryNode.cs
+++ b/BizHawk.Emulation.DiscSystem/CDFS/ISODirectoryNode.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.IO;
 
 namespace BizHawk.Emulation.DiscSystem
diff --git a/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs b/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs
index ed37f11971..5df477e115 100644
--- a/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs
+++ b/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
diff --git a/BizHawk.Emulation.DiscSystem/CDFS/ISOFileNode.cs b/BizHawk.Emulation.DiscSystem/CDFS/ISOFileNode.cs
index 53dbeabfa3..f4cbdcb4cf 100644
--- a/BizHawk.Emulation.DiscSystem/CDFS/ISOFileNode.cs
+++ b/BizHawk.Emulation.DiscSystem/CDFS/ISOFileNode.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace BizHawk.Emulation.DiscSystem
+namespace BizHawk.Emulation.DiscSystem
 {
 	/// <summary>
 	/// Representation of a file in the file system.
diff --git a/BizHawk.Emulation.DiscSystem/CDFS/ISONode.cs b/BizHawk.Emulation.DiscSystem/CDFS/ISONode.cs
index c9784a3f23..039a278306 100644
--- a/BizHawk.Emulation.DiscSystem/CDFS/ISONode.cs
+++ b/BizHawk.Emulation.DiscSystem/CDFS/ISONode.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace BizHawk.Emulation.DiscSystem
+namespace BizHawk.Emulation.DiscSystem
 {
 	/// <summary>
 	/// Abstract class to represent a file/directory node 
diff --git a/BizHawk.Emulation.DiscSystem/CDFS/ISONodeRecord.cs b/BizHawk.Emulation.DiscSystem/CDFS/ISONodeRecord.cs
index adb6d96be8..fb56a5070a 100644
--- a/BizHawk.Emulation.DiscSystem/CDFS/ISONodeRecord.cs
+++ b/BizHawk.Emulation.DiscSystem/CDFS/ISONodeRecord.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Text;
 using System.IO;
 
 namespace BizHawk.Emulation.DiscSystem
diff --git a/BizHawk.Emulation.DiscSystem/Disc.cs b/BizHawk.Emulation.DiscSystem/Disc.cs
index 6aef0c30e4..5fb8e3b983 100644
--- a/BizHawk.Emulation.DiscSystem/Disc.cs
+++ b/BizHawk.Emulation.DiscSystem/Disc.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Linq;
-using System.Text;
-using System.IO;
 using System.Collections.Generic;
 
 //ARCHITECTURE NOTE:
diff --git a/BizHawk.Emulation.DiscSystem/DiscExceptions.cs b/BizHawk.Emulation.DiscSystem/DiscExceptions.cs
index f3583bccf3..c5f24da8d9 100644
--- a/BizHawk.Emulation.DiscSystem/DiscExceptions.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscExceptions.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-
-using BizHawk.Common.BufferExtensions;
 
 //some old junk
 
diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/Blobs/Blob_RawFile.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/Blobs/Blob_RawFile.cs
index 08b53db2c7..ed8aa3486c 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/Blobs/Blob_RawFile.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/Blobs/Blob_RawFile.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using System.IO;
+using System.IO;
 
 namespace BizHawk.Emulation.DiscSystem
 {
diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/Blobs/Blob_ZeroPadAdapter.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/Blobs/Blob_ZeroPadAdapter.cs
index f99c56c1c8..6f1d9d63f5 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/Blobs/Blob_ZeroPadAdapter.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/Blobs/Blob_ZeroPadAdapter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 
 //I have an ff9 disc which is truncated
 
diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/CCD_format.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/CCD_format.cs
index dabfdc5490..15f50476c6 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/CCD_format.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/CCD_format.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Text;
 using System.IO;
 using System.Globalization;
 using System.Collections.Generic;
diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Compile.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Compile.cs
index 1eae6cfaf0..f65e958261 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Compile.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Compile.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Linq;
-using System.Text;
 using System.IO;
 using System.Collections.Generic;
 
diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Context.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Context.cs
index 4a6529c5be..bd6b484a63 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Context.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Context.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Linq;
-using System.Text;
-using System.IO;
-using System.Collections.Generic;
+
 
 //http://digitalx.org/cue-sheet/index.html "all cue sheet information is a straight 1:1 copy from the cdrwin helpfile"
 
diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_File.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_File.cs
index 442c501208..5f3e1eb0f3 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_File.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_File.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace BizHawk.Emulation.DiscSystem.CUE
diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs
index f9e345dee7..3a136e1713 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs
@@ -18,8 +18,6 @@
 //POSTGAP commands are special : TBD
 
 using System;
-using System.Linq;
-using System.Text;
 using System.IO;
 using System.Collections.Generic;
 
diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Parse.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Parse.cs
index e5121bac77..648d99718f 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Parse.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Parse.cs
@@ -1,11 +1,7 @@
 //TODO - object initialization syntax cleanup
 
-using System;
-using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.IO;
-using System.Collections.Generic;
 
 //http://digitalx.org/cue-sheet/index.html "all cue sheet information is a straight 1:1 copy from the cdrwin helpfile"
 //http://www.gnu.org/software/libcdio/libcdio.html#Sectors
diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Synths.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Synths.cs
index 9eeabac3a2..a32e1c6900 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Synths.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Synths.cs
@@ -1,6 +1,4 @@
 using System;
-using System.IO;
-using System.Collections.Generic;
 
 namespace BizHawk.Emulation.DiscSystem.CUE
 {
diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CueFileResolver.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CueFileResolver.cs
index 525fd3d244..583a5b95f6 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CueFileResolver.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CueFileResolver.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Linq;
-using System.Text;
 using System.IO;
 using System.Collections.Generic;
 
diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/M3U_file.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/M3U_file.cs
index d3ab3ca119..7a321c407a 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/M3U_file.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/M3U_file.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Text;
-using System.IO;
-using System.Globalization;
+using System.IO;
 using System.Collections.Generic;
 
 namespace BizHawk.Emulation.DiscSystem
diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/MDS_Format.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/MDS_Format.cs
index 856297fd0a..ee48fe9c52 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/MDS_Format.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/MDS_Format.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Text;
 using System.IO;
-using System.Globalization;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
 
 namespace BizHawk.Emulation.DiscSystem
 {
diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/SBI_format.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/SBI_format.cs
index 20bc945f25..45ed1831af 100644
--- a/BizHawk.Emulation.DiscSystem/DiscFormats/SBI_format.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscFormats/SBI_format.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Text;
 using System.IO;
 using System.Collections.Generic;
 
diff --git a/BizHawk.Emulation.DiscSystem/DiscJob.cs b/BizHawk.Emulation.DiscSystem/DiscJob.cs
index 2c796d1596..a420dd8c30 100644
--- a/BizHawk.Emulation.DiscSystem/DiscJob.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscJob.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Linq;
-using System.Text;
 using System.IO;
-using System.Collections.Generic;
 
 namespace BizHawk.Emulation.DiscSystem
 {
diff --git a/BizHawk.Emulation.DiscSystem/DiscSectorReader.cs b/BizHawk.Emulation.DiscSystem/DiscSectorReader.cs
index 7c7a30fc52..ca871c0d41 100644
--- a/BizHawk.Emulation.DiscSystem/DiscSectorReader.cs
+++ b/BizHawk.Emulation.DiscSystem/DiscSectorReader.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-
-using BizHawk.Common.BufferExtensions;
 
 namespace BizHawk.Emulation.DiscSystem
 {
diff --git a/BizHawk.Emulation.DiscSystem/Internal/Jobs/LoadSBIJob.cs b/BizHawk.Emulation.DiscSystem/Internal/Jobs/LoadSBIJob.cs
index de674e490d..2413825e10 100644
--- a/BizHawk.Emulation.DiscSystem/Internal/Jobs/LoadSBIJob.cs
+++ b/BizHawk.Emulation.DiscSystem/Internal/Jobs/LoadSBIJob.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Text;
 using System.IO;
 using System.Collections.Generic;
 
diff --git a/BizHawk.Emulation.DiscSystem/Internal/Jobs/Synthesize_A0A1A2_Job.cs b/BizHawk.Emulation.DiscSystem/Internal/Jobs/Synthesize_A0A1A2_Job.cs
index 2be0a6f6c1..c878ee6c30 100644
--- a/BizHawk.Emulation.DiscSystem/Internal/Jobs/Synthesize_A0A1A2_Job.cs
+++ b/BizHawk.Emulation.DiscSystem/Internal/Jobs/Synthesize_A0A1A2_Job.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Linq;
-using System.Text;
-using System.IO;
 using System.Collections.Generic;
 
 //TODO - generate correct Q subchannel CRC
diff --git a/BizHawk.Emulation.DiscSystem/Internal/Jobs/Synthesize_Leadout_Job.cs b/BizHawk.Emulation.DiscSystem/Internal/Jobs/Synthesize_Leadout_Job.cs
index 783f71aa9d..7dc043cff0 100644
--- a/BizHawk.Emulation.DiscSystem/Internal/Jobs/Synthesize_Leadout_Job.cs
+++ b/BizHawk.Emulation.DiscSystem/Internal/Jobs/Synthesize_Leadout_Job.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Linq;
-using System.Text;
-using System.IO;
-using System.Collections.Generic;
+
 
 //TODO - generate correct Q subchannel CRC
 
diff --git a/BizHawk.Emulation.DiscSystem/Internal/SectorSynth.cs b/BizHawk.Emulation.DiscSystem/Internal/SectorSynth.cs
index 07caf7d171..3ee0764023 100644
--- a/BizHawk.Emulation.DiscSystem/Internal/SectorSynth.cs
+++ b/BizHawk.Emulation.DiscSystem/Internal/SectorSynth.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 
 namespace BizHawk.Emulation.DiscSystem
 {
diff --git a/BizHawk.Emulation.DiscSystem/Internal/SynthUtils.cs b/BizHawk.Emulation.DiscSystem/Internal/SynthUtils.cs
index 22891d260f..7cd54fea95 100644
--- a/BizHawk.Emulation.DiscSystem/Internal/SynthUtils.cs
+++ b/BizHawk.Emulation.DiscSystem/Internal/SynthUtils.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-
 namespace BizHawk.Emulation.DiscSystem
 {
 	static class SynthUtils
diff --git a/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs b/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs
index 0d006d4b8c..74acf30784 100644
--- a/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs
+++ b/BizHawk.Emulation.DiscSystem/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following