diff --git a/ModelDesigner.DesignStudio/MainForm.cs b/ModelDesigner.DesignStudio/MainForm.cs
index 7a143f1f..2f2793a3 100644
--- a/ModelDesigner.DesignStudio/MainForm.cs
+++ b/ModelDesigner.DesignStudio/MainForm.cs
@@ -687,7 +687,7 @@ private void pasteToolStripMenuItem_Click(object sender, EventArgs e)
       else
         MessageBox.Show(Resources.MianWindow_FunctionalityAvailiableOnlyInModelView);
     }
-
+    //TODO Remove dependency on CodeProtect - consolidated #211
     private void oPCViewerToolStripMenuItem_Click(object sender, EventArgs e)
     {
       try
diff --git a/ModelDesigner.DesignStudio/Program.cs b/ModelDesigner.DesignStudio/Program.cs
index 579e4ee2..313dc29a 100644
--- a/ModelDesigner.DesignStudio/Program.cs
+++ b/ModelDesigner.DesignStudio/Program.cs
@@ -111,11 +111,11 @@ private static void ComposeApplication()
       Wrappers.ViewModelFactory.Factory = new Wrappers4ProperyGrid.ViewModelFactory();
     }
 
+    //TODO Remove dependency on CodeProtect - consolidated #211
     internal static void DoInstallLicense(bool loadLicenseFromDefaultContainer)
     {
       try
       {
-        //TODO Remove dependency on CodeProtect #200
         CAS.Lib.CodeProtect.LibInstaller.InstallLicense(loadLicenseFromDefaultContainer);
         AssemblyTraceEvent.Tracer.TraceEvent(TraceEventType.Verbose, 113, "Installed the License without errors");
       }
diff --git a/ModelDesigner.DesignStudio/Properties/AssemblyInfo.cs b/ModelDesigner.DesignStudio/Properties/AssemblyInfo.cs
index 12c8bce3..0bdc9492 100644
--- a/ModelDesigner.DesignStudio/Properties/AssemblyInfo.cs
+++ b/ModelDesigner.DesignStudio/Properties/AssemblyInfo.cs
@@ -20,6 +20,7 @@
 [assembly: Guid( "33281f75-30a8-43e1-a2b3-915eaaf43915" )]
 [assembly: AssemblyVersion("4.3.2.*")]
 [assembly: AssemblyFileVersion("4.3.2")]
+//TODO Remove dependency on CodeProtect - consolidated #211
 [assembly: CAS.Lib.CodeProtect.AssemblyHelper( Company = "Mariusz Postol", Email = "mpostol@cas.eu", Phone = "+48 (608) 619 899", Product = "OOI ASMD", Url = "https://mpostol.github.io/ASMD/" )]
 [assembly: InternalsVisibleToAttribute("CAS.CommServer.UA.ModelDesigner.DesignStudio.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b3cff1bec656a6" +
                                                                        "e3784c75cacce8ee3bc695d0ce135d820c86465eb49b2353f0438d28ad9a458e5350c0c141393d" +
diff --git a/ModelDesigner.DesignStudio/Wrappers/ModelDesign.cs b/ModelDesigner.DesignStudio/Wrappers/ModelDesign.cs
index 577bf0a6..2a973ad7 100644
--- a/ModelDesigner.DesignStudio/Wrappers/ModelDesign.cs
+++ b/ModelDesigner.DesignStudio/Wrappers/ModelDesign.cs
@@ -98,7 +98,7 @@ internal void GetImportMenu(System.Windows.Forms.ToolStripItemCollection items)
     {
       if (this.TestIfReadOnlyAndRetrunTrueIfReadOnly())
         return;
-      OPCDA.CreateImportMenuItems(items, new EventHandler(CreateImportMenuClick));
+      ImportOPCDAAddressSpace.CreateImportMenuItems(items, new EventHandler(CreateImportMenuClick));
     }
 
     protected override string NodeName()
@@ -120,7 +120,7 @@ protected override string NodeTip()
 
     private void CreateImportMenuClick(object sender, EventArgs e)
     {
-      OpcUaModelCompiler.NodeDesign[] nodes = OPCDA.OnImportMenuItemClick(GetTargetNamespace());
+      OpcUaModelCompiler.NodeDesign[] nodes = ImportOPCDAAddressSpace.OnImportMenuItemClick(GetTargetNamespace());
       if (nodes == null)
         return;
       List<BaseTreeNode> arr = new List<BaseTreeNode>();
diff --git a/ModelDesigner.ImportExport/ImportOPCDAAddressSpace.cs b/ModelDesigner.ImportExport/ImportOPCDAAddressSpace.cs
index 572cd4c3..454ea2bd 100644
--- a/ModelDesigner.ImportExport/ImportOPCDAAddressSpace.cs
+++ b/ModelDesigner.ImportExport/ImportOPCDAAddressSpace.cs
@@ -12,7 +12,7 @@
 using System.Diagnostics;
 using System.Windows.Forms;
 using System.Xml;
-using CASLibOPCAddressSpace = CAS.Lib.OPC.AddressSpace;
+using CASLibOPCAddressSpace = CAS.Lib.OPC.AddressSpace; //TODO Remove dependency on CodeProtect - consolidated #211
 using OpcUaModelCompiler = UAOOI.SemanticData.UAModelDesignExport.XML;
 
 namespace CAS.UA.Model.Designer.ImportExport
@@ -20,7 +20,8 @@ namespace CAS.UA.Model.Designer.ImportExport
   /// <summary>
   /// Import model from OPC DA address space.
   /// </summary>
-  public static class OPCDA
+  //TODO Remove dependency on CodeProtect - consolidated #211
+  public static class ImportOPCDAAddressSpace
   {
     #region internal