diff --git a/src/app/Fake.Azure.CloudServices/Fake.Azure.CloudServices.fsproj b/src/app/Fake.Azure.CloudServices/Fake.Azure.CloudServices.fsproj
index 2ba7b7f4a8e..e54da511cf3 100644
--- a/src/app/Fake.Azure.CloudServices/Fake.Azure.CloudServices.fsproj
+++ b/src/app/Fake.Azure.CloudServices/Fake.Azure.CloudServices.fsproj
@@ -12,10 +12,7 @@
-
-
-
diff --git a/src/app/Fake.Azure.Emulators/Fake.Azure.Emulators.fsproj b/src/app/Fake.Azure.Emulators/Fake.Azure.Emulators.fsproj
index 39cabeb6303..594e5f8d8fb 100644
--- a/src/app/Fake.Azure.Emulators/Fake.Azure.Emulators.fsproj
+++ b/src/app/Fake.Azure.Emulators/Fake.Azure.Emulators.fsproj
@@ -12,11 +12,8 @@
-
-
-
diff --git a/src/app/Fake.Azure.Kudu/Fake.Azure.Kudu.fsproj b/src/app/Fake.Azure.Kudu/Fake.Azure.Kudu.fsproj
index 3c8bcc23fa4..7603237d264 100644
--- a/src/app/Fake.Azure.Kudu/Fake.Azure.Kudu.fsproj
+++ b/src/app/Fake.Azure.Kudu/Fake.Azure.Kudu.fsproj
@@ -15,10 +15,8 @@
-
-
diff --git a/src/app/Fake.Azure.WebJobs/Fake.Azure.WebJobs.fsproj b/src/app/Fake.Azure.WebJobs/Fake.Azure.WebJobs.fsproj
index 706af3f2f03..7e02b917add 100644
--- a/src/app/Fake.Azure.WebJobs/Fake.Azure.WebJobs.fsproj
+++ b/src/app/Fake.Azure.WebJobs/Fake.Azure.WebJobs.fsproj
@@ -15,7 +15,6 @@
-
diff --git a/src/app/Fake.BuildServer.AppVeyor/Fake.BuildServer.AppVeyor.fsproj b/src/app/Fake.BuildServer.AppVeyor/Fake.BuildServer.AppVeyor.fsproj
index a523291b7e3..d41ceaa8329 100644
--- a/src/app/Fake.BuildServer.AppVeyor/Fake.BuildServer.AppVeyor.fsproj
+++ b/src/app/Fake.BuildServer.AppVeyor/Fake.BuildServer.AppVeyor.fsproj
@@ -16,14 +16,12 @@
-
-
\ No newline at end of file
diff --git a/src/app/Fake.BuildServer.GitLab/Fake.BuildServer.GitLab.fsproj b/src/app/Fake.BuildServer.GitLab/Fake.BuildServer.GitLab.fsproj
index 5fa0ef9d298..1dc7280ab35 100644
--- a/src/app/Fake.BuildServer.GitLab/Fake.BuildServer.GitLab.fsproj
+++ b/src/app/Fake.BuildServer.GitLab/Fake.BuildServer.GitLab.fsproj
@@ -16,14 +16,9 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/Fake.BuildServer.GitLab/GitLab.fs b/src/app/Fake.BuildServer.GitLab/GitLab.fs
index 842ca3038b8..b5d5f3ab2bb 100644
--- a/src/app/Fake.BuildServer.GitLab/GitLab.fs
+++ b/src/app/Fake.BuildServer.GitLab/GitLab.fs
@@ -1,7 +1,6 @@
/// Contains support for various build servers
namespace Fake.BuildServer
-open System
open System.IO
open Fake.Core
open Fake.IO
diff --git a/src/app/Fake.BuildServer.GitLab/GitLabInternal.fs b/src/app/Fake.BuildServer.GitLab/GitLabInternal.fs
index 500edf9aded..71cd12920bd 100644
--- a/src/app/Fake.BuildServer.GitLab/GitLabInternal.fs
+++ b/src/app/Fake.BuildServer.GitLab/GitLabInternal.fs
@@ -1,10 +1,7 @@
/// Contains support for various build servers
namespace Fake.BuildServer
-open System.IO
open Fake.Core
-open Fake.IO
-open Fake.Net
module internal GitLabInternal =
let environVar = Environment.environVar
diff --git a/src/app/Fake.BuildServer.TeamCity/Fake.BuildServer.TeamCity.fsproj b/src/app/Fake.BuildServer.TeamCity/Fake.BuildServer.TeamCity.fsproj
index ef16f33a77e..43c6eed2c38 100644
--- a/src/app/Fake.BuildServer.TeamCity/Fake.BuildServer.TeamCity.fsproj
+++ b/src/app/Fake.BuildServer.TeamCity/Fake.BuildServer.TeamCity.fsproj
@@ -16,9 +16,7 @@
-
-
diff --git a/src/app/Fake.BuildServer.TeamFoundation/Fake.BuildServer.TeamFoundation.fsproj b/src/app/Fake.BuildServer.TeamFoundation/Fake.BuildServer.TeamFoundation.fsproj
index b2ac39c9a50..cc76ce2cfac 100644
--- a/src/app/Fake.BuildServer.TeamFoundation/Fake.BuildServer.TeamFoundation.fsproj
+++ b/src/app/Fake.BuildServer.TeamFoundation/Fake.BuildServer.TeamFoundation.fsproj
@@ -15,14 +15,10 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/app/Fake.BuildServer.Travis/Fake.BuildServer.Travis.fsproj b/src/app/Fake.BuildServer.Travis/Fake.BuildServer.Travis.fsproj
index 58c9e95ca3f..8a5cdfe6904 100644
--- a/src/app/Fake.BuildServer.Travis/Fake.BuildServer.Travis.fsproj
+++ b/src/app/Fake.BuildServer.Travis/Fake.BuildServer.Travis.fsproj
@@ -15,14 +15,9 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/Fake.Core.ReleaseNotes/Fake.Core.ReleaseNotes.fsproj b/src/app/Fake.Core.ReleaseNotes/Fake.Core.ReleaseNotes.fsproj
index 9202c4f8c70..5a47b8f7bd4 100644
--- a/src/app/Fake.Core.ReleaseNotes/Fake.Core.ReleaseNotes.fsproj
+++ b/src/app/Fake.Core.ReleaseNotes/Fake.Core.ReleaseNotes.fsproj
@@ -17,4 +17,4 @@
-
\ No newline at end of file
+
diff --git a/src/app/Fake.Core.SemVer/Fake.Core.SemVer.fsproj b/src/app/Fake.Core.SemVer/Fake.Core.SemVer.fsproj
index f5c0e1fbec3..fc9413332fc 100644
--- a/src/app/Fake.Core.SemVer/Fake.Core.SemVer.fsproj
+++ b/src/app/Fake.Core.SemVer/Fake.Core.SemVer.fsproj
@@ -11,8 +11,5 @@
-
-
-
\ No newline at end of file
diff --git a/src/app/Fake.Core.Target/Fake.Core.Target.fsproj b/src/app/Fake.Core.Target/Fake.Core.Target.fsproj
index 440f126899f..447a365bb69 100644
--- a/src/app/Fake.Core.Target/Fake.Core.Target.fsproj
+++ b/src/app/Fake.Core.Target/Fake.Core.Target.fsproj
@@ -16,6 +16,7 @@
+
diff --git a/src/app/Fake.Core.Tasks/Fake.Core.Tasks.fsproj b/src/app/Fake.Core.Tasks/Fake.Core.Tasks.fsproj
index 56fd5421da6..0ce4301da81 100644
--- a/src/app/Fake.Core.Tasks/Fake.Core.Tasks.fsproj
+++ b/src/app/Fake.Core.Tasks/Fake.Core.Tasks.fsproj
@@ -16,12 +16,7 @@
-
-
-
-
-
diff --git a/src/app/Fake.Core.Trace/Fake.Core.Trace.fsproj b/src/app/Fake.Core.Trace/Fake.Core.Trace.fsproj
index cbc546c3355..41c91df0914 100644
--- a/src/app/Fake.Core.Trace/Fake.Core.Trace.fsproj
+++ b/src/app/Fake.Core.Trace/Fake.Core.Trace.fsproj
@@ -17,7 +17,6 @@
-
diff --git a/src/app/Fake.Core.Xml/Fake.Core.Xml.fsproj b/src/app/Fake.Core.Xml/Fake.Core.Xml.fsproj
index 17ca825988a..5e945e09952 100644
--- a/src/app/Fake.Core.Xml/Fake.Core.Xml.fsproj
+++ b/src/app/Fake.Core.Xml/Fake.Core.Xml.fsproj
@@ -16,12 +16,7 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/Fake.DotNet.Cli/Fake.DotNet.Cli.fsproj b/src/app/Fake.DotNet.Cli/Fake.DotNet.Cli.fsproj
index bab1ac0d6c3..071b47a4a79 100644
--- a/src/app/Fake.DotNet.Cli/Fake.DotNet.Cli.fsproj
+++ b/src/app/Fake.DotNet.Cli/Fake.DotNet.Cli.fsproj
@@ -21,7 +21,6 @@
-
\ No newline at end of file
diff --git a/src/app/Fake.DotNet.FSFormatting/Fake.DotNet.FSFormatting.fsproj b/src/app/Fake.DotNet.FSFormatting/Fake.DotNet.FSFormatting.fsproj
index 460aba5c522..d859b2524b9 100644
--- a/src/app/Fake.DotNet.FSFormatting/Fake.DotNet.FSFormatting.fsproj
+++ b/src/app/Fake.DotNet.FSFormatting/Fake.DotNet.FSFormatting.fsproj
@@ -16,12 +16,8 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/app/Fake.DotNet.Fsc/Fake.DotNet.Fsc.fsproj b/src/app/Fake.DotNet.Fsc/Fake.DotNet.Fsc.fsproj
index bd8cb72c520..19895d32f98 100644
--- a/src/app/Fake.DotNet.Fsc/Fake.DotNet.Fsc.fsproj
+++ b/src/app/Fake.DotNet.Fsc/Fake.DotNet.Fsc.fsproj
@@ -18,7 +18,6 @@
-
diff --git a/src/app/Fake.DotNet.MSBuild/Fake.DotNet.MSBuild.fsproj b/src/app/Fake.DotNet.MSBuild/Fake.DotNet.MSBuild.fsproj
index 332b65b82c4..3161ebcdf26 100644
--- a/src/app/Fake.DotNet.MSBuild/Fake.DotNet.MSBuild.fsproj
+++ b/src/app/Fake.DotNet.MSBuild/Fake.DotNet.MSBuild.fsproj
@@ -17,7 +17,6 @@
-
diff --git a/src/app/Fake.DotNet.Mage/Fake.DotNet.Mage.fsproj b/src/app/Fake.DotNet.Mage/Fake.DotNet.Mage.fsproj
index 8d07c203ee3..578964c8127 100644
--- a/src/app/Fake.DotNet.Mage/Fake.DotNet.Mage.fsproj
+++ b/src/app/Fake.DotNet.Mage/Fake.DotNet.Mage.fsproj
@@ -8,8 +8,6 @@
$(DefineConstants);RELEASE
-
-
diff --git a/src/app/Fake.DotNet.NuGet/Fake.DotNet.NuGet.fsproj b/src/app/Fake.DotNet.NuGet/Fake.DotNet.NuGet.fsproj
index 4152c4e657b..db42d9d7ba5 100644
--- a/src/app/Fake.DotNet.NuGet/Fake.DotNet.NuGet.fsproj
+++ b/src/app/Fake.DotNet.NuGet/Fake.DotNet.NuGet.fsproj
@@ -28,7 +28,6 @@
-
diff --git a/src/app/Fake.DotNet.Paket/Fake.DotNet.Paket.fsproj b/src/app/Fake.DotNet.Paket/Fake.DotNet.Paket.fsproj
index 8e1df156bc2..9c68d44efd2 100644
--- a/src/app/Fake.DotNet.Paket/Fake.DotNet.Paket.fsproj
+++ b/src/app/Fake.DotNet.Paket/Fake.DotNet.Paket.fsproj
@@ -17,12 +17,10 @@
-
-
\ No newline at end of file
diff --git a/src/app/Fake.DotNet.Testing.Expecto/Fake.DotNet.Testing.Expecto.fsproj b/src/app/Fake.DotNet.Testing.Expecto/Fake.DotNet.Testing.Expecto.fsproj
index 32cb20a65a9..587dccd44a5 100644
--- a/src/app/Fake.DotNet.Testing.Expecto/Fake.DotNet.Testing.Expecto.fsproj
+++ b/src/app/Fake.DotNet.Testing.Expecto/Fake.DotNet.Testing.Expecto.fsproj
@@ -16,13 +16,11 @@
-
-
\ No newline at end of file
diff --git a/src/app/Fake.DotNet.Testing.MSTest/Fake.DotNet.Testing.MSTest.fsproj b/src/app/Fake.DotNet.Testing.MSTest/Fake.DotNet.Testing.MSTest.fsproj
index a1e6efafa86..dd276985180 100644
--- a/src/app/Fake.DotNet.Testing.MSTest/Fake.DotNet.Testing.MSTest.fsproj
+++ b/src/app/Fake.DotNet.Testing.MSTest/Fake.DotNet.Testing.MSTest.fsproj
@@ -20,9 +20,7 @@
-
-
\ No newline at end of file
diff --git a/src/app/Fake.DotNet.Testing.MSpec/Fake.DotNet.Testing.MSpec.fsproj b/src/app/Fake.DotNet.Testing.MSpec/Fake.DotNet.Testing.MSpec.fsproj
index 0aacf772b96..30ee1ac4f23 100644
--- a/src/app/Fake.DotNet.Testing.MSpec/Fake.DotNet.Testing.MSpec.fsproj
+++ b/src/app/Fake.DotNet.Testing.MSpec/Fake.DotNet.Testing.MSpec.fsproj
@@ -22,7 +22,6 @@
-
\ No newline at end of file
diff --git a/src/app/Fake.DotNet.Testing.NUnit/Fake.DotNet.Testing.NUnit.fsproj b/src/app/Fake.DotNet.Testing.NUnit/Fake.DotNet.Testing.NUnit.fsproj
index 5ca22a39295..8bbe82eb936 100644
--- a/src/app/Fake.DotNet.Testing.NUnit/Fake.DotNet.Testing.NUnit.fsproj
+++ b/src/app/Fake.DotNet.Testing.NUnit/Fake.DotNet.Testing.NUnit.fsproj
@@ -26,7 +26,6 @@
-
\ No newline at end of file
diff --git a/src/app/Fake.DotNet.Testing.OpenCover/Fake.DotNet.Testing.OpenCover.fsproj b/src/app/Fake.DotNet.Testing.OpenCover/Fake.DotNet.Testing.OpenCover.fsproj
index 67f8567f0ad..0019ef9a16c 100644
--- a/src/app/Fake.DotNet.Testing.OpenCover/Fake.DotNet.Testing.OpenCover.fsproj
+++ b/src/app/Fake.DotNet.Testing.OpenCover/Fake.DotNet.Testing.OpenCover.fsproj
@@ -19,7 +19,6 @@
-
diff --git a/src/app/Fake.DotNet.Testing.SpecFlow/Fake.DotNet.Testing.SpecFlow.fsproj b/src/app/Fake.DotNet.Testing.SpecFlow/Fake.DotNet.Testing.SpecFlow.fsproj
index 13b762dd8c0..bd2c66e3979 100644
--- a/src/app/Fake.DotNet.Testing.SpecFlow/Fake.DotNet.Testing.SpecFlow.fsproj
+++ b/src/app/Fake.DotNet.Testing.SpecFlow/Fake.DotNet.Testing.SpecFlow.fsproj
@@ -18,7 +18,6 @@
-
diff --git a/src/app/Fake.DotNet.Testing.XUnit2/Fake.DotNet.Testing.XUnit2.fsproj b/src/app/Fake.DotNet.Testing.XUnit2/Fake.DotNet.Testing.XUnit2.fsproj
index 4fb1b20c91b..d3768caf42e 100644
--- a/src/app/Fake.DotNet.Testing.XUnit2/Fake.DotNet.Testing.XUnit2.fsproj
+++ b/src/app/Fake.DotNet.Testing.XUnit2/Fake.DotNet.Testing.XUnit2.fsproj
@@ -16,13 +16,11 @@
-
-
\ No newline at end of file
diff --git a/src/app/Fake.Installer.InnoSetup/Fake.Installer.InnoSetup.fsproj b/src/app/Fake.Installer.InnoSetup/Fake.Installer.InnoSetup.fsproj
index 7edafd69b66..0306e81d8a0 100644
--- a/src/app/Fake.Installer.InnoSetup/Fake.Installer.InnoSetup.fsproj
+++ b/src/app/Fake.Installer.InnoSetup/Fake.Installer.InnoSetup.fsproj
@@ -14,7 +14,6 @@
-
diff --git a/src/app/Fake.JavaScript.Yarn/Fake.JavaScript.Yarn.fsproj b/src/app/Fake.JavaScript.Yarn/Fake.JavaScript.Yarn.fsproj
index 4aa9a0dd30b..c932a79833d 100644
--- a/src/app/Fake.JavaScript.Yarn/Fake.JavaScript.Yarn.fsproj
+++ b/src/app/Fake.JavaScript.Yarn/Fake.JavaScript.Yarn.fsproj
@@ -11,7 +11,6 @@
-
\ No newline at end of file
diff --git a/src/app/Fake.Testing.Common/Fake.Testing.Common.fsproj b/src/app/Fake.Testing.Common/Fake.Testing.Common.fsproj
index 3c90e32ccc7..ab69679a82e 100644
--- a/src/app/Fake.Testing.Common/Fake.Testing.Common.fsproj
+++ b/src/app/Fake.Testing.Common/Fake.Testing.Common.fsproj
@@ -17,12 +17,7 @@
-
-
-
-
-
diff --git a/src/app/Fake.Tools.Git/Fake.Tools.Git.fsproj b/src/app/Fake.Tools.Git/Fake.Tools.Git.fsproj
index 21086d40d21..b04bc47b9ef 100644
--- a/src/app/Fake.Tools.Git/Fake.Tools.Git.fsproj
+++ b/src/app/Fake.Tools.Git/Fake.Tools.Git.fsproj
@@ -36,7 +36,6 @@
-
\ No newline at end of file
diff --git a/src/app/Fake.Tools.Pickles/Fake.Tools.Pickles.fsproj b/src/app/Fake.Tools.Pickles/Fake.Tools.Pickles.fsproj
index 9cc62bf2750..788dd9877ee 100644
--- a/src/app/Fake.Tools.Pickles/Fake.Tools.Pickles.fsproj
+++ b/src/app/Fake.Tools.Pickles/Fake.Tools.Pickles.fsproj
@@ -17,7 +17,6 @@
-
diff --git a/src/app/Fake.Windows.Chocolatey/Fake.Windows.Chocolatey.fsproj b/src/app/Fake.Windows.Chocolatey/Fake.Windows.Chocolatey.fsproj
index 30405a55d5e..8365046d011 100644
--- a/src/app/Fake.Windows.Chocolatey/Fake.Windows.Chocolatey.fsproj
+++ b/src/app/Fake.Windows.Chocolatey/Fake.Windows.Chocolatey.fsproj
@@ -21,7 +21,6 @@
-
diff --git a/src/app/Fake.netcore/Fake.netcore.fsproj b/src/app/Fake.netcore/Fake.netcore.fsproj
index e239adda742..d18589425b4 100644
--- a/src/app/Fake.netcore/Fake.netcore.fsproj
+++ b/src/app/Fake.netcore/Fake.netcore.fsproj
@@ -23,7 +23,6 @@
-
diff --git a/src/app/dotnet-fake/dotnet-fake.fsproj b/src/app/dotnet-fake/dotnet-fake.fsproj
index efed4ecc3a1..55d821c0c70 100644
--- a/src/app/dotnet-fake/dotnet-fake.fsproj
+++ b/src/app/dotnet-fake/dotnet-fake.fsproj
@@ -21,7 +21,6 @@
-
-
+
\ No newline at end of file
diff --git a/src/app/fake-cli/fake-cli.fsproj b/src/app/fake-cli/fake-cli.fsproj
index b821bf5b01a..9de7948b82e 100644
--- a/src/app/fake-cli/fake-cli.fsproj
+++ b/src/app/fake-cli/fake-cli.fsproj
@@ -18,7 +18,6 @@
-