diff --git a/bundles/org.eclipse.passage.lic.agreements.e4.ui/.classpath b/bundles/org.eclipse.passage.lic.agreements.e4.ui/.classpath
deleted file mode 100644
index 81fe078c2..000000000
--- a/bundles/org.eclipse.passage.lic.agreements.e4.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.passage.lic.agreements.e4.ui/.project b/bundles/org.eclipse.passage.lic.agreements.e4.ui/.project
deleted file mode 100644
index d6724b09f..000000000
--- a/bundles/org.eclipse.passage.lic.agreements.e4.ui/.project
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.passage.lic.agreements.e4.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-	<linkedResources>
-     <link>
-            <name>.settings</name>
-            <type>2</type>
-            <locationURI>$%7BPARENT-2-PROJECT_LOC%7D/.settings</locationURI>
-        </link>
- </linkedResources>
-</projectDescription>
diff --git a/bundles/org.eclipse.passage.lic.agreements.e4.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.agreements.e4.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index bff1a4d93..000000000
--- a/bundles/org.eclipse.passage.lic.agreements.e4.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: org.eclipse.passage.lic.agreements.e4.ui
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.passage.lic.agreements.e4.ui;singleton:=true
-Bundle-Version: 3.1.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Copyright: %Bundle-Copyright
-Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.jface;bundle-version="0.0.0",
- org.eclipse.e4.core.di;bundle-version="0.0.0",
- org.eclipse.e4.core.services;bundle-version="0.0.0",
- org.eclipse.e4.core.contexts;bundle-version="0.0.0",
- org.eclipse.e4.ui.workbench;bundle-version="0.0.0",
- org.eclipse.passage.lic.jface;bundle-version="0.0.0",
- org.eclipse.passage.lic.agreements.edit;bundle-version="0.0.0"
-Import-Package: javax.inject;version="1.0.0"
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.agreements.e4.ui/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.agreements.e4.ui/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 99969e61e..000000000
--- a/bundles/org.eclipse.passage.lic.agreements.e4.ui/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2018, 2024 ArSysOp and others
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/.
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Agreements E4 UI
-Bundle-Vendor = Eclipse Passage
-Bundle-Copyright = Copyright (c) 2018, 2024 ArSysOp.\n\
-\n\
-This program and the accompanying materials are made\n\
-available under the terms of the Eclipse Public License 2.0\n\
-which is available at https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.agreements.e4.ui/about.html b/bundles/org.eclipse.passage.lic.agreements.e4.ui/about.html
deleted file mode 100644
index 164f781a8..000000000
--- a/bundles/org.eclipse.passage.lic.agreements.e4.ui/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
-	<h2>About This Content</h2>
-
-	<p>November 30, 2017</p>
-	<h3>License</h3>
-
-	<p>
-		The Eclipse Foundation makes available all content in this plug-in
-		(&quot;Content&quot;). Unless otherwise indicated below, the Content
-		is provided to you under the terms and conditions of the Eclipse
-		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
-		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-		For purposes of the EPL, &quot;Program&quot; will mean the Content.
-	</p>
-
-	<p>
-		If you did not receive this Content directly from the Eclipse
-		Foundation, the Content is being redistributed by another party
-		(&quot;Redistributor&quot;) and different terms and conditions may
-		apply to your use of any object code in the Content. Check the
-		Redistributor's license that was provided with the Content. If no such
-		license exists, contact the Redistributor. Unless otherwise indicated
-		below, the terms and conditions of the EPL still apply to any source
-		code in the Content and such source code may be obtained at <a
-			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
-	</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.agreements.e4.ui/build.properties b/bundles/org.eclipse.passage.lic.agreements.e4.ui/build.properties
deleted file mode 100644
index c364a0e34..000000000
--- a/bundles/org.eclipse.passage.lic.agreements.e4.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2021 ArSysOp
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/.
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/,\
-               plugin.xml,\
-               about.html
diff --git a/bundles/org.eclipse.passage.lic.agreements.e4.ui/plugin.xml b/bundles/org.eclipse.passage.lic.agreements.e4.ui/plugin.xml
deleted file mode 100644
index 3cc759922..000000000
--- a/bundles/org.eclipse.passage.lic.agreements.e4.ui/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<!--
-	Copyright (c) 2021 ArSysOp
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	https://www.eclipse.org/legal/epl-2.0/.
-
-	SPDX-License-Identifier: EPL-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<plugin>
-   <extension
-         id="org.eclipse.passage.lic.agreements.e4.ui.resources"
-         point="org.eclipse.e4.workbench.model">
-      <processor
-            apply="always"
-            beforefragment="true"
-            class="org.eclipse.passage.lic.internal.agreements.e4.ui.AgreementsE4UiProcessor">
-      </processor>
-   </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.passage.lic.agreements.e4.ui/src/org/eclipse/passage/lic/internal/agreements/e4/ui/AgreementsE4UiProcessor.java b/bundles/org.eclipse.passage.lic.agreements.e4.ui/src/org/eclipse/passage/lic/internal/agreements/e4/ui/AgreementsE4UiProcessor.java
deleted file mode 100644
index e718a23f4..000000000
--- a/bundles/org.eclipse.passage.lic.agreements.e4.ui/src/org/eclipse/passage/lic/internal/agreements/e4/ui/AgreementsE4UiProcessor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2021 ArSysOp
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package org.eclipse.passage.lic.internal.agreements.e4.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.passage.lic.agreements.edit.AgreementsEditPlugin;
-import org.eclipse.passage.lic.agreements.model.meta.AgreementsPackage;
-import org.eclipse.passage.lic.jface.resource.LicensingImages;
-import org.eclipse.swt.widgets.Display;
-
-public class AgreementsE4UiProcessor {
-
-	@Execute
-	void process(IEclipseContext context) {
-		Display display = context.get(Display.class);
-		if (display != null) {
-			doRegisterImages();
-		}
-	}
-
-	private void doRegisterImages() {
-		LicensingImages.getImageRegistry();
-		String pattern = "$nl$/icons/full/obj16/%s"; //$NON-NLS-1$
-
-		registerFeatures(pattern);
-	}
-
-	private void registerFeatures(String pattern) {
-		Map<String, String> paths = new HashMap<String, String>();
-		AgreementsPackage agreements = AgreementsPackage.eINSTANCE;
-		paths.put(agreements.getName(), String.format(pattern, "agreement.png")); //$NON-NLS-1$
-		paths.put(agreements.getAgreementGroup().getName(), String.format(pattern, "agreement.png")); //$NON-NLS-1$
-		paths.put(agreements.getAgreement().getName(), String.format(pattern, "agreement.png")); //$NON-NLS-1$
-		LicensingImages.declareImages(AgreementsEditPlugin.class, paths);
-	}
-
-}
diff --git a/bundles/org.eclipse.passage.lic.agreements.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.agreements.model/META-INF/MANIFEST.MF
index 48098bb61..9cce33686 100644
--- a/bundles/org.eclipse.passage.lic.agreements.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.agreements.model/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Export-Package: org.eclipse.passage.lic.agreements.model.api,
  org.eclipse.passage.lic.agreements.model.impl;x-internal:=true,
  org.eclipse.passage.lic.agreements.model.meta,
  org.eclipse.passage.lic.agreements.model.util,
