diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 000000000..8ab214d41
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,23 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceRoot}\\build\\bin\\Debug\\netcoreapp1.1\\build.dll",
+            "args": [],
+            "cwd": "${workspaceRoot}\\build",
+            "console": "internalConsole",
+            "stopAtEntry": false,
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs b/src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs
index 858a1ca4b..f6242aa43 100644
--- a/src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs
+++ b/src/ImageSharp/Formats/Tiff/Constants/TiffConstants.cs
@@ -5,8 +5,6 @@
 
 namespace ImageSharp.Formats
 {
-    using System.Text;
-
     /// <summary>
     /// Defines constants defined in the TIFF specification.
     /// </summary>
diff --git a/src/ImageSharp/Formats/Tiff/TiffDecoder.cs b/src/ImageSharp/Formats/Tiff/TiffDecoder.cs
index 4b99c1cb6..794fb4f1f 100644
--- a/src/ImageSharp/Formats/Tiff/TiffDecoder.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffDecoder.cs
@@ -5,7 +5,6 @@
 
 namespace ImageSharp.Formats
 {
-    using System;
     using System.IO;
 
     /// <summary>
diff --git a/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs b/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
index 1c2703ed5..08d42b973 100644
--- a/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
@@ -7,9 +7,7 @@ namespace ImageSharp.Formats
 {
     using System;
     using System.IO;
-    using System.Runtime.CompilerServices;
     using System.Text;
-    using System.Threading.Tasks;
 
     /// <summary>
     /// Performs the tiff decoding operation.
diff --git a/src/ImageSharp/Formats/Tiff/TiffEncoderOptions.cs b/src/ImageSharp/Formats/Tiff/TiffEncoderOptions.cs
index ed72bbb92..3a9ae8aa2 100644
--- a/src/ImageSharp/Formats/Tiff/TiffEncoderOptions.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffEncoderOptions.cs
@@ -6,7 +6,7 @@
 namespace ImageSharp.Formats
 {
     /// <summary>
-    /// Encapsulates the options for the <see cref="JTiffEncoder"/>.
+    /// Encapsulates the options for the <see cref="TiffEncoder"/>.
     /// </summary>
     public sealed class TiffEncoderOptions : EncoderOptions, ITiffEncoderOptions
     {
diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs b/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs
index 470b49e9f..11c999a0f 100644
--- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs
+++ b/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs
@@ -6,7 +6,6 @@
 namespace ImageSharp.Tests
 {
     using System.IO;
-    using System.Linq;
     using Xunit;
 
     using ImageSharp.Formats;
diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderIfdTests.cs b/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderIfdTests.cs
index 606e024a1..d5400279f 100644
--- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderIfdTests.cs
+++ b/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffDecoderIfdTests.cs
@@ -6,7 +6,6 @@
 namespace ImageSharp.Tests
 {
     using System.IO;
-    using System.Linq;
     using Xunit;
 
     using ImageSharp.Formats;
diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/ByteArrayUtility.cs b/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/ByteArrayUtility.cs
index 8021f5330..0a3c9fc34 100644
--- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/ByteArrayUtility.cs
+++ b/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/ByteArrayUtility.cs
@@ -6,7 +6,6 @@
 namespace ImageSharp.Tests
 {
     using System;
-    using System.Collections.Generic;
 
     public static class ByteArrayUtility
     {
diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/ITiffGenDataSource.cs b/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/ITiffGenDataSource.cs
index 1c8a485b9..75025f3e7 100644
--- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/ITiffGenDataSource.cs
+++ b/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/ITiffGenDataSource.cs
@@ -5,7 +5,6 @@
 
 namespace ImageSharp.Tests
 {
-    using System;
     using System.Collections.Generic;
 
     /// <summary>
diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataBlock.cs b/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataBlock.cs
index 6a91dbbcc..0b412f7fe 100644
--- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataBlock.cs
+++ b/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataBlock.cs
@@ -5,7 +5,6 @@
 
 namespace ImageSharp.Tests
 {
-    using System;
     using System.Collections.Generic;
 
     /// <summary>
diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataReference.cs b/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataReference.cs
index 90cacb23d..24d03bece 100644
--- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataReference.cs
+++ b/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenDataReference.cs
@@ -5,9 +5,6 @@
 
 namespace ImageSharp.Tests
 {
-    using System;
-    using System.Collections.Generic;
-
     /// <summary>
     /// A utility data structure to represent a reference from one block of data to another in a Tiff file.
     /// </summary>
diff --git a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenHeader.cs b/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenHeader.cs
index b28ceedc2..946faedf9 100644
--- a/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenHeader.cs
+++ b/tests/ImageSharp.Formats.Tiff.Tests/TestUtilities/Tiff/TiffGenHeader.cs
@@ -5,7 +5,6 @@
 
 namespace ImageSharp.Tests
 {
-    using System;
     using System.Collections.Generic;
     using System.Linq;
 
@@ -37,11 +36,11 @@ namespace ImageSharp.Tests
             {
                 var firstIfdData = FirstIfd.GetData(isLittleEndian);
                 firstIfdData.First().AddReference(headerData.Bytes, 4);
-                return new [] { headerData }.Concat(firstIfdData);
+                return new[] { headerData }.Concat(firstIfdData);
             }
             else
             {
-                return new [] { headerData };
+                return new[] { headerData };
             }
         }
     }