diff --git a/samples/LinqyCalculator/Program.cs b/samples/LinqyCalculator/Program.cs
index af6f289..32aade2 100644
--- a/samples/LinqyCalculator/Program.cs
+++ b/samples/LinqyCalculator/Program.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Sprache;
 
 namespace LinqyCalculator
diff --git a/samples/XmlExample/Program.cs b/samples/XmlExample/Program.cs
index c8e949e..4d2916a 100644
--- a/samples/XmlExample/Program.cs
+++ b/samples/XmlExample/Program.cs
@@ -4,7 +4,6 @@
 using System.Text;
 using Sprache;
 using System.IO;
-using System.Xml;
 
 namespace XmlExample
 {
diff --git a/src/Sprache/CommentParser.cs b/src/Sprache/CommentParser.cs
index 72bb8d3..2c003b3 100644
--- a/src/Sprache/CommentParser.cs
+++ b/src/Sprache/CommentParser.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Sprache
+namespace Sprache
 {
     /// <summary>
     /// Constructs customizable comment parsers.
diff --git a/src/Sprache/IComment.cs b/src/Sprache/IComment.cs
index f2491c1..039cb47 100644
--- a/src/Sprache/IComment.cs
+++ b/src/Sprache/IComment.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Sprache
+namespace Sprache
 {
     /// <summary>
     /// Represents a customizable comment parser.
diff --git a/src/Sprache/IInput.cs b/src/Sprache/IInput.cs
index ce57d5e..b6c77c5 100644
--- a/src/Sprache/IInput.cs
+++ b/src/Sprache/IInput.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Sprache
 {
diff --git a/src/Sprache/Properties/AssemblyInfo.cs b/src/Sprache/Properties/AssemblyInfo.cs
index d7148c6..22470eb 100644
--- a/src/Sprache/Properties/AssemblyInfo.cs
+++ b/src/Sprache/Properties/AssemblyInfo.cs
@@ -1,4 +1,3 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Sprache.Tests")]
diff --git a/src/Sprache/StringExtensions.cs b/src/Sprache/StringExtensions.cs
index 07fe214..7e081eb 100644
--- a/src/Sprache/StringExtensions.cs
+++ b/src/Sprache/StringExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 
 namespace Sprache
 {
diff --git a/test/Sprache.Tests/AssertInput.cs b/test/Sprache.Tests/AssertInput.cs
index d5debd5..5ae4285 100644
--- a/test/Sprache.Tests/AssertInput.cs
+++ b/test/Sprache.Tests/AssertInput.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+
 namespace Sprache.Tests
 {
     static class AssertInput
diff --git a/test/Sprache.Tests/AssertParser.cs b/test/Sprache.Tests/AssertParser.cs
index 0fc153d..4357dd8 100644
--- a/test/Sprache.Tests/AssertParser.cs
+++ b/test/Sprache.Tests/AssertParser.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Sprache;
 using Xunit;
 
 namespace Sprache.Tests
diff --git a/test/Sprache.Tests/DecimalTests.cs b/test/Sprache.Tests/DecimalTests.cs
index 3df05f4..2b30ba6 100644
--- a/test/Sprache.Tests/DecimalTests.cs
+++ b/test/Sprache.Tests/DecimalTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using System.Threading;
 using Xunit;
 
 namespace Sprache.Tests
diff --git a/test/Sprache.Tests/InputTests.cs b/test/Sprache.Tests/InputTests.cs
index a256adb..43eb9da 100644
--- a/test/Sprache.Tests/InputTests.cs
+++ b/test/Sprache.Tests/InputTests.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Xunit;
 
 namespace Sprache.Tests
diff --git a/test/Sprache.Tests/OptionTests.cs b/test/Sprache.Tests/OptionTests.cs
index d8634ed..e52fcc5 100644
--- a/test/Sprache.Tests/OptionTests.cs
+++ b/test/Sprache.Tests/OptionTests.cs
@@ -1,4 +1,3 @@
-using Sprache;
 using Xunit;
 
 namespace Sprache.Tests
diff --git a/test/Sprache.Tests/ParseTests.cs b/test/Sprache.Tests/ParseTests.cs
index 4ee7931..01108a1 100644
--- a/test/Sprache.Tests/ParseTests.cs
+++ b/test/Sprache.Tests/ParseTests.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
diff --git a/test/Sprache.Tests/PosAwareStr.cs b/test/Sprache.Tests/PosAwareStr.cs
index c32d062..c22c76b 100644
--- a/test/Sprache.Tests/PosAwareStr.cs
+++ b/test/Sprache.Tests/PosAwareStr.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Sprache.Tests
+namespace Sprache.Tests
 {
     class PosAwareStr : IPositionAware<PosAwareStr>
     {
diff --git a/test/Sprache.Tests/ResultTests.cs b/test/Sprache.Tests/ResultTests.cs
index 772607c..9c30e36 100644
--- a/test/Sprache.Tests/ResultTests.cs
+++ b/test/Sprache.Tests/ResultTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using Xunit;
 
 namespace Sprache.Tests
diff --git a/test/Sprache.Tests/Scenarios/AmqpErrorTests.cs b/test/Sprache.Tests/Scenarios/AmqpErrorTests.cs
index a3204fb..83e3f7b 100644
--- a/test/Sprache.Tests/Scenarios/AmqpErrorTests.cs
+++ b/test/Sprache.Tests/Scenarios/AmqpErrorTests.cs
@@ -1,6 +1,5 @@
 // ReSharper disable InconsistentNaming
 
-using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/test/Sprache.Tests/Scenarios/StarDateTest.cs b/test/Sprache.Tests/Scenarios/StarDateTest.cs
index 6d613b0..40c1433 100644
--- a/test/Sprache.Tests/Scenarios/StarDateTest.cs
+++ b/test/Sprache.Tests/Scenarios/StarDateTest.cs
@@ -1,8 +1,5 @@
 using Xunit;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Sprache.Tests.Scenarios
 {