- org.eclipse.passage.lic.internal.agreements.model;x-friends:="org.eclipse.passage.loc.dashboard.ui",
+ org.eclipse.passage.lic.internal.agreements.model;x-internal:=true,
  org.eclipse.passage.lic.internal.agreements.model.util;x-internal:=true
 Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF
index 6f33520aa..e69f06ff8 100644
--- a/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Export-Package: org.eclipse.passage.lic.base,
  org.eclipse.passage.lic.internal.base.access;x-internal:=true,
  org.eclipse.passage.lic.internal.base.access.storage;x-internal:=true,
  org.eclipse.passage.lic.internal.base.conditions;x-internal:=true,
- org.eclipse.passage.lic.internal.base.inspection.hardware;x-friends:="org.eclipse.passage.loc.licenses.core,org.eclipse.passage.lic.oshi",
+ org.eclipse.passage.lic.internal.base.inspection.hardware;x-friends:="org.eclipse.passage.lic.oshi",
  org.eclipse.passage.lic.internal.base.requirements;x-internal:=true,
  org.eclipse.passage.lic.internal.base.time;x-friends:="org.eclipse.passage.lic.base.tests"
 Import-Package: org.slf4j;version="1.7.36"
diff --git a/bundles/org.eclipse.passage.lic.e4.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.e4.core/META-INF/MANIFEST.MF
index c5a0256ab..3680dd234 100644
--- a/bundles/org.eclipse.passage.lic.e4.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.e4.core/META-INF/MANIFEST.MF
@@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.core.commands;bundle-version="0.0.0",
  org.eclipse.e4.core.services;bundle-version="0.0.0",
  org.eclipse.e4.core.contexts;bundle-version="0.0.0",
  org.eclipse.e4.core.commands;bundle-version="0.0.0"
-Export-Package: org.eclipse.passage.lic.internal.e4.core.commands;x-friends:="org.eclipse.passage.loc.workbench,org.eclipse.passage.loc.dashboard.ui"
+Export-Package: org.eclipse.passage.lic.internal.e4.core.commands;x-internal:=true
diff --git a/bundles/org.eclipse.passage.lic.e4.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.e4.ui/META-INF/MANIFEST.MF
index 70b1d45f7..74e891e6b 100644
--- a/bundles/org.eclipse.passage.lic.e4.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.e4.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.jface;bundle-version="0.0.0",
  org.eclipse.e4.ui.di;bundle-version="0.0.0",
  org.eclipse.passage.lic.equinox;bundle-version="0.0.0",
  org.eclipse.passage.lic.jface;bundle-version="0.0.0"
-Import-Package: javax.inject;version="1.0.0",
+Import-Package: jakarta.inject;version="2.0.1",
  org.osgi.service.event;version="1.0.0"
 Export-Package: org.eclipse.passage.lic.e4.ui.addons;x-internal:=true,
  org.eclipse.passage.lic.internal.e4.ui.handlers;x-internal:=true,
diff --git a/bundles/org.eclipse.passage.lic.e4.ui/src/org/eclipse/passage/lic/e4/ui/addons/E4LicensingAddon.java b/bundles/org.eclipse.passage.lic.e4.ui/src/org/eclipse/passage/lic/e4/ui/addons/E4LicensingAddon.java
index 14605a3e9..2ebb3eee4 100644
--- a/bundles/org.eclipse.passage.lic.e4.ui/src/org/eclipse/passage/lic/e4/ui/addons/E4LicensingAddon.java
+++ b/bundles/org.eclipse.passage.lic.e4.ui/src/org/eclipse/passage/lic/e4/ui/addons/E4LicensingAddon.java
@@ -12,8 +12,6 @@
  *******************************************************************************/
 package org.eclipse.passage.lic.e4.ui.addons;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.di.UIEventTopic;
@@ -33,6 +31,8 @@
 import org.eclipse.swt.widgets.Shell;
 import org.osgi.service.event.Event;
 
+import jakarta.inject.Inject;
+
 /**
  * @since 2.1
  */
diff --git a/bundles/org.eclipse.passage.lic.e4.ui/src/org/eclipse/passage/lic/e4/ui/addons/E4LicensingProcessor.java b/bundles/org.eclipse.passage.lic.e4.ui/src/org/eclipse/passage/lic/e4/ui/addons/E4LicensingProcessor.java
index 2d4c0c4a7..a52b7c5ba 100644
--- a/bundles/org.eclipse.passage.lic.e4.ui/src/org/eclipse/passage/lic/e4/ui/addons/E4LicensingProcessor.java
+++ b/bundles/org.eclipse.passage.lic.e4.ui/src/org/eclipse/passage/lic/e4/ui/addons/E4LicensingProcessor.java
@@ -12,13 +12,13 @@
  *******************************************************************************/
 package org.eclipse.passage.lic.e4.ui.addons;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.ui.model.application.MAddon;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.MApplicationFactory;
 
+import jakarta.inject.Inject;
+
 /**
  * @since 2.1
  */
diff --git a/bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF
index 0fe89d688..ee4a1fce0 100644
--- a/bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF
@@ -34,7 +34,7 @@ Export-Package: org.eclipse.passage.lic.emf;x-internal:=true,
    org.eclipse.passage.lic.products.model,
    org.eclipse.passage.lic.users.model",
  org.eclipse.passage.lic.internal.emf;x-friends:="org.eclipse.passage.lic.net",
- org.eclipse.passage.lic.internal.emf.i18n;x-friends:="org.eclipse.passage.loc.equinox",
+ org.eclipse.passage.lic.internal.emf.i18n;x-internal:=true,
  org.eclipse.passage.lic.internal.emf.migration;
   x-friends:="org.eclipse.passage.lic.features.model,
    org.eclipse.passage.lic.keys.model,
