diff --git a/src/MonoTorrent/BEncoding/BEncodedString.cs b/src/MonoTorrent/BEncoding/BEncodedString.cs
index e4e65fb10..80958e5db 100644
--- a/src/MonoTorrent/BEncoding/BEncodedString.cs
+++ b/src/MonoTorrent/BEncoding/BEncodedString.cs
@@ -1,8 +1,5 @@
 using System;
-using System.IO;
-using System.Collections;
 using System.Text;
-using MonoTorrent.Common;
 using MonoTorrent.Messages;
 
 namespace MonoTorrent.BEncoding
diff --git a/src/MonoTorrent/InfoHash.cs b/src/MonoTorrent/InfoHash.cs
index dc9fc44a8..a604c11c9 100644
--- a/src/MonoTorrent/InfoHash.cs
+++ b/src/MonoTorrent/InfoHash.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using MonoTorrent.Common;
-using System.Web;
 
 namespace MonoTorrent
 {
diff --git a/src/MonoTorrent/ToolBox.cs b/src/MonoTorrent/ToolBox.cs
index b4116d716..227977a7b 100644
--- a/src/MonoTorrent/ToolBox.cs
+++ b/src/MonoTorrent/ToolBox.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Collections;
-using System.Text;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace MonoTorrent.Common
+namespace MonoTorrent
 {
 	public delegate long Operation<T>(T target);
 
diff --git a/src/MonoTorrent/Torrent.cs b/src/MonoTorrent/Torrent.cs
index 59a1f3253..cadea0be6 100644
--- a/src/MonoTorrent/Torrent.cs
+++ b/src/MonoTorrent/Torrent.cs
@@ -5,7 +5,6 @@ using System.Net;
 using System.Security.Cryptography;
 using System.Text;
 using MonoTorrent.BEncoding;
-using MonoTorrent.Common;
 
 namespace MonoTorrent
 {