diff --git a/source/Cromis.DirectoryWatch.pas b/source/Cromis.DirectoryWatch.pas
index c0e3ca10..9957ff89 100644
--- a/source/Cromis.DirectoryWatch.pas
+++ b/source/Cromis.DirectoryWatch.pas
@@ -50,7 +50,7 @@ unit Cromis.DirectoryWatch;
 interface
 
 uses
-   Windows, SysUtils, Classes, Messages, SyncObjs;
+   Windows, SysUtils, Classes, Messages;
 
 const
   FILE_NOTIFY_CHANGE_FILE_NAME   = $00000001;
diff --git a/source/column_selection.pas b/source/column_selection.pas
index e8fc8b2a..2baf5fac 100644
--- a/source/column_selection.pas
+++ b/source/column_selection.pas
@@ -3,7 +3,7 @@ unit column_selection;
 interface
 
 uses
-  Windows, Classes, Controls, Forms, StdCtrls, CheckLst, ExtCtrls, Contnrs,
+  Windows, Classes, Controls, Forms, StdCtrls, CheckLst, ExtCtrls,
   helpers;
 
 type
diff --git a/source/connections.pas b/source/connections.pas
index 47a81931..11e1e845 100644
--- a/source/connections.pas
+++ b/source/connections.pas
@@ -10,7 +10,7 @@ interface
 
 uses
   Windows, SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls,
-  VirtualTrees, Menus, Graphics, Contnrs, Generics.Collections,
+  VirtualTrees, Menus, Graphics, Generics.Collections,
   dbconnection;
 
 type
diff --git a/source/copytable.pas b/source/copytable.pas
index 539ad7fd..4cc83eaf 100644
--- a/source/copytable.pas
+++ b/source/copytable.pas
@@ -4,7 +4,7 @@ unit copytable;
 interface
 
 uses
-  Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, Contnrs,
+  Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls,
   dbconnection, VirtualTrees, SynEdit, SynMemo, Menus;
 
 type
diff --git a/source/data_sorting.pas b/source/data_sorting.pas
index af5b2611..835e3764 100644
--- a/source/data_sorting.pas
+++ b/source/data_sorting.pas
@@ -4,7 +4,7 @@ interface
 
 uses
   Windows, SysUtils, Classes, Controls, Forms, StdCtrls, ExtCtrls, ComCtrls, Buttons,
-  Contnrs,
+
   helpers;
 
 
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index 57ae3c97..e7dc6fc5 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -3,8 +3,8 @@ unit dbconnection;
 interface
 
 uses
-  Classes, SysUtils, windows, mysql_structures, SynRegExpr, Contnrs, Generics.Collections, Generics.Defaults,
-  DateUtils, Types, ShellApi, Math, Dialogs, ADODB, DB, DBCommon, ComObj, Graphics;
+  Classes, SysUtils, windows, mysql_structures, SynRegExpr, Generics.Collections, Generics.Defaults,
+  DateUtils, Types, Math, Dialogs, ADODB, DB, DBCommon, ComObj, Graphics;
 
 
 type
diff --git a/source/helpers.pas b/source/helpers.pas
index da874e11..34a3c289 100644
--- a/source/helpers.pas
+++ b/source/helpers.pas
@@ -9,9 +9,9 @@ unit helpers;
 interface
 
 uses
-  Classes, SysUtils, Graphics, GraphUtil, ClipBrd, Dialogs, Forms, Controls, ComCtrls, ShellApi, CheckLst,
-  Windows, Contnrs, ShlObj, ActiveX, VirtualTrees, SynRegExpr, Messages, Math,
-  Registry, SynEditHighlighter, DateUtils, Generics.Collections, StrUtils, AnsiStrings, TlHelp32, Types,
+  Classes, SysUtils, Graphics, GraphUtil, ClipBrd, Dialogs, Forms, Controls, ShellApi,
+  Windows, ShlObj, ActiveX, VirtualTrees, SynRegExpr, Messages, Math,
+  Registry, DateUtils, Generics.Collections, StrUtils, AnsiStrings, TlHelp32, Types,
   dbconnection, mysql_structures, SynMemo, Menus, WinInet;
 
 type