diff --git a/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF
index 9800353b2..2fe06ccc5 100644
--- a/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF
@@ -17,13 +17,9 @@ Export-Package: org.eclipse.passage.lic.equinox;x-internal:=true,
  org.eclipse.passage.lic.equinox.conditions;x-internal:=true,
  org.eclipse.passage.lic.equinox.io;x-internal:=true,
  org.eclipse.passage.lic.equinox.requirements;x-internal:=true,
- org.eclipse.passage.lic.internal.equinox;x-friends:="org.eclipse.passage.loc.licenses.core,org.eclipse.passage.lic.jetty",
+ org.eclipse.passage.lic.internal.equinox;x-internal:=true,
  org.eclipse.passage.lic.internal.equinox.access;x-internal:=true,
- org.eclipse.passage.lic.internal.equinox.events;
-  x-friends:="org.eclipse.passage.loc.features.core,
-   org.eclipse.passage.loc.products.core,
-   org.eclipse.passage.loc.licenses.core,
-   org.eclipse.passage.loc.users.core"
+ org.eclipse.passage.lic.internal.equinox.events;x-internal:=true
 Import-Package: org.osgi.service.component.runtime;version="1.0.0",
  org.osgi.service.component.runtime.dto;version="1.0.0",
  org.osgi.service.event;version="1.0.0",
diff --git a/bundles/org.eclipse.passage.lic.features.e4.ui/.classpath b/bundles/org.eclipse.passage.lic.features.e4.ui/.classpath
deleted file mode 100644
index 81fe078c2..000000000
--- a/bundles/org.eclipse.passage.lic.features.e4.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.passage.lic.features.e4.ui/.project b/bundles/org.eclipse.passage.lic.features.e4.ui/.project
deleted file mode 100644
index 174b63b37..000000000
--- a/bundles/org.eclipse.passage.lic.features.e4.ui/.project
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.passage.lic.features.e4.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-	<linkedResources>
-     <link>
-            <name>.settings</name>
-            <type>2</type>
-            <locationURI>$%7BPARENT-2-PROJECT_LOC%7D/.settings</locationURI>
-        </link>
- </linkedResources>
-</projectDescription>
diff --git a/bundles/org.eclipse.passage.lic.features.e4.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.features.e4.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 20d4f24de..000000000
--- a/bundles/org.eclipse.passage.lic.features.e4.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: org.eclipse.passage.lic.features.e4.ui
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.passage.lic.features.e4.ui;singleton:=true
-Bundle-Version: 3.1.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Copyright: %Bundle-Copyright
-Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.jface;bundle-version="0.0.0",
- org.eclipse.e4.core.di;bundle-version="0.0.0",
- org.eclipse.e4.core.services;bundle-version="0.0.0",
- org.eclipse.e4.core.contexts;bundle-version="0.0.0",
- org.eclipse.e4.ui.workbench;bundle-version="0.0.0",
- org.eclipse.passage.lic.jface;bundle-version="0.0.0",
- org.eclipse.passage.lic.features.edit;bundle-version="0.0.0"
-Import-Package: javax.inject;version="1.0.0"
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.features.e4.ui/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.features.e4.ui/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index c709cb856..000000000
--- a/bundles/org.eclipse.passage.lic.features.e4.ui/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2018, 2024 ArSysOp and others
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/.
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Features E4 UI
-Bundle-Vendor = Eclipse Passage
-Bundle-Copyright = Copyright (c) 2018, 2024 ArSysOp and others.\n\
-\n\
-This program and the accompanying materials are made\n\
-available under the terms of the Eclipse Public License 2.0\n\
-which is available at https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.features.e4.ui/about.html b/bundles/org.eclipse.passage.lic.features.e4.ui/about.html
deleted file mode 100644
index 164f781a8..000000000
--- a/bundles/org.eclipse.passage.lic.features.e4.ui/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
-	<h2>About This Content</h2>
-
-	<p>November 30, 2017</p>
-	<h3>License</h3>
-
-	<p>
-		The Eclipse Foundation makes available all content in this plug-in
-		(&quot;Content&quot;). Unless otherwise indicated below, the Content
-		is provided to you under the terms and conditions of the Eclipse
-		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
-		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-		For purposes of the EPL, &quot;Program&quot; will mean the Content.
-	</p>
-
-	<p>
-		If you did not receive this Content directly from the Eclipse
-		Foundation, the Content is being redistributed by another party
-		(&quot;Redistributor&quot;) and different terms and conditions may
-		apply to your use of any object code in the Content. Check the
-		Redistributor's license that was provided with the Content. If no such
-		license exists, contact the Redistributor. Unless otherwise indicated
-		below, the terms and conditions of the EPL still apply to any source
-		code in the Content and such source code may be obtained at <a
-			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
-	</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.features.e4.ui/build.properties b/bundles/org.eclipse.passage.lic.features.e4.ui/build.properties
deleted file mode 100644
index eb681f81d..000000000
--- a/bundles/org.eclipse.passage.lic.features.e4.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2018, 2020 ArSysOp and others
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/.
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/,\
-               plugin.xml,\
-               about.html
diff --git a/bundles/org.eclipse.passage.lic.features.e4.ui/plugin.xml b/bundles/org.eclipse.passage.lic.features.e4.ui/plugin.xml
deleted file mode 100644
index 5f0959a8f..000000000
--- a/bundles/org.eclipse.passage.lic.features.e4.ui/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<!--
-	Copyright (c) 2018, 2020 ArSysOp and others
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	https://www.eclipse.org/legal/epl-2.0/.
-
-	SPDX-License-Identifier: EPL-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<plugin>
-   <extension
-         id="org.eclipse.passage.lic.features.e4.ui.resources"
-         point="org.eclipse.e4.workbench.model">
-      <processor
-            apply="always"
-            beforefragment="true"
-            class="org.eclipse.passage.lic.internal.features.e4.ui.FeaturesE4UiProcessor">
-      </processor>
-   </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.passage.lic.features.e4.ui/src/org/eclipse/passage/lic/internal/features/e4/ui/FeaturesE4UiProcessor.java b/bundles/org.eclipse.passage.lic.features.e4.ui/src/org/eclipse/passage/lic/internal/features/e4/ui/FeaturesE4UiProcessor.java
deleted file mode 100644
index 7aaca454e..000000000
--- a/bundles/org.eclipse.passage.lic.features.e4.ui/src/org/eclipse/passage/lic/internal/features/e4/ui/FeaturesE4UiProcessor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018, 2020 ArSysOp
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package org.eclipse.passage.lic.internal.features.e4.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.passage.lic.features.edit.FeaturesEditPlugin;
-import org.eclipse.passage.lic.features.model.meta.FeaturesPackage;
-import org.eclipse.passage.lic.jface.resource.LicensingImages;
-import org.eclipse.swt.widgets.Display;
-
-public class FeaturesE4UiProcessor {
-
-	@Execute
-	void process(IEclipseContext context) {
-		Display display = context.get(Display.class);
-		if (display != null) {
-			doRegisterImages();
-		}
-	}
-
-	private void doRegisterImages() {
-		LicensingImages.getImageRegistry();
-		String pattern = "$nl$/icons/full/obj16/%s"; //$NON-NLS-1$
-
-		registerFeatures(pattern);
-	}
-
-	private void registerFeatures(String pattern) {
-		Map<String, String> paths = new HashMap<String, String>();
-		FeaturesPackage features = FeaturesPackage.eINSTANCE;
-		paths.put(features.getName(), String.format(pattern, "feature.png")); //$NON-NLS-1$
-		paths.put(features.getFeatureSet().getName(), String.format(pattern, "feature.png")); //$NON-NLS-1$
-		paths.put(features.getFeature().getName(), String.format(pattern, "feature.png")); //$NON-NLS-1$
-		paths.put(features.getFeatureVersion().getName(), String.format(pattern, "feature.png")); //$NON-NLS-1$
-		LicensingImages.declareImages(FeaturesEditPlugin.class, paths);
-	}
-
-}
diff --git a/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF
index db86d9bb1..995eb8557 100644
--- a/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Export-Package: org.eclipse.passage.lic.features.model.api,
  org.eclipse.passage.lic.features.model.impl;x-internal:=true,
  org.eclipse.passage.lic.features.model.meta,
  org.eclipse.passage.lic.features.model.util,
