diff --git a/src/Discord.Net.Audio/Opus/OpusConverter.cs b/src/Discord.Net.Audio/Opus/OpusConverter.cs
index 25bda033..d9333713 100644
--- a/src/Discord.Net.Audio/Opus/OpusConverter.cs
+++ b/src/Discord.Net.Audio/Opus/OpusConverter.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Runtime.InteropServices;
+#if NET45
 using System.Security;
+#endif
 
 namespace Discord.Audio.Opus
 {
diff --git a/src/Discord.Net.Audio/Sodium/SecretBox.cs b/src/Discord.Net.Audio/Sodium/SecretBox.cs
index ac3218bd..f7309331 100644
--- a/src/Discord.Net.Audio/Sodium/SecretBox.cs
+++ b/src/Discord.Net.Audio/Sodium/SecretBox.cs
@@ -1,5 +1,7 @@
 using System.Runtime.InteropServices;
+#if NET45
 using System.Security;
+#endif
 
 namespace Discord.Audio.Sodium
 {
diff --git a/src/Discord.Net/API/Client/Rest/UpdateMember.cs b/src/Discord.Net/API/Client/Rest/UpdateMember.cs
index 0bc5274d..019c4ee9 100644
--- a/src/Discord.Net/API/Client/Rest/UpdateMember.cs
+++ b/src/Discord.Net/API/Client/Rest/UpdateMember.cs
@@ -1,6 +1,5 @@
 using Discord.API.Converters;
 using Newtonsoft.Json;
-using System.Collections.Generic;
 
 namespace Discord.API.Client.Rest
 {
diff --git a/src/Discord.Net/API/Client/Rest/UpdateMessage.cs b/src/Discord.Net/API/Client/Rest/UpdateMessage.cs
index 5b4480a4..df3ca46c 100644
--- a/src/Discord.Net/API/Client/Rest/UpdateMessage.cs
+++ b/src/Discord.Net/API/Client/Rest/UpdateMessage.cs
@@ -1,5 +1,4 @@
-using Discord.API.Converters;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Discord.API.Client.Rest
 {
diff --git a/src/Discord.Net/ETF/ETFReader.cs b/src/Discord.Net/ETF/ETFReader.cs
index e8ef4ca0..d7617c34 100644
--- a/src/Discord.Net/ETF/ETFReader.cs
+++ b/src/Discord.Net/ETF/ETFReader.cs
@@ -1,4 +1,4 @@
-using System;
+/*using System;
 using System.Collections.Concurrent;
 using System.IO;
 using System.Linq;
@@ -8,7 +8,7 @@ namespace Discord.ETF
 {
     public class ETFReader
     {
-        /*
+        
         private readonly Stream _stream;
         private readonly byte[] _buffer;
         private readonly bool _leaveOpen;
@@ -168,6 +168,5 @@ namespace Discord.ETF
         }
 
         public void Write(DateTime value) => Write((ulong)((value.Ticks - _epochTime.Ticks) / TimeSpan.TicksPerSecond));
-*/
     }
-}
\ No newline at end of file
+}*/
\ No newline at end of file
diff --git a/src/Discord.Net/MessageQueue.cs b/src/Discord.Net/MessageQueue.cs
index 40ece5a1..dc3d2732 100644
--- a/src/Discord.Net/MessageQueue.cs
+++ b/src/Discord.Net/MessageQueue.cs
@@ -3,7 +3,6 @@ using Discord.Logging;
 using Discord.Net.Rest;
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/Discord.Net/Models/Color.cs b/src/Discord.Net/Models/Color.cs
index bdadebfd..3555c5d8 100644
--- a/src/Discord.Net/Models/Color.cs
+++ b/src/Discord.Net/Models/Color.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Discord
+namespace Discord
 {
 	public class Color
     {
diff --git a/src/Discord.Net/Models/Message.cs b/src/Discord.Net/Models/Message.cs
index ed2c634e..c589df91 100644
--- a/src/Discord.Net/Models/Message.cs
+++ b/src/Discord.Net/Models/Message.cs
@@ -1,9 +1,6 @@
-using Discord.API.Client.Rest;
-using Discord.Net;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using APIMessage = Discord.API.Client.Message;
diff --git a/src/Discord.Net/Net/HttpException.cs b/src/Discord.Net/Net/HttpException.cs
index 8bfdbf73..306122ba 100644
--- a/src/Discord.Net/Net/HttpException.cs
+++ b/src/Discord.Net/Net/HttpException.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using System.Runtime.Serialization;
 
 namespace Discord.Net
 {
diff --git a/src/Discord.Net/Net/Rest/RestClient.cs b/src/Discord.Net/Net/Rest/RestClient.cs
index cc525779..cb404a2f 100644
--- a/src/Discord.Net/Net/Rest/RestClient.cs
+++ b/src/Discord.Net/Net/Rest/RestClient.cs
@@ -3,7 +3,6 @@ using Discord.ETF;
 using Discord.Logging;
 using System;
 using System.Diagnostics;
-using System.IO;
 using System.Threading;
 using System.Threading.Tasks;