diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb
index 86543c94..659f3954 100644
--- a/Controls.LookupGrid/LookupControl3.vb
+++ b/Controls.LookupGrid/LookupControl3.vb
@@ -36,33 +36,8 @@ Public Class LookupControl3
         e.Cancel = True
     End Sub
 
-    Friend WithEvents fProperties As RepositoryItemGridLookUpEdit
+    Shadows WithEvents fProperties As RepositoryItemGridLookUpEdit
     Friend WithEvents fPropertiesView As DevExpress.XtraGrid.Views.Grid.GridView
-
-    Private Sub InitializeComponent()
-        Me.fProperties = New DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit()
-        Me.fPropertiesView = New DevExpress.XtraGrid.Views.Grid.GridView()
-        CType(Me.fProperties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
-        '
-        'fProperties
-        '
-        Me.fProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
-        Me.fProperties.Name = "fProperties"
-        Me.fProperties.PopupView = Me.fPropertiesView
-        '
-        'fPropertiesView
-        '
-        Me.fPropertiesView.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus
-        Me.fPropertiesView.Name = "fPropertiesView"
-        Me.fPropertiesView.OptionsSelection.EnableAppearanceFocusedCell = False
-        Me.fPropertiesView.OptionsView.ShowGroupPanel = False
-        CType(Me.fProperties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
-
-    End Sub
 End Class
 
 <UserRepositoryItem("RegisterLookupControl3")>
diff --git a/Controls.LookupGrid/My Project/licenses.licx b/Controls.LookupGrid/My Project/licenses.licx
index e69de29b..c18cfa50 100644
--- a/Controls.LookupGrid/My Project/licenses.licx	
+++ b/Controls.LookupGrid/My Project/licenses.licx	
@@ -0,0 +1,2 @@
+DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/Controls.SnapPanel/My Project/Settings.Designer.vb b/Controls.SnapPanel/My Project/Settings.Designer.vb
index 0b99520f..641f7773 100644
--- a/Controls.SnapPanel/My Project/Settings.Designer.vb	
+++ b/Controls.SnapPanel/My Project/Settings.Designer.vb	
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
diff --git a/Controls.SnapPanel/SnapPanel.vbproj b/Controls.SnapPanel/SnapPanel.vbproj
index 66208a3c..67683bde 100644
--- a/Controls.SnapPanel/SnapPanel.vbproj
+++ b/Controls.SnapPanel/SnapPanel.vbproj
@@ -10,7 +10,7 @@
     <AssemblyName>DigitalData.Controls.SnapPanel</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/GUIs.Common/IBaseForm.vb b/GUIs.Common/IBaseForm.vb
index a8c6c99e..27879b8c 100644
--- a/GUIs.Common/IBaseForm.vb
+++ b/GUIs.Common/IBaseForm.vb
@@ -1,5 +1,4 @@
-Imports DigitalData.GUIs.Common.Base
-Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Logging
 
 Public Interface IBaseForm
     ReadOnly Property LogConfig As LogConfig
diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb
index 7e02b4ad..6b6a485e 100644
--- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb
+++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb
@@ -3,12 +3,10 @@ Imports DevExpress.XtraEditors.Repository
 Imports DevExpress.XtraSplashScreen
 Imports DevExpress.XtraEditors
 Imports DevExpress.XtraLayout
-Imports DigitalData.GUIs.Common.Base
 Imports DigitalData.Modules.EDMI.API
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.ZooFlow
-Imports DigitalData.Modules.Base.IDB
 
 Public Class ctrlObjectPropertyDialog
     Implements IBaseForm
diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb
index a2f70227..879e99ec 100644
--- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb
+++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb
@@ -1,5 +1,4 @@
-Imports System.Windows.Forms
-Imports DevExpress.XtraEditors
+Imports DevExpress.XtraEditors
 Imports DevExpress.XtraEditors.Repository
 Imports DevExpress.XtraLayout
 Imports DevExpress.XtraSplashScreen
@@ -7,10 +6,7 @@ Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.ZooFlow
 Imports DigitalData.Modules.Language
-Imports DevExpress.XtraGrid
 Imports DigitalData.Modules.EDMI.API
-Imports DigitalData.GUIs.Common.Base
-Imports DigitalData.Modules.Base
 
 Public Class frmObjectPropertyDialog
     Implements IBaseForm
diff --git a/GUIs.Common/frmWorkflow_Adhoc_start.vb b/GUIs.Common/frmWorkflow_Adhoc_start.vb
index 0896434e..82d44b2a 100644
--- a/GUIs.Common/frmWorkflow_Adhoc_start.vb
+++ b/GUIs.Common/frmWorkflow_Adhoc_start.vb
@@ -1,6 +1,5 @@
 Imports DigitalData.Modules.ZooFlow
 Imports DigitalData.Modules.Logging
-Imports DigitalData.GUIs.Common.Base
 Imports DigitalData.Modules.ZooFlow.Constants
 Imports DigitalData.Modules.EDMI.API
 Imports DevExpress.XtraEditors
diff --git a/GUIs.GlobalIndexer/ControlCreator.vb b/GUIs.GlobalIndexer/ControlCreator.vb
index 61a4d2ab..cd1dd728 100644
--- a/GUIs.GlobalIndexer/ControlCreator.vb
+++ b/GUIs.GlobalIndexer/ControlCreator.vb
@@ -1,7 +1,6 @@
 Imports System.Windows.Forms
 Imports System.Drawing
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Language.Utils
 Imports DevExpress.XtraEditors
 Imports DigitalData.Controls.LookupGrid