- org.eclipse.passage.lic.internal.features.model;x-friends:="org.eclipse.passage.loc.dashboard.ui",
+ org.eclipse.passage.lic.internal.features.model;x-internal:=true,
  org.eclipse.passage.lic.internal.features.model.util;x-internal:=true
 Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF
index a2fd7329b..a6691b0fd 100644
--- a/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF
@@ -13,24 +13,17 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.passage.lic.api;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.base;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.equinox;bundle-version="0.0.0"
-Export-Package: org.eclipse.passage.lic.internal.jface.dialogs.licensing;x-friends:="org.eclipse.passage.lic.e4.ui,org.eclipse.passage.loc.dashboard.ui,org.eclipse.passage.loc.licenses.ui",
- org.eclipse.passage.lic.jface;x-friends:="org.eclipse.passage.loc.workbench",
+Export-Package: org.eclipse.passage.lic.internal.jface.dialogs.licensing;x-friends:="org.eclipse.passage.lic.e4.ui",
+ org.eclipse.passage.lic.jface;x-internal:=true,
  org.eclipse.passage.lic.jface.actions;x-internal:=true,
  org.eclipse.passage.lic.jface.resource;
-  x-friends:="org.eclipse.passage.loc.dashboard.ui,
-   org.eclipse.passage.loc.workbench,
-   org.eclipse.passage.loc.users.ui,
-   org.eclipse.passage.lic.floating.e4.ui,
-   org.eclipse.passage.lic.licenses.e4.ui,
+  x-friends:="org.eclipse.passage.lic.agreements.e4.ui,
    org.eclipse.passage.lic.e4.ui,
    org.eclipse.passage.lic.features.e4.ui,
+   org.eclipse.passage.lic.floating.e4.ui,
+   org.eclipse.passage.lic.licenses.e4.ui,
    org.eclipse.passage.lic.products.e4.ui,
-   org.eclipse.passage.lic.users.e4.ui,
-   org.eclipse.passage.loc.workbench.emfforms,
-   org.eclipse.passage.loc.products.ui,
-   org.eclipse.passage.loc.licenses.ui,
-   org.eclipse.passage.loc.edit.ui,
-   org.eclipse.passage.lic.agreements.e4.ui",
- org.eclipse.passage.lic.jface.widgets;x-friends:="org.eclipse.passage.loc.workbench"
+   org.eclipse.passage.lic.users.e4.ui",
+ org.eclipse.passage.lic.jface.widgets;x-internal:=true
 Import-Package: org.slf4j;version="[1.7.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.licenses.e4.ui/.classpath b/bundles/org.eclipse.passage.lic.licenses.e4.ui/.classpath