diff --git a/source/main.pas b/source/main.pas
index 1e81ef19..de49d845 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -12,7 +12,7 @@ interface
 uses
   Windows, SysUtils, Classes, GraphicEx, Graphics, GraphUtil, Forms, Controls, Menus, StdCtrls, Dialogs, Buttons,
   Messages, ExtCtrls, ComCtrls, StdActns, ActnList, ImgList, ToolWin, Clipbrd, SynMemo,
-  SynEdit, SynEditTypes, SynEditKeyCmds, VirtualTrees, DateUtils, SyncObjs,
+  SynEdit, SynEditTypes, SynEditKeyCmds, VirtualTrees, DateUtils,
   ShlObj, SynEditMiscClasses, SynEditSearch, SynEditRegexSearch, SynCompletionProposal, SynEditHighlighter,
   SynHighlighterSQL, Tabs, SynUnicode, SynRegExpr, ExtActns, IOUtils, Types, Themes, ComObj,
   CommCtrl, Contnrs, Generics.Collections, Generics.Defaults, SynEditExport, SynExportHTML, Math, ExtDlgs, Registry, AppEvnts,
diff --git a/source/routine_editor.pas b/source/routine_editor.pas
index 1101c848..137556b8 100644
--- a/source/routine_editor.pas
+++ b/source/routine_editor.pas
@@ -4,7 +4,7 @@ interface
 
 uses
   Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, SynEdit, SynMemo, StdCtrls,
-  ComCtrls, ToolWin, VirtualTrees, SynRegExpr,
+  ComCtrls, ToolWin, VirtualTrees,
   dbconnection, helpers;
 
 type
diff --git a/source/searchreplace.pas b/source/searchreplace.pas
index df97f404..1b8ff4b4 100644
--- a/source/searchreplace.pas
+++ b/source/searchreplace.pas
@@ -4,7 +4,7 @@ interface
 
 uses
   Windows, Messages, SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls,
-  ExtCtrls, SynMemo, SynEditSearch, SynEditTypes, SynEditMiscClasses;
+  ExtCtrls, SynMemo, SynEditTypes;
 
 type
   TfrmSearchReplace = class(TForm)
@@ -44,7 +44,7 @@ implementation
 
 {$R *.dfm}
 
-uses main, helpers;
+uses helpers;
 
 
 procedure TfrmSearchReplace.FormCreate(Sender: TObject);
diff --git a/source/table_editor.pas b/source/table_editor.pas
index 0dfa83cd..3a9f291d 100644
--- a/source/table_editor.pas
+++ b/source/table_editor.pas
@@ -5,7 +5,7 @@ interface
 uses
   Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls,
   ComCtrls, ToolWin, VirtualTrees, SynRegExpr, ActiveX, ExtCtrls, SynEdit,
-  SynMemo, Menus, Contnrs, Clipbrd, Math,
+  SynMemo, Menus, Clipbrd, Math,
   grideditlinks, mysql_structures, dbconnection, helpers;
 
 type
diff --git a/source/tabletools.pas b/source/tabletools.pas
index 3786c4c4..71aa0716 100644
--- a/source/tabletools.pas
+++ b/source/tabletools.pas
@@ -10,7 +10,7 @@ interface
 
 uses
   Windows, SysUtils, Classes, Controls, Forms, StdCtrls, ComCtrls, Buttons, Dialogs, StdActns,
-  VirtualTrees, ExtCtrls, Contnrs, Graphics, SynRegExpr, Math, Generics.Collections,
+  VirtualTrees, ExtCtrls, Graphics, SynRegExpr, Math, Generics.Collections,
   dbconnection, helpers, Menus;
 
 type
diff --git a/source/trigger_editor.pas b/source/trigger_editor.pas
index 321b2502..055604e6 100644
--- a/source/trigger_editor.pas
+++ b/source/trigger_editor.pas
@@ -4,7 +4,7 @@ interface
 
 uses
   Windows, SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls, SynEdit, SynMemo,
-  SynCompletionProposal, VirtualTrees,
+  SynCompletionProposal,
   dbconnection, mysql_structures, helpers;
 
 type
diff --git a/source/view.pas b/source/view.pas
index 5a21066b..126e3da6 100644
--- a/source/view.pas
+++ b/source/view.pas
@@ -4,7 +4,7 @@ interface
 
 uses
   Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, SynEdit, SynMemo,
-  ExtCtrls, SynRegExpr,
+  ExtCtrls,
   dbconnection, mysql_structures, helpers;
 
 type