diff --git a/src/CqlHelper.cs b/src/CqlHelper.cs
index 4029170..60fbf74 100644
--- a/src/CqlHelper.cs
+++ b/src/CqlHelper.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-
+
 namespace FluentCassandra
 {
     public static class CqlHelper
diff --git a/src/FluentColumn.cs b/src/FluentColumn.cs
index dbf027b..5872931 100644
--- a/src/FluentColumn.cs
+++ b/src/FluentColumn.cs
@@ -1,5 +1,5 @@
-using System;
-using FluentCassandra.Types;
+using FluentCassandra.Types;
+using System;
 
 namespace FluentCassandra
 {
diff --git a/src/FluentColumnFamily.cs b/src/FluentColumnFamily.cs
index dc1f694..4717e4a 100644
--- a/src/FluentColumnFamily.cs
+++ b/src/FluentColumnFamily.cs
@@ -1,7 +1,7 @@
-using System;
+using FluentCassandra.Types;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using FluentCassandra.Types;
 
 namespace FluentCassandra
 {
diff --git a/src/FluentColumnList`1.cs b/src/FluentColumnList`1.cs
index d5691c3..8aa61d2 100644
--- a/src/FluentColumnList`1.cs
+++ b/src/FluentColumnList`1.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
 
 namespace FluentCassandra
 {
diff --git a/src/FluentColumnParent.cs b/src/FluentColumnParent.cs
index 73cc199..355a3a4 100644
--- a/src/FluentColumnParent.cs
+++ b/src/FluentColumnParent.cs
@@ -1,5 +1,4 @@
-using System;
-
+
 namespace FluentCassandra
 {
 	public class FluentColumnParent
diff --git a/src/FluentColumnPath.cs b/src/FluentColumnPath.cs
index dba2cde..1e6e04b 100644
--- a/src/FluentColumnPath.cs
+++ b/src/FluentColumnPath.cs
@@ -1,5 +1,4 @@
-using System;
-
+
 namespace FluentCassandra
 {
 	public class FluentColumnPath : FluentColumnParent
diff --git a/src/FluentCounterColumn.cs b/src/FluentCounterColumn.cs
index 6ae8d72..ec33c8e 100644
--- a/src/FluentCounterColumn.cs
+++ b/src/FluentCounterColumn.cs
@@ -1,4 +1,3 @@
-using System;
 using FluentCassandra.Types;
 
 namespace FluentCassandra
diff --git a/src/FluentCqlRow.cs b/src/FluentCqlRow.cs
index 7fb3c46..2072a58 100644
--- a/src/FluentCqlRow.cs
+++ b/src/FluentCqlRow.cs
@@ -1,9 +1,8 @@
-using System;
+using FluentCassandra.Linq;
+using FluentCassandra.Types;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using FluentCassandra.Linq;
-using FluentCassandra.Types;
 
 namespace FluentCassandra
 {
diff --git a/src/FluentMutationTracker.cs b/src/FluentMutationTracker.cs
index ec9e4b0..a919390 100644
--- a/src/FluentMutationTracker.cs
+++ b/src/FluentMutationTracker.cs
@@ -1,6 +1,5 @@
-using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Collections.Generic;
 
 namespace FluentCassandra
 {
diff --git a/src/FluentRecord.cs b/src/FluentRecord.cs
index 3906f3c..a2045f8 100644
--- a/src/FluentRecord.cs
+++ b/src/FluentRecord.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Dynamic;
 using System.Linq;
diff --git a/src/FluentSuperColumn.cs b/src/FluentSuperColumn.cs
index 462061c..8dde451 100644
--- a/src/FluentSuperColumn.cs
+++ b/src/FluentSuperColumn.cs
@@ -1,7 +1,7 @@
-using System;
+using FluentCassandra.Types;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using FluentCassandra.Types;
 
 namespace FluentCassandra
 {
diff --git a/src/FluentSuperColumnFamily.cs b/src/FluentSuperColumnFamily.cs
index c69f92a..cb6e70e 100644
--- a/src/FluentSuperColumnFamily.cs
+++ b/src/FluentSuperColumnFamily.cs
@@ -1,7 +1,7 @@
-using System;
+using FluentCassandra.Types;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using FluentCassandra.Types;
 
 namespace FluentCassandra
 {
diff --git a/src/GuidGeneration.cs b/src/GuidGeneration.cs
index c66409c..95cb0ee 100644
--- a/src/GuidGeneration.cs
+++ b/src/GuidGeneration.cs
@@ -1,4 +1,3 @@
-using System;
 
 namespace FluentCassandra
 {
diff --git a/src/GuidVersion.cs b/src/GuidVersion.cs
index c406ab8..5a73b0b 100644
--- a/src/GuidVersion.cs
+++ b/src/GuidVersion.cs
@@ -1,4 +1,3 @@
-using System;
 
 namespace FluentCassandra
 {
diff --git a/src/IFluentBaseColumn.cs b/src/IFluentBaseColumn.cs
index 0dae2b1..f4df0de 100644
--- a/src/IFluentBaseColumn.cs
+++ b/src/IFluentBaseColumn.cs
@@ -1,5 +1,4 @@
-using System;
-using FluentCassandra.Types;
+using FluentCassandra.Types;
 
 namespace FluentCassandra
 {
diff --git a/src/IFluentBaseColumnFamily.cs b/src/IFluentBaseColumnFamily.cs
index 51cabc3..65610f4 100644
--- a/src/IFluentBaseColumnFamily.cs
+++ b/src/IFluentBaseColumnFamily.cs
@@ -1,5 +1,4 @@
-using System;
-using FluentCassandra.Types;
+using FluentCassandra.Types;
 
 namespace FluentCassandra
 {
diff --git a/src/IFluentMutationTracker.cs b/src/IFluentMutationTracker.cs
index 842edb5..e0a4c0a 100644
--- a/src/IFluentMutationTracker.cs
+++ b/src/IFluentMutationTracker.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace FluentCassandra
 {
diff --git a/src/IFluentRecord.cs b/src/IFluentRecord.cs
index 69f19e8..04d3334 100644
--- a/src/IFluentRecord.cs
+++ b/src/IFluentRecord.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Dynamic;
 
diff --git a/src/IFluentRecordExpression.cs b/src/IFluentRecordExpression.cs
index 7775f25..4131d9f 100644
--- a/src/IFluentRecordExpression.cs
+++ b/src/IFluentRecordExpression.cs
@@ -1,6 +1,5 @@
-using System;
-using System.Dynamic;
 using FluentCassandra.Types;
+using System.Dynamic;
 
 namespace FluentCassandra
 {
diff --git a/src/ILoadable.cs b/src/ILoadable.cs
index b61c22b..366f9a9 100644
--- a/src/ILoadable.cs
+++ b/src/ILoadable.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
+
 namespace FluentCassandra
 {
 	public interface ILoadable
diff --git a/src/MutationType.cs b/src/MutationType.cs
index fb6fef3..87328d5 100644
--- a/src/MutationType.cs
+++ b/src/MutationType.cs
@@ -1,5 +1,4 @@
-using System;
-
+
 namespace FluentCassandra
 {
 	public enum MutationType
diff --git a/src/TimestampHelper.cs b/src/TimestampHelper.cs
index b40fc41..ed2555a 100644
--- a/src/TimestampHelper.cs
+++ b/src/TimestampHelper.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 
 namespace FluentCassandra
 {