deleted file mode 100644
index 81fe078c2..000000000
--- a/bundles/org.eclipse.passage.lic.licenses.e4.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.passage.lic.licenses.e4.ui/.project b/bundles/org.eclipse.passage.lic.licenses.e4.ui/.project
deleted file mode 100644
index 7e870f262..000000000
--- a/bundles/org.eclipse.passage.lic.licenses.e4.ui/.project
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.passage.lic.licenses.e4.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-	<linkedResources>
-     <link>
-            <name>.settings</name>
-            <type>2</type>
-            <locationURI>$%7BPARENT-2-PROJECT_LOC%7D/.settings</locationURI>
-        </link>
- </linkedResources>
-</projectDescription>
diff --git a/bundles/org.eclipse.passage.lic.licenses.e4.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.licenses.e4.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index bfe048666..000000000
--- a/bundles/org.eclipse.passage.lic.licenses.e4.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: org.eclipse.passage.lic.licenses.e4.ui
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.passage.lic.licenses.e4.ui;singleton:=true
-Bundle-Version: 3.1.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Copyright: %Bundle-Copyright
-Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.jface;bundle-version="0.0.0",
- org.eclipse.e4.core.di;bundle-version="0.0.0",
- org.eclipse.e4.core.services;bundle-version="0.0.0",
- org.eclipse.e4.core.contexts;bundle-version="0.0.0",
- org.eclipse.e4.ui.workbench;bundle-version="0.0.0",
- org.eclipse.passage.lic.jface;bundle-version="0.0.0",
- org.eclipse.passage.lic.licenses.edit;bundle-version="0.0.0"
-Import-Package: javax.inject;version="1.0.0"
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.licenses.e4.ui/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.licenses.e4.ui/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 297749cf2..000000000
--- a/bundles/org.eclipse.passage.lic.licenses.e4.ui/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2018, 2024 ArSysOp and others
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/.
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Licenses E4 UI
-Bundle-Vendor = Eclipse Passage
-Bundle-Copyright = Copyright (c) 2018, 2024 ArSysOp and others.\n\
-\n\
-This program and the accompanying materials are made\n\
-available under the terms of the Eclipse Public License 2.0\n\
-which is available at https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.licenses.e4.ui/about.html b/bundles/org.eclipse.passage.lic.licenses.e4.ui/about.html
deleted file mode 100644
index 164f781a8..000000000
--- a/bundles/org.eclipse.passage.lic.licenses.e4.ui/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
-	<h2>About This Content</h2>
-
-	<p>November 30, 2017</p>
-	<h3>License</h3>
-
-	<p>
-		The Eclipse Foundation makes available all content in this plug-in
-		(&quot;Content&quot;). Unless otherwise indicated below, the Content
-		is provided to you under the terms and conditions of the Eclipse
-		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
-		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-		For purposes of the EPL, &quot;Program&quot; will mean the Content.
-	</p>
-
-	<p>
-		If you did not receive this Content directly from the Eclipse
-		Foundation, the Content is being redistributed by another party
-		(&quot;Redistributor&quot;) and different terms and conditions may
-		apply to your use of any object code in the Content. Check the
-		Redistributor's license that was provided with the Content. If no such
-		license exists, contact the Redistributor. Unless otherwise indicated
-		below, the terms and conditions of the EPL still apply to any source
-		code in the Content and such source code may be obtained at <a
-			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
-	</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.licenses.e4.ui/build.properties b/bundles/org.eclipse.passage.lic.licenses.e4.ui/build.properties
deleted file mode 100644
index eb681f81d..000000000
--- a/bundles/org.eclipse.passage.lic.licenses.e4.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2018, 2020 ArSysOp and others
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/.
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/,\
-               plugin.xml,\
-               about.html
diff --git a/bundles/org.eclipse.passage.lic.licenses.e4.ui/plugin.xml b/bundles/org.eclipse.passage.lic.licenses.e4.ui/plugin.xml
deleted file mode 100644
index 55ded24a3..000000000
--- a/bundles/org.eclipse.passage.lic.licenses.e4.ui/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<!--
-	Copyright (c) 2018, 2020 ArSysOp and others
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	https://www.eclipse.org/legal/epl-2.0/.
-
-	SPDX-License-Identifier: EPL-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<plugin>
-   <extension
-         id="org.eclipse.passage.lic.licenses.e4.ui.resources"
-         point="org.eclipse.e4.workbench.model">
-      <processor
-            apply="always"
-            beforefragment="true"
-            class="org.eclipse.passage.lic.internal.licenses.e4.ui.LicensesE4UiProcessor">
-      </processor>
-   </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.passage.lic.licenses.e4.ui/src/org/eclipse/passage/lic/internal/licenses/e4/ui/LicensesE4UiProcessor.java b/bundles/org.eclipse.passage.lic.licenses.e4.ui/src/org/eclipse/passage/lic/internal/licenses/e4/ui/LicensesE4UiProcessor.java
deleted file mode 100644
index 2a5eb51de..000000000
--- a/bundles/org.eclipse.passage.lic.licenses.e4.ui/src/org/eclipse/passage/lic/internal/licenses/e4/ui/LicensesE4UiProcessor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018, 2021 ArSysOp
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package org.eclipse.passage.lic.internal.licenses.e4.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.passage.lic.jface.resource.LicensingImages;
-import org.eclipse.passage.lic.licenses.edit.LicensesEditPlugin;
-import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage;
-import org.eclipse.swt.widgets.Display;
-
-@SuppressWarnings("restriction")
-public class LicensesE4UiProcessor {
-
-	@Execute
-	void process(IEclipseContext context) {
-		Display display = context.get(Display.class);
-		if (display != null) {
-			doRegisterImages();
-		}
-	}
-
-	private void doRegisterImages() {
-		LicensingImages.getImageRegistry();
-		String pattern = "$nl$/icons/full/obj16/%s"; //$NON-NLS-1$
-
-		registerLicenses(pattern);
-	}
-
-	private void registerLicenses(String pattern) {
-		Map<String, String> paths = new HashMap<String, String>();
-		LicensesPackage licenses = LicensesPackage.eINSTANCE;
-		paths.put(licenses.getName(), String.format(pattern, "license.png")); //$NON-NLS-1$
-		paths.put(licenses.getLicensePlan().getName(), String.format(pattern, "license.png")); //$NON-NLS-1$
-		paths.put(licenses.getLicensePlanFeature().getName(), String.format(pattern, "license.png")); //$NON-NLS-1$
-		paths.put(licenses.getPersonalLicensePack().getName(), String.format(pattern, "license.png")); //$NON-NLS-1$
-		paths.put(licenses.getFloatingLicensePack().getName(), String.format(pattern, "license.png")); //$NON-NLS-1$
-		paths.put(licenses.getPersonalFeatureGrant().getName(), String.format(pattern, "license.png")); //$NON-NLS-1$
-		LicensingImages.declareImages(LicensesEditPlugin.class, paths);
-	}
-
-}
diff --git a/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF
index 9db6d2976..2e8451927 100644
--- a/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";x-installation:=
  org.eclipse.passage.lic.licenses;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.base;bundle-version="0.0.0"
 Export-Package: org.eclipse.passage.lic.internal.licenses.convert;x-internal:=true,
- org.eclipse.passage.lic.internal.licenses.model;x-friends:="org.eclipse.passage.lic.licenses.migration,org.eclipse.passage.loc.dashboard.ui,org.eclipse.passage.loc.licenses.core",
+ org.eclipse.passage.lic.internal.licenses.model;x-friends:="org.eclipse.passage.lic.licenses.migration",
  org.eclipse.passage.lic.internal.licenses.model.signature;x-internal:=true,
  org.eclipse.passage.lic.internal.licenses.model.util;x-internal:=true,
  org.eclipse.passage.lic.licenses.model.api,
