diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
index d8e2e30ad..e4a73038d 100644
--- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
+++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
@@ -161,7 +161,6 @@
-
diff --git a/src/Greenshot.Addon.ExternalCommand/ListviewComparer.cs b/src/Greenshot.Addon.ExternalCommand/ListviewComparer.cs
deleted file mode 100644
index 52b485bb7..000000000
--- a/src/Greenshot.Addon.ExternalCommand/ListviewComparer.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections;
-using System.Windows.Forms;
-
-namespace Greenshot.Addon.ExternalCommand
-{
- ///
- /// An IComparer for a listview, to allow sorting
- ///
- public class ListviewComparer : IComparer
- {
- public int Compare(object x, object y)
- {
- if (!(x is ListViewItem))
- {
- return 0;
- }
- if (!(y is ListViewItem))
- {
- return 0;
- }
-
- var l1 = (ListViewItem) x;
- var l2 = (ListViewItem) y;
- return string.Compare(l1.Text, l2.Text, StringComparison.Ordinal);
- }
- }
-}
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs b/src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs
index 28477d9df..b319c6460 100644
--- a/src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs
+++ b/src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs
@@ -34,7 +34,6 @@ using Dapplo.Log;
using Dapplo.Windows.Clipboard;
using Greenshot.Addon.Imgur.Entities;
using Greenshot.Addons;
-using Greenshot.Addons.Core;
using Greenshot.Addons.Extensions;
namespace Greenshot.Addon.Imgur.ViewModels
diff --git a/src/Greenshot.Addon.LegacyEditor/Controls/ColorButton.cs b/src/Greenshot.Addon.LegacyEditor/Controls/ColorButton.cs
index 2514163b2..b622eb098 100644
--- a/src/Greenshot.Addon.LegacyEditor/Controls/ColorButton.cs
+++ b/src/Greenshot.Addon.LegacyEditor/Controls/ColorButton.cs
@@ -30,7 +30,6 @@ using System.Drawing.Drawing2D;
using System.Windows.Forms;
using Autofac.Features.OwnedInstances;
using Greenshot.Addons.Controls;
-using ColorDialog = Greenshot.Addon.LegacyEditor.Controls.ColorDialog;
#endregion
diff --git a/src/Greenshot.Addon.LegacyEditor/Controls/ToolStripColorButton.cs b/src/Greenshot.Addon.LegacyEditor/Controls/ToolStripColorButton.cs
index accea0ff1..38fb82d34 100644
--- a/src/Greenshot.Addon.LegacyEditor/Controls/ToolStripColorButton.cs
+++ b/src/Greenshot.Addon.LegacyEditor/Controls/ToolStripColorButton.cs
@@ -30,7 +30,6 @@ using System.Drawing.Drawing2D;
using System.Windows.Forms;
using Greenshot.Addons;
using Greenshot.Addons.Controls;
-using ColorDialog = Greenshot.Addon.LegacyEditor.Controls.ColorDialog;
#endregion
diff --git a/src/Greenshot.Addon.LegacyEditor/Drawing/Fields/FieldTypes.cs b/src/Greenshot.Addon.LegacyEditor/Drawing/Fields/FieldTypes.cs
index b1147407c..1f08c61de 100644
--- a/src/Greenshot.Addon.LegacyEditor/Drawing/Fields/FieldTypes.cs
+++ b/src/Greenshot.Addon.LegacyEditor/Drawing/Fields/FieldTypes.cs
@@ -23,7 +23,6 @@
#region Usings
-using System;
using System.Drawing;
using Greenshot.Addons.Interfaces.Drawing;
diff --git a/src/Greenshot.Addon.Lutim/ViewModels/LutimHistoryViewModel.cs b/src/Greenshot.Addon.Lutim/ViewModels/LutimHistoryViewModel.cs
index b0fc70f36..1b2501f42 100644
--- a/src/Greenshot.Addon.Lutim/ViewModels/LutimHistoryViewModel.cs
+++ b/src/Greenshot.Addon.Lutim/ViewModels/LutimHistoryViewModel.cs
@@ -33,7 +33,6 @@ using Dapplo.Log;
using Dapplo.Windows.Clipboard;
using Greenshot.Addon.Lutim.Entities;
using Greenshot.Addons;
-using Greenshot.Addons.Core;
using Greenshot.Addons.Extensions;
namespace Greenshot.Addon.Lutim.ViewModels
diff --git a/src/Greenshot.Addon.OcrCommand/Properties/AssemblyInfo.cs b/src/Greenshot.Addon.OcrCommand/Properties/AssemblyInfo.cs
index 38c376b10..5d6c1a08d 100644
--- a/src/Greenshot.Addon.OcrCommand/Properties/AssemblyInfo.cs
+++ b/src/Greenshot.Addon.OcrCommand/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
diff --git a/src/Greenshot.Addons/Controls/QualityDialog.cs b/src/Greenshot.Addons/Controls/QualityDialog.cs
index 8be030c5a..b1beb23a7 100644
--- a/src/Greenshot.Addons/Controls/QualityDialog.cs
+++ b/src/Greenshot.Addons/Controls/QualityDialog.cs
@@ -24,7 +24,6 @@
#region Usings
using System;
-using Dapplo.Ini;
using Greenshot.Addons.Core;
using Greenshot.Addons.Core.Enums;
using Greenshot.Addons.Interfaces.Plugin;
diff --git a/src/Greenshot.Addons/Extensions/ClipboardHtmlExtensions.cs b/src/Greenshot.Addons/Extensions/ClipboardHtmlExtensions.cs
index 393fed8ad..cd17a6fb6 100644
--- a/src/Greenshot.Addons/Extensions/ClipboardHtmlExtensions.cs
+++ b/src/Greenshot.Addons/Extensions/ClipboardHtmlExtensions.cs
@@ -22,7 +22,6 @@
#endregion
using System;
-using System.Drawing;
using System.IO;
using System.Text;
using Dapplo.Windows.Clipboard;
diff --git a/src/Greenshot.Tests/UpdateTests.cs b/src/Greenshot.Tests/UpdateTests.cs
index 382d220da..991e6deaa 100644
--- a/src/Greenshot.Tests/UpdateTests.cs
+++ b/src/Greenshot.Tests/UpdateTests.cs
@@ -3,7 +3,6 @@ using System.ServiceModel.Syndication;
using System.Threading.Tasks;
using System.Xml;
using Dapplo.HttpExtensions;
-using Dapplo.Log;
using Greenshot.Components;
using Xunit;
diff --git a/src/Greenshot/Destinations/FileWithDialogDestination.cs b/src/Greenshot/Destinations/FileWithDialogDestination.cs
index de47eb574..74733c2ee 100644
--- a/src/Greenshot/Destinations/FileWithDialogDestination.cs
+++ b/src/Greenshot/Destinations/FileWithDialogDestination.cs
@@ -29,7 +29,6 @@ using Greenshot.Addons;
using Greenshot.Addons.Components;
using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces;
-using Greenshot.Configuration;
#endregion
diff --git a/src/Greenshot/Forms/AboutForm.cs b/src/Greenshot/Forms/AboutForm.cs
index 30006e3da..a06438548 100644
--- a/src/Greenshot/Forms/AboutForm.cs
+++ b/src/Greenshot/Forms/AboutForm.cs
@@ -29,7 +29,6 @@ using System.Diagnostics;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
-using System.Reflection;
using System.Security.Permissions;
using System.Windows.Forms;
using Dapplo.CaliburnMicro;
diff --git a/src/Greenshot/Forms/MainForm.cs b/src/Greenshot/Forms/MainForm.cs
index fc4c09287..87d9185f9 100644
--- a/src/Greenshot/Forms/MainForm.cs
+++ b/src/Greenshot/Forms/MainForm.cs
@@ -31,7 +31,6 @@ using System.Drawing;
using System.IO;
using System.Linq;
using System.Reflection;
-using System.Threading;
using System.Windows.Forms;
using Autofac.Features.OwnedInstances;
using Caliburn.Micro;
@@ -59,7 +58,6 @@ using Greenshot.Addons.Extensions;
using Greenshot.Addons.Interfaces;
using Greenshot.Gfx;
using Greenshot.Ui.Configuration.ViewModels;
-using LangKey = Greenshot.Configuration.LangKey;
using Message = System.Windows.Forms.Message;
using Screen = System.Windows.Forms.Screen;