diff --git a/lazproj/coedit.lpi b/lazproj/coedit.lpi
index 4354b366..7c5fd891 100644
--- a/lazproj/coedit.lpi
+++ b/lazproj/coedit.lpi
@@ -151,6 +151,7 @@
       <Unit3>
         <Filename Value="..\src\ce_d2syn.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="ce_d2syn"/>
       </Unit3>
       <Unit4>
         <Filename Value="..\src\ce_dcd.pas"/>
@@ -213,7 +214,6 @@
         <ComponentName Value="CEMiniExplorerWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_miniexplorer"/>
       </Unit14>
       <Unit15>
         <Filename Value="..\src\ce_observer.pas"/>
@@ -237,7 +237,6 @@
         <ComponentName Value="CEProjectConfigurationWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_projconf"/>
       </Unit18>
       <Unit19>
         <Filename Value="..\src\ce_project.pas"/>
@@ -264,16 +263,15 @@
         <ComponentName Value="CEStaticExplorerWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_staticexplorer"/>
       </Unit22>
       <Unit23>
         <Filename Value="..\src\ce_staticmacro.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ce_staticmacro"/>
       </Unit23>
       <Unit24>
         <Filename Value="..\src\ce_symstring.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="ce_symstring"/>
       </Unit24>
       <Unit25>
         <Filename Value="..\src\ce_synmemo.pas"/>
@@ -290,6 +288,7 @@
         <ComponentName Value="CEToolsEditorWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+        <UnitName Value="ce_toolseditor"/>
       </Unit27>
       <Unit28>
         <Filename Value="..\src\ce_txtsyn.pas"/>
@@ -305,6 +304,7 @@
       <Unit30>
         <Filename Value="..\src\ce_writablecomponent.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="ce_writableComponent"/>
       </Unit30>
       <Unit31>
         <Filename Value="..\src\ce_todolist.pas"/>
@@ -324,7 +324,6 @@
         <ComponentName Value="CEOptionEditorWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_optionseditor"/>
       </Unit33>
       <Unit34>
         <Filename Value="..\src\ce_editoroptions.pas"/>
@@ -341,7 +340,6 @@
         <ComponentName Value="CEShortcutEditor"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Frame"/>
-        <UnitName Value="ce_shortcutseditor"/>
       </Unit36>
     </Units>
   </ProjectOptions>
@@ -353,7 +351,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\src;$(LazarusDir)\components\anchordocking"/>
+      <OtherUnitFiles Value="..\src"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <CodeGeneration>
diff --git a/src/ce_main.pas b/src/ce_main.pas
index 01bc78f9..09a04788 100644
--- a/src/ce_main.pas
+++ b/src/ce_main.pas
@@ -7,8 +7,8 @@ interface
 uses
   Classes, SysUtils, FileUtil, SynEditKeyCmds, SynHighlighterLFM, Forms,
   AnchorDocking, AnchorDockStorage, AnchorDockOptionsDlg, Controls, Graphics,
-  Dialogs, Menus, ActnList, ExtCtrls, process, XMLPropStorage, dynlibs, SynExportHTML,
-  ce_common, ce_dmdwrap, ce_project, ce_dcd, ce_plugin, ce_synmemo, ce_widget,
+  Dialogs, Menus, ActnList, ExtCtrls, process, XMLPropStorage, SynExportHTML,
+  ce_common, ce_dmdwrap, ce_project, ce_dcd, ce_synmemo, ce_widget,
   ce_messages, ce_interfaces, ce_editor, ce_projinspect, ce_projconf, ce_search,
   ce_staticexplorer, ce_miniexplorer, ce_libman, ce_libmaneditor, ce_todolist,
   ce_observer, ce_writableComponent, ce_toolseditor, ce_procinput, ce_optionseditor,
diff --git a/src/ce_optionseditor.pas b/src/ce_optionseditor.pas
index f6a0aab1..c9700b35 100644
--- a/src/ce_optionseditor.pas
+++ b/src/ce_optionseditor.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, RTTIGrids, Forms, Controls, Graphics, ExtCtrls,
-  Menus, ComCtrls, StdCtrls, Buttons, ce_common, ce_widget, ce_interfaces,
+  Menus, ComCtrls, Buttons, ce_common, ce_widget, ce_interfaces,
   ce_observer;
 
 type
diff --git a/src/ce_shortcutseditor.pas b/src/ce_shortcutseditor.pas
index d2cf7ea9..d9927c21 100644
--- a/src/ce_shortcutseditor.pas
+++ b/src/ce_shortcutseditor.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, TreeFilterEdit, Forms, Controls, Menus, Graphics,
-  ExtCtrls, LCLProc, ComCtrls, StdCtrls, LMessages, Buttons, LCLType,
+  ExtCtrls, LCLProc, ComCtrls, StdCtrls, Buttons, LCLType,
   ce_observer, ce_interfaces, ce_common, ce_writableComponent;
 
 type
@@ -41,8 +41,6 @@ type
     property item[index: Integer]: TShortcutItem read getShortcut; default;
   end;
 
-  { TCEShortcutEditor }
-
   TCEShortcutEditor = class(TFrame, ICEEditableOptions)
     shcCatch: TEdit;
     Panel1: TPanel;
@@ -189,7 +187,6 @@ end;
 
 procedure TCEShortcutEditor.optionedEvent(anEvent: TOptionEditorEvent);
 begin
-  // todo
 end;
 {$ENDREGION}
 
diff --git a/src/ce_todolist.pas b/src/ce_todolist.pas
index 772d51b9..4afb2439 100644
--- a/src/ce_todolist.pas
+++ b/src/ce_todolist.pas
@@ -5,9 +5,9 @@ unit ce_todolist;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, TreeFilterEdit, ListFilterEdit, Forms, Controls,
-  strutils, Graphics, Dialogs, ExtCtrls, Menus, Buttons, StdCtrls, ComCtrls,
-  asyncprocess, ce_widget, process, ce_common, ce_interfaces, ce_synmemo,
+  Classes, SysUtils, FileUtil, ListFilterEdit, Forms, Controls,
+  strutils, Graphics, Dialogs, ExtCtrls, Menus, Buttons, ComCtrls,
+  ce_widget, process, ce_common, ce_interfaces, ce_synmemo,
   ce_project, ce_symstring;
 
 type
diff --git a/src/ce_writablecomponent.pas b/src/ce_writablecomponent.pas
index 1804c17b..58f84c63 100644
--- a/src/ce_writablecomponent.pas
+++ b/src/ce_writablecomponent.pas
@@ -5,7 +5,7 @@ unit ce_writableComponent;
 interface
 
 uses
-  Classes, SysUtils, ce_common, typinfo, fpjson, jsonparser, fpjsonrtti, fpjsondataset;
+  Classes, SysUtils, ce_common, typinfo, fpjson, jsonparser, fpjsonrtti;
 
 type