diff --git a/bundles/org.eclipse.passage.lic.products.e4.ui/.classpath b/bundles/org.eclipse.passage.lic.products.e4.ui/.classpath
deleted file mode 100644
index 81fe078c2..000000000
--- a/bundles/org.eclipse.passage.lic.products.e4.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.passage.lic.products.e4.ui/.project b/bundles/org.eclipse.passage.lic.products.e4.ui/.project
deleted file mode 100644
index 69cd3fcf6..000000000
--- a/bundles/org.eclipse.passage.lic.products.e4.ui/.project
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.passage.lic.products.e4.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-	<linkedResources>
-     <link>
-            <name>.settings</name>
-            <type>2</type>
-            <locationURI>$%7BPARENT-2-PROJECT_LOC%7D/.settings</locationURI>
-        </link>
- </linkedResources>
-</projectDescription>
diff --git a/bundles/org.eclipse.passage.lic.products.e4.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.products.e4.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 21a988f8f..000000000
--- a/bundles/org.eclipse.passage.lic.products.e4.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: org.eclipse.passage.lic.products.e4.ui
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.passage.lic.products.e4.ui;singleton:=true
-Bundle-Version: 3.1.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Copyright: %Bundle-Copyright
-Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.jface;bundle-version="0.0.0",
- org.eclipse.e4.core.di;bundle-version="0.0.0",
- org.eclipse.e4.core.services;bundle-version="0.0.0",
- org.eclipse.e4.core.contexts;bundle-version="0.0.0",
- org.eclipse.e4.ui.workbench;bundle-version="0.0.0",
- org.eclipse.passage.lic.jface;bundle-version="0.0.0",
- org.eclipse.passage.lic.products.edit;bundle-version="0.0.0"
-Import-Package: javax.inject;version="1.0.0"
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.products.e4.ui/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.products.e4.ui/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 0d67a48a5..000000000
--- a/bundles/org.eclipse.passage.lic.products.e4.ui/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2018, 2024 ArSysOp and others
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/.
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Products E4 UI
-Bundle-Vendor = Eclipse Passage
-Bundle-Copyright = Copyright (c) 2018, 2024 ArSysOp and others.\n\
-\n\
-This program and the accompanying materials are made\n\
-available under the terms of the Eclipse Public License 2.0\n\
-which is available at https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.products.e4.ui/about.html b/bundles/org.eclipse.passage.lic.products.e4.ui/about.html
deleted file mode 100644
index 164f781a8..000000000
--- a/bundles/org.eclipse.passage.lic.products.e4.ui/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
-	<h2>About This Content</h2>
-
-	<p>November 30, 2017</p>
-	<h3>License</h3>
-
-	<p>
-		The Eclipse Foundation makes available all content in this plug-in
-		(&quot;Content&quot;). Unless otherwise indicated below, the Content
-		is provided to you under the terms and conditions of the Eclipse
-		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
-		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-		For purposes of the EPL, &quot;Program&quot; will mean the Content.
-	</p>
-
-	<p>
-		If you did not receive this Content directly from the Eclipse
-		Foundation, the Content is being redistributed by another party
-		(&quot;Redistributor&quot;) and different terms and conditions may
-		apply to your use of any object code in the Content. Check the
-		Redistributor's license that was provided with the Content. If no such
-		license exists, contact the Redistributor. Unless otherwise indicated
-		below, the terms and conditions of the EPL still apply to any source
-		code in the Content and such source code may be obtained at <a
-			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
-	</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.products.e4.ui/build.properties b/bundles/org.eclipse.passage.lic.products.e4.ui/build.properties
deleted file mode 100644
index eb681f81d..000000000
--- a/bundles/org.eclipse.passage.lic.products.e4.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2018, 2020 ArSysOp and others
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/.
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/,\
-               plugin.xml,\
-               about.html
diff --git a/bundles/org.eclipse.passage.lic.products.e4.ui/plugin.xml b/bundles/org.eclipse.passage.lic.products.e4.ui/plugin.xml
deleted file mode 100644
index 1c26eb42f..000000000
--- a/bundles/org.eclipse.passage.lic.products.e4.ui/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<!--
-	Copyright (c) 2018, 2020 ArSysOp and others
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	https://www.eclipse.org/legal/epl-2.0/.
-
-	SPDX-License-Identifier: EPL-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<plugin>
-   <extension
-         id="org.eclipse.passage.lic.products.e4.ui.resources"
-         point="org.eclipse.e4.workbench.model">
-      <processor
-            apply="always"
-            beforefragment="true"
-            class="org.eclipse.passage.lic.internal.products.e4.ui.ProductsE4UiProcessor">
-      </processor>
-   </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.passage.lic.products.e4.ui/src/org/eclipse/passage/lic/internal/products/e4/ui/ProductsE4UiProcessor.java b/bundles/org.eclipse.passage.lic.products.e4.ui/src/org/eclipse/passage/lic/internal/products/e4/ui/ProductsE4UiProcessor.java
deleted file mode 100644
index 15cf11861..000000000
--- a/bundles/org.eclipse.passage.lic.products.e4.ui/src/org/eclipse/passage/lic/internal/products/e4/ui/ProductsE4UiProcessor.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018, 2020 ArSysOp
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package org.eclipse.passage.lic.internal.products.e4.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.passage.lic.jface.resource.LicensingImages;
-import org.eclipse.passage.lic.products.edit.ProductsEditPlugin;
-import org.eclipse.passage.lic.products.model.meta.ProductsPackage;
-import org.eclipse.swt.widgets.Display;
-
-public class ProductsE4UiProcessor {
-
-	@Execute
-	void process(IEclipseContext context) {
-		Display display = context.get(Display.class);
-		if (display != null) {
-			doRegisterImages();
-		}
-	}
-
-	private void doRegisterImages() {
-		LicensingImages.getImageRegistry();
-		String pattern = "$nl$/icons/full/obj16/%s"; //$NON-NLS-1$
-
-		registerProducts(pattern);
-	}
-
-	private void registerProducts(String pattern) {
-		Map<String, String> paths = new HashMap<String, String>();
-		ProductsPackage products = ProductsPackage.eINSTANCE;
-		paths.put(products.getName(), String.format(pattern, "product.png")); //$NON-NLS-1$
-		paths.put(products.getProductLine().getName(), String.format(pattern, "product.png")); //$NON-NLS-1$
-		paths.put(products.getProduct().getName(), String.format(pattern, "product.png")); //$NON-NLS-1$
-		paths.put(products.getProductVersion().getName(), String.format(pattern, "product.png")); //$NON-NLS-1$
-		paths.put(products.getProductVersionFeature().getName(), String.format(pattern, "product.png")); //$NON-NLS-1$
-		LicensingImages.declareImages(ProductsEditPlugin.class, paths);
-	}
-
-}
diff --git a/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF
index 05c66c9dd..65f44055f 100644
--- a/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";x-installation:=
  org.eclipse.emf.ecore.xmi;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.emf;bundle-version="0.0.0",
  org.eclipse.passage.lic.products;bundle-version="0.0.0";visibility:=reexport
-Export-Package: org.eclipse.passage.lic.internal.products.model;x-friends:="org.eclipse.passage.loc.dashboard.ui",
+Export-Package: org.eclipse.passage.lic.internal.products.model;x-internal:=true,
  org.eclipse.passage.lic.internal.products.model.util;x-internal:=true,
  org.eclipse.passage.lic.products.model.api,
  org.eclipse.passage.lic.products.model.impl;x-internal:=true,
diff --git a/bundles/org.eclipse.passage.lic.users.e4.ui/.classpath b/bundles/org.eclipse.passage.lic.users.e4.ui/.classpath
deleted file mode 100644
index 81fe078c2..000000000
--- a/bundles/org.eclipse.passage.lic.users.e4.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.passage.lic.users.e4.ui/.project b/bundles/org.eclipse.passage.lic.users.e4.ui/.project
deleted file mode 100644
index ba2db05ca..000000000
--- a/bundles/org.eclipse.passage.lic.users.e4.ui/.project
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.passage.lic.users.e4.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-	<linkedResources>
-     <link>
-            <name>.settings</name>
-            <type>2</type>
-            <locationURI>$%7BPARENT-2-PROJECT_LOC%7D/.settings</locationURI>
-        </link>
- </linkedResources>
-</projectDescription>
diff --git a/bundles/org.eclipse.passage.lic.users.e4.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.users.e4.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index a2292df39..000000000
--- a/bundles/org.eclipse.passage.lic.users.e4.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: org.eclipse.passage.lic.users.e4.ui
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.passage.lic.users.e4.ui;singleton:=true
-Bundle-Version: 3.1.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Copyright: %Bundle-Copyright
-Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.jface;bundle-version="0.0.0",
- org.eclipse.e4.core.di;bundle-version="0.0.0",
- org.eclipse.e4.core.services;bundle-version="0.0.0",
- org.eclipse.e4.core.contexts;bundle-version="0.0.0",
- org.eclipse.e4.ui.workbench;bundle-version="0.0.0",
- org.eclipse.passage.lic.jface;bundle-version="0.0.0",
- org.eclipse.passage.lic.users.edit;bundle-version="0.0.0"
-Import-Package: javax.inject;version="1.0.0"
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.users.e4.ui/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.users.e4.ui/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 86996f014..000000000
--- a/bundles/org.eclipse.passage.lic.users.e4.ui/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2018, 2024 ArSysOp and others
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/.
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-Bundle-Name = Passage LIC Users E4 UI
-Bundle-Vendor = Eclipse Passage
-Bundle-Copyright = Copyright (c) 2018, 2024 ArSysOp and others.\n\
-\n\
-This program and the accompanying materials are made\n\
-available under the terms of the Eclipse Public License 2.0\n\
-which is available at https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.users.e4.ui/about.html b/bundles/org.eclipse.passage.lic.users.e4.ui/about.html
deleted file mode 100644
index 164f781a8..000000000
--- a/bundles/org.eclipse.passage.lic.users.e4.ui/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
-	<h2>About This Content</h2>
-
-	<p>November 30, 2017</p>
-	<h3>License</h3>
-
-	<p>
-		The Eclipse Foundation makes available all content in this plug-in
-		(&quot;Content&quot;). Unless otherwise indicated below, the Content
-		is provided to you under the terms and conditions of the Eclipse
-		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
-		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-		For purposes of the EPL, &quot;Program&quot; will mean the Content.
-	</p>
-
-	<p>
-		If you did not receive this Content directly from the Eclipse
-		Foundation, the Content is being redistributed by another party
-		(&quot;Redistributor&quot;) and different terms and conditions may
-		apply to your use of any object code in the Content. Check the
-		Redistributor's license that was provided with the Content. If no such
-		license exists, contact the Redistributor. Unless otherwise indicated
-		below, the terms and conditions of the EPL still apply to any source
-		code in the Content and such source code may be obtained at <a
-			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
-	</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.users.e4.ui/build.properties b/bundles/org.eclipse.passage.lic.users.e4.ui/build.properties
deleted file mode 100644
index eb681f81d..000000000
--- a/bundles/org.eclipse.passage.lic.users.e4.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2018, 2020 ArSysOp and others
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/.
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     ArSysOp - initial API and implementation
-###############################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/,\
-               plugin.xml,\
-               about.html
diff --git a/bundles/org.eclipse.passage.lic.users.e4.ui/plugin.xml b/bundles/org.eclipse.passage.lic.users.e4.ui/plugin.xml
deleted file mode 100644
index e9c43a50e..000000000
--- a/bundles/org.eclipse.passage.lic.users.e4.ui/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<!--
-	Copyright (c) 2018, 2020 ArSysOp and others
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	https://www.eclipse.org/legal/epl-2.0/.
-
-	SPDX-License-Identifier: EPL-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<plugin>
-   <extension
-         id="org.eclipse.passage.lic.users.e4.ui.resources"
-         point="org.eclipse.e4.workbench.model">
-      <processor
-            apply="always"
-            beforefragment="true"
-            class="org.eclipse.passage.lic.internal.users.e4.ui.UsersE4UiProcessor">
-      </processor>
-   </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.passage.lic.users.e4.ui/src/org/eclipse/passage/lic/internal/users/e4/ui/UsersE4UiProcessor.java b/bundles/org.eclipse.passage.lic.users.e4.ui/src/org/eclipse/passage/lic/internal/users/e4/ui/UsersE4UiProcessor.java
deleted file mode 100644
index 223132035..000000000
--- a/bundles/org.eclipse.passage.lic.users.e4.ui/src/org/eclipse/passage/lic/internal/users/e4/ui/UsersE4UiProcessor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018, 2020 ArSysOp
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package org.eclipse.passage.lic.internal.users.e4.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.passage.lic.jface.resource.LicensingImages;
-import org.eclipse.passage.lic.users.edit.UsersEditPlugin;
-import org.eclipse.passage.lic.users.model.meta.UsersPackage;
-import org.eclipse.swt.widgets.Display;
-
-public class UsersE4UiProcessor {
-
-	@Execute
-	void process(IEclipseContext context) {
-		Display display = context.get(Display.class);
-		if (display != null) {
-			doRegisterImages();
-		}
-	}
-
-	private void doRegisterImages() {
-		LicensingImages.getImageRegistry();
-		String pattern = "$nl$/icons/full/obj16/%s"; //$NON-NLS-1$
-
-		registerUsers(pattern);
-	}
-
-	private void registerUsers(String pattern) {
-		Map<String, String> paths = new HashMap<String, String>();
-		UsersPackage users = UsersPackage.eINSTANCE;
-		paths.put(users.getName(), String.format(pattern, "user.png")); //$NON-NLS-1$
-		paths.put(users.getUserOrigin().getName(), String.format(pattern, "user.png")); //$NON-NLS-1$
-		paths.put(users.getUser().getName(), String.format(pattern, "user.png")); //$NON-NLS-1$
-		LicensingImages.declareImages(UsersEditPlugin.class, paths);
-	}
-
-}
diff --git a/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF
index 45ceaf0cf..2a6215298 100644
--- a/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";x-installation:=
  org.eclipse.emf.ecore.xmi;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.emf;bundle-version="0.0.0",
  org.eclipse.passage.lic.users;bundle-version="0.0.0";visibility:=reexport
-Export-Package: org.eclipse.passage.lic.internal.users.model;x-friends:="org.eclipse.passage.loc.dashboard.ui",
+Export-Package: org.eclipse.passage.lic.internal.users.model;x-internal:=true,
  org.eclipse.passage.lic.internal.users.model.util;x-internal:=true,
  org.eclipse.passage.lic.users.model.api,
  org.eclipse.passage.lic.users.model.impl;x-internal:=true,
diff --git a/features/org.eclipse.passage.lic.agreements.feature/feature.xml b/features/org.eclipse.passage.lic.agreements.feature/feature.xml
index 6de43b1ca..e7279d235 100644
--- a/features/org.eclipse.passage.lic.agreements.feature/feature.xml
+++ b/features/org.eclipse.passage.lic.agreements.feature/feature.xml
@@ -66,11 +66,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.passage.lic.agreements.e4.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/features/org.eclipse.passage.lic.features.feature/feature.xml b/features/org.eclipse.passage.lic.features.feature/feature.xml
index c4139ebce..5b95ec37e 100644
--- a/features/org.eclipse.passage.lic.features.feature/feature.xml
+++ b/features/org.eclipse.passage.lic.features.feature/feature.xml
@@ -66,11 +66,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.passage.lic.features.e4.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/features/org.eclipse.passage.lic.licenses.feature/feature.xml b/features/org.eclipse.passage.lic.licenses.feature/feature.xml
index 11709374e..3b56b3a47 100644
--- a/features/org.eclipse.passage.lic.licenses.feature/feature.xml
+++ b/features/org.eclipse.passage.lic.licenses.feature/feature.xml
@@ -66,11 +66,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.passage.lic.licenses.e4.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/features/org.eclipse.passage.lic.products.feature/feature.xml b/features/org.eclipse.passage.lic.products.feature/feature.xml
index 9dbb0cd8a..656b41b37 100644
--- a/features/org.eclipse.passage.lic.products.feature/feature.xml
+++ b/features/org.eclipse.passage.lic.products.feature/feature.xml
@@ -66,11 +66,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.passage.lic.products.e4.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/features/org.eclipse.passage.lic.users.feature/feature.xml b/features/org.eclipse.passage.lic.users.feature/feature.xml
index 583931eda..24d15190a 100644
--- a/features/org.eclipse.passage.lic.users.feature/feature.xml
+++ b/features/org.eclipse.passage.lic.users.feature/feature.xml
@@ -66,11 +66,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.passage.lic.users.e4.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/releng/org.eclipse.passage.lic.aggregator/pom.xml b/releng/org.eclipse.passage.lic.aggregator/pom.xml
index 19fc41e5d..653eceacd 100644
--- a/releng/org.eclipse.passage.lic.aggregator/pom.xml
+++ b/releng/org.eclipse.passage.lic.aggregator/pom.xml
@@ -62,7 +62,6 @@
 		<module>../../bundles/org.eclipse.passage.lic.features.ecore</module>
 		<module>../../bundles/org.eclipse.passage.lic.features.model</module>
 		<module>../../bundles/org.eclipse.passage.lic.features.edit</module>
-		<module>../../bundles/org.eclipse.passage.lic.features.e4.ui</module>
 		<module>../../features/org.eclipse.passage.lic.features.feature</module>
 		<module>../../tests/org.eclipse.passage.lic.features.model.tests</module>
 
@@ -70,7 +69,6 @@
 		<module>../../bundles/org.eclipse.passage.lic.products.ecore</module>
 		<module>../../bundles/org.eclipse.passage.lic.products.model</module>
 		<module>../../bundles/org.eclipse.passage.lic.products.edit</module>
-		<module>../../bundles/org.eclipse.passage.lic.products.e4.ui</module>
 		<module>../../features/org.eclipse.passage.lic.products.feature</module>
 		<module>../../tests/org.eclipse.passage.lic.products.model.tests</module>
 
@@ -79,7 +77,6 @@
 		<module>../../bundles/org.eclipse.passage.lic.users.ecore</module>
 		<module>../../bundles/org.eclipse.passage.lic.users.model</module>
 		<module>../../bundles/org.eclipse.passage.lic.users.edit</module>
-		<module>../../bundles/org.eclipse.passage.lic.users.e4.ui</module>
 		<module>../../features/org.eclipse.passage.lic.users.feature</module>
 		<module>../../tests/org.eclipse.passage.lic.users.model.tests</module>
 
@@ -87,7 +84,6 @@
 		<module>../../bundles/org.eclipse.passage.lic.licenses.ecore</module>
 		<module>../../bundles/org.eclipse.passage.lic.licenses.model</module>
 		<module>../../bundles/org.eclipse.passage.lic.licenses.edit</module>
-		<module>../../bundles/org.eclipse.passage.lic.licenses.e4.ui</module>
 		<module>../../features/org.eclipse.passage.lic.licenses.feature</module>
 		<module>../../tests/org.eclipse.passage.lic.licenses.model.tests</module>
 
@@ -101,7 +97,6 @@
 		<module>../../bundles/org.eclipse.passage.lic.agreements.ecore</module>
 		<module>../../bundles/org.eclipse.passage.lic.agreements.model</module>
 		<module>../../bundles/org.eclipse.passage.lic.agreements.edit</module>
-		<module>../../bundles/org.eclipse.passage.lic.agreements.e4.ui</module>
 		<module>../../features/org.eclipse.passage.lic.agreements.feature</module>
 
 		<module>../../bundles/org.eclipse.passage.lic.compile.branding</module>
diff --git a/releng/org.eclipse.passage.target/org.eclipse.passage.target.target b/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
index e379b68a5..d383ad0c2 100644
--- a/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
+++ b/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
@@ -24,11 +24,6 @@
 			<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/ecp/rt/1270/"/>
-			<unit id="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.emfforms.setup.base" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202406110653/"/>
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
@@ -42,6 +37,7 @@
 			<unit id="com.github.oshi.oshi-core" version="0.0.0"/>
 			<unit id="com.sun.jna" version="0.0.0"/>
 			<unit id="com.sun.jna.platform" version="0.0.0"/>
+			<unit id="jakarta.inject.jakarta.inject-api" version="0.0.0"/>
 			<unit id="org.junit" version="0.0.0"/>
 			<unit id="slf4j.api" version="0.0.0"/>
 			<unit id="slf4j.nop" version="0.0.0"/>