Organize imports
diff --git a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupCommands.java b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupCommands.java
index 6aae583..d171ba3 100644
--- a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupCommands.java
+++ b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupCommands.java
@@ -21,7 +21,6 @@
 import org.glassfish.api.admin.*;
 import org.glassfish.api.Param;
 import com.sun.enterprise.admin.cli.*;
-import com.sun.enterprise.admin.cli.*;
 import com.sun.enterprise.admin.servermgmt.cli.LocalDomainCommand;
 import com.sun.enterprise.backup.BackupRequest;
 import com.sun.enterprise.util.ObjectAnalyzer;
diff --git a/appserver/common/annotation-framework/src/main/java/org/glassfish/apf/ProcessingContext.java b/appserver/common/annotation-framework/src/main/java/org/glassfish/apf/ProcessingContext.java
index 2aee3e2..e296a73 100644
--- a/appserver/common/annotation-framework/src/main/java/org/glassfish/apf/ProcessingContext.java
+++ b/appserver/common/annotation-framework/src/main/java/org/glassfish/apf/ProcessingContext.java
@@ -16,7 +16,6 @@
 
 package org.glassfish.apf;
 
-import org.glassfish.apf.Scanner;
 import java.util.Set;
 import org.glassfish.api.deployment.archive.ReadableArchive;
 
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/CallFlowAgent.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/CallFlowAgent.java
index ac91d58..c86e35f 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/CallFlowAgent.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/CallFlowAgent.java
@@ -17,8 +17,6 @@
 package com.sun.enterprise.container.common.spi.util;
 
 import org.jvnet.hk2.annotations.Contract;
-import com.sun.enterprise.container.common.spi.util.EntityManagerMethod;
-import com.sun.enterprise.container.common.spi.util.EntityManagerQueryMethod;
 
 @Contract
 public interface CallFlowAgent {
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/ContainerUtil.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/ContainerUtil.java
index fa7c35b..abe2f1d 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/ContainerUtil.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/ContainerUtil.java
@@ -16,7 +16,6 @@
 
 package com.sun.enterprise.container.common.spi.util;
 
-import com.sun.enterprise.container.common.spi.util.CallFlowAgent;
 import org.glassfish.api.invocation.InvocationManager;
 import org.jvnet.hk2.annotations.Contract;
 
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEIOUtils.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEIOUtils.java
index 5dde1ed..a6f8c6a 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEIOUtils.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEIOUtils.java
@@ -18,8 +18,6 @@
 
 import org.jvnet.hk2.annotations.Contract;
 
-import com.sun.enterprise.container.common.spi.util.GlassFishOutputStreamHandler;
-
 import java.io.*;
 
 /**
diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/NamingUtilsImpl.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/NamingUtilsImpl.java
index 8d011ab..92a3e94 100644
--- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/NamingUtilsImpl.java
+++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/NamingUtilsImpl.java
@@ -18,7 +18,6 @@
 
 import com.sun.enterprise.naming.spi.NamingObjectFactory;
 import com.sun.enterprise.naming.spi.NamingUtils;
-import com.sun.enterprise.naming.util.JndiInitializationNamingObjectFactory;
 
 import org.glassfish.logging.annotation.LogMessageInfo;
 
diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMThreadInfoStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMThreadInfoStats.java
index 88ea1aa..e967bad 100644
--- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMThreadInfoStats.java
+++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMThreadInfoStats.java
@@ -17,7 +17,6 @@
 package com.sun.enterprise.admin.monitor.stats;
 import org.glassfish.j2ee.statistics.Stats;
 import org.glassfish.j2ee.statistics.CountStatistic;
-import com.sun.enterprise.admin.monitor.stats.StringStatistic;
 
 /**
  * A Stats interface, to expose the monitoring information
diff --git a/appserver/connectors/connectors-internal-api/src/test/java/org/glassfish/connectors/config/PasswordAliasTest.java b/appserver/connectors/connectors-internal-api/src/test/java/org/glassfish/connectors/config/PasswordAliasTest.java
index e452050..4dbf26a 100644
--- a/appserver/connectors/connectors-internal-api/src/test/java/org/glassfish/connectors/config/PasswordAliasTest.java
+++ b/appserver/connectors/connectors-internal-api/src/test/java/org/glassfish/connectors/config/PasswordAliasTest.java
@@ -16,7 +16,6 @@
 
 package org.glassfish.connectors.config;
 
-import org.glassfish.connectors.config.BackendPrincipal;
 import org.junit.Ignore;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/AdminObjectConfigParserImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/AdminObjectConfigParserImpl.java
index 31242b8..a6963cb 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/AdminObjectConfigParserImpl.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/AdminObjectConfigParserImpl.java
@@ -22,7 +22,6 @@
 
 import java.util.logging.*;
 import java.util.*;
-import java.lang.*;
 
 import com.sun.enterprise.util.i18n.StringManager;
 import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MCFConfigParserImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MCFConfigParserImpl.java
index 28a773a..248dea3 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MCFConfigParserImpl.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MCFConfigParserImpl.java
@@ -22,7 +22,6 @@
 
 import java.util.logging.*;
 import java.util.*;
-import java.lang.*;
 
 /**
  *  This is managed connection factory configuration parser. It parses the
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MessageListenerConfigParserImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MessageListenerConfigParserImpl.java
index efe0997..d25efd9 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MessageListenerConfigParserImpl.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MessageListenerConfigParserImpl.java
@@ -23,7 +23,6 @@
 
 import java.util.logging.*;
 import java.util.*;
-import java.lang.*;
 
 /**
  *  This is message listener configuration parser. It parses the
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ResourceAdapterConfigParserImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ResourceAdapterConfigParserImpl.java
index 7a37ca9..e02cc21 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ResourceAdapterConfigParserImpl.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ResourceAdapterConfigParserImpl.java
@@ -23,7 +23,6 @@
 
 import java.util.logging.*;
 import java.util.*;
-import java.lang.*;
 
 /**
  * This is Resource Adapter configuration parser. It parses the
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/AnnotationDetector.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/AnnotationDetector.java
index 85a9220..ab7aa60 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/AnnotationDetector.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/AnnotationDetector.java
@@ -19,7 +19,6 @@
 import com.sun.enterprise.deployment.annotation.introspection.AnnotationScanner;
 import com.sun.enterprise.deployment.annotation.introspection.ClassFile;
 import com.sun.enterprise.deployment.annotation.introspection.ConstantPoolInfo;
-import com.sun.enterprise.deployment.util.DOLUtils;
 import org.glassfish.api.deployment.archive.ReadableArchive;
 import org.glassfish.hk2.classmodel.reflect.*;
 
diff --git a/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/JavaEEDeployer.java b/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/JavaEEDeployer.java
index 748da79..f3a31e4 100644
--- a/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/JavaEEDeployer.java
+++ b/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/JavaEEDeployer.java
@@ -33,7 +33,6 @@
 import org.glassfish.deployment.common.DeploymentProperties;
 import com.sun.enterprise.config.serverbeans.ServerTags;
 import org.jvnet.hk2.annotations.Optional;
-import org.glassfish.hk2.api.ServiceLocator;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulSessionContainer.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulSessionContainer.java
index 8b77719..2c9ab53 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulSessionContainer.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulSessionContainer.java
@@ -101,7 +101,6 @@
 import jakarta.ejb.SessionSynchronization;
 import java.util.HashMap;
 import static jakarta.persistence.SynchronizationType.SYNCHRONIZED;
-import org.glassfish.ejb.LogFacade;
 
 /**
  * This class provides container functionality specific to stateful
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/cache/UnBoundedSessionCache.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/cache/UnBoundedSessionCache.java
index 1c383ea..d7f3d35 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/cache/UnBoundedSessionCache.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/cache/UnBoundedSessionCache.java
@@ -23,7 +23,6 @@
 import com.sun.logging.*;
 
 import java.util.TimerTask;
-import com.sun.logging.*;
 
 public class UnBoundedSessionCache
     extends LruSessionCache
diff --git a/appserver/ejb/ejb-container/src/test/java/org/glassfish/ejb/deployment/descriptor/EjbDescriptorInheritedMethodImplementationTest.java b/appserver/ejb/ejb-container/src/test/java/org/glassfish/ejb/deployment/descriptor/EjbDescriptorInheritedMethodImplementationTest.java
index b1bf6ee..a88344a 100644
--- a/appserver/ejb/ejb-container/src/test/java/org/glassfish/ejb/deployment/descriptor/EjbDescriptorInheritedMethodImplementationTest.java
+++ b/appserver/ejb/ejb-container/src/test/java/org/glassfish/ejb/deployment/descriptor/EjbDescriptorInheritedMethodImplementationTest.java
@@ -16,7 +16,6 @@
 
 package org.glassfish.ejb.deployment.descriptor;
 
-import java.lang.Exception;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
diff --git a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/ConcurrentModificationsTest.java b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/ConcurrentModificationsTest.java
index cf55988..2c33c9a 100644
--- a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/ConcurrentModificationsTest.java
+++ b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/ConcurrentModificationsTest.java
@@ -21,7 +21,6 @@
 import com.sun.enterprise.config.serverbeans.Resources;
 
 import org.glassfish.hk2.api.ServiceLocator;
-import org.glassfish.jdbc.config.JdbcResource;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import org.jvnet.hk2.config.TransactionFailure;
diff --git a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolDefaultsTest.java b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolDefaultsTest.java
index 5e2b464..848c888 100644
--- a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolDefaultsTest.java
+++ b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolDefaultsTest.java
@@ -16,7 +16,6 @@
 
 package org.glassfish.jdbc.config;
 
-import org.glassfish.jdbc.config.JdbcConnectionPool;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolValidationTest.java b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolValidationTest.java
index effe03e..10c3b73 100644
--- a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolValidationTest.java
+++ b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolValidationTest.java
@@ -16,8 +16,6 @@
 
 package org.glassfish.jdbc.config;
 
-import org.glassfish.jdbc.config.JdbcConnectionPool;
-
 import java.beans.PropertyVetoException;
 import org.junit.After;
 import org.junit.Before;
diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/DataSourceDefinitionDeployer.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/DataSourceDefinitionDeployer.java
index 08dde77..9408757 100644
--- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/DataSourceDefinitionDeployer.java
+++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/DataSourceDefinitionDeployer.java
@@ -28,8 +28,6 @@
 import com.sun.logging.LogDomains;
 import org.glassfish.deployment.common.Descriptor;
 import org.glassfish.deployment.common.RootDeploymentDescriptor;
-import org.glassfish.jdbc.config.JdbcConnectionPool;
-import org.glassfish.jdbc.config.JdbcResource;
 import org.glassfish.resourcebase.resources.api.ResourceConflictException;
 import org.glassfish.resourcebase.resources.api.ResourceDeployer;
 import org.glassfish.resourcebase.resources.api.ResourceDeployerInfo;
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java
index 3f311fa..124c8f0 100644
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java
@@ -20,7 +20,6 @@
 //import org.glassfish.jms.admin.monitor.config.JmsServiceMI;
 import com.sun.enterprise.connectors.jms.config.JmsService;
 import com.sun.enterprise.connectors.jms.config.JmsHost;
-import com.sun.enterprise.connectors.jms.system.ActiveJmsResourceAdapter;
 import org.jvnet.hk2.annotations.Service;
 import org.glassfish.hk2.api.PostConstruct;
 import org.glassfish.hk2.runlevel.RunLevel;
diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/NamingClusterInfoImpl.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/NamingClusterInfoImpl.java
index f11f01f..3ba72b0 100644
--- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/NamingClusterInfoImpl.java
+++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/NamingClusterInfoImpl.java
@@ -20,7 +20,6 @@
 import org.glassfish.api.naming.NamingClusterInfo;
 import org.glassfish.api.naming.NamingObjectsProvider;
 import org.glassfish.hk2.api.ServiceHandle;
-import org.glassfish.hk2.api.ServiceHandle;
 import org.glassfish.internal.api.ORBLocator;
 import org.glassfish.logging.annotation.LogMessageInfo;
 import org.glassfish.logging.annotation.LoggerInfo;
diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/EnhancerControl.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/EnhancerControl.java
index 5c78433..059cc7d 100644
--- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/EnhancerControl.java
+++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/EnhancerControl.java
@@ -35,8 +35,6 @@
 
 import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData;
 
-import com.sun.jdo.api.persistence.enhancer.impl.ClassControl;
-import com.sun.jdo.api.persistence.enhancer.impl.Environment;
 //@olsen: disabled feature
 /*
 import com.sun.jdo.api.persistence.enhancer.impl.FieldMap;
diff --git a/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/ConnectionFactory.java b/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/ConnectionFactory.java
index 5e406fe..8c5de5d 100644
--- a/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/ConnectionFactory.java
+++ b/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/ConnectionFactory.java
@@ -22,7 +22,6 @@
 
 package com.sun.jdo.api.persistence.support;
 
-import java.lang.String;
 import java.io.PrintWriter;
 import java.sql.Connection;
 
diff --git a/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/PersistenceManager.java b/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/PersistenceManager.java
index 3c2570e..5390fd6 100644
--- a/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/PersistenceManager.java
+++ b/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/PersistenceManager.java
@@ -23,7 +23,6 @@
 package com.sun.jdo.api.persistence.support;
 import java.util.Collection;
 import java.util.Properties;
-import java.lang.Class;
 
 /** PersistenceManager is the primary interface for JDO-aware application
  * components.  It is the factory for Query and Transaction instances,
diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ExtentCollection.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ExtentCollection.java
index 172e111..3a78529 100644
--- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ExtentCollection.java
+++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ExtentCollection.java
@@ -24,7 +24,6 @@
 
 import com.sun.jdo.api.persistence.support.JDOUnsupportedOptionException;
 import com.sun.jdo.api.persistence.support.JDOUserException;
-import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager;
 import com.sun.jdo.api.persistence.model.Model;
 import org.glassfish.persistence.common.I18NHelper;
 
diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/UpdateObjectDesc.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/UpdateObjectDesc.java
index 18d8b24..db3ff29 100644
--- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/UpdateObjectDesc.java
+++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/UpdateObjectDesc.java
@@ -23,8 +23,6 @@
 
 package com.sun.jdo.spi.persistence.support.sqlstore;
 
-import com.sun.jdo.spi.persistence.support.sqlstore.StateManager;
-
 /**
  */
 public interface UpdateObjectDesc extends ActionDesc {
diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/ConnectionFactoryImpl.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/ConnectionFactoryImpl.java
index e099066..d4089dc 100644
--- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/ConnectionFactoryImpl.java
+++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/ConnectionFactoryImpl.java
@@ -22,7 +22,6 @@
 
 package com.sun.jdo.spi.persistence.support.sqlstore.impl;
 
-import java.lang.String;
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/LoggerJDK14.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/LoggerJDK14.java
index 7790ef2..05988ba 100644
--- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/LoggerJDK14.java
+++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/LoggerJDK14.java
@@ -19,8 +19,6 @@
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 
-import java.lang.StringBuffer;
-
 /**
  * This class is used with JDK 1.4 (and higher) programs to log messages from
  * jdo components.  It extends a java.util.logging.Logger which does
diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RWLock.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RWLock.java
index b9bda06..a8baadd 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RWLock.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RWLock.java
@@ -15,7 +15,6 @@
  */
 
 package com.sun.jts.CosTransactions;
-import java.lang.InterruptedException;
 import java.util.LinkedList;
 import java.util.logging.Logger;
 import java.util.logging.Level;
diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionServiceProperties.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionServiceProperties.java
index 9659f53..cadddf0 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionServiceProperties.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionServiceProperties.java
@@ -40,7 +40,6 @@
 import com.sun.logging.LogDomains;
 import org.glassfish.api.admin.ServerEnvironment;
 
-import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.BuilderHelper;
 import org.jvnet.hk2.config.types.Property;
 
diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/Authenticator.java b/appserver/web/web-core/src/main/java/org/apache/catalina/Authenticator.java
index 6c16790..af68746 100644
--- a/appserver/web/web-core/src/main/java/org/apache/catalina/Authenticator.java
+++ b/appserver/web/web-core/src/main/java/org/apache/catalina/Authenticator.java
@@ -17,9 +17,6 @@
 
 package org.apache.catalina;
 
-
-import org.apache.catalina.HttpRequest;
-
 import jakarta.servlet.ServletException;
 
 /**
diff --git a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/CacheManager.java b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/CacheManager.java
index 25e8cb6..aba1a01 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/CacheManager.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/CacheManager.java
@@ -22,7 +22,6 @@
 import org.glassfish.web.LogFacade;
 
 import jakarta.servlet.ServletContext;
-import java.lang.String;
 import java.text.MessageFormat;
 import java.util.*;
 import java.util.logging.Level;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/MemoryStrategyBuilder.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/MemoryStrategyBuilder.java
index d590783..43a6d04 100755
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/MemoryStrategyBuilder.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/MemoryStrategyBuilder.java
@@ -25,7 +25,6 @@
 import org.glassfish.web.deployment.runtime.SessionManager;
 import org.jvnet.hk2.annotations.Service;
 
-import java.lang.String;
 import java.text.MessageFormat;
 import java.util.logging.Level;
 
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PEAccessLogValve.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PEAccessLogValve.java
index 455a5be..bab2350 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PEAccessLogValve.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PEAccessLogValve.java
@@ -33,7 +33,6 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.lang.String;
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java
index 2c1b89b..76d61c4 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java
@@ -100,7 +100,6 @@
 import org.glassfish.web.loader.WebappClassLoader;
 import org.glassfish.web.valve.GlassFishValve;
 
-import org.glassfish.hk2.api.ServiceLocator;
 import org.jvnet.hk2.config.Transaction;
 import org.jvnet.hk2.config.TransactionFailure;
 import org.jvnet.hk2.config.types.Property;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerPipeline.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerPipeline.java
index da3f5bb..effc416 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerPipeline.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerPipeline.java
@@ -25,7 +25,6 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.lang.String;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.MessageFormat;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebApplication.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebApplication.java
index bbdf113..29aba39 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebApplication.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebApplication.java
@@ -36,7 +36,6 @@
 import org.glassfish.web.deployment.runtime.SessionManager;
 import org.glassfish.web.deployment.runtime.SunWebAppImpl;
 
-import java.lang.String;
 import java.lang.reflect.Method;
 import java.text.MessageFormat;
 import java.util.*;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebDeployer.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebDeployer.java
index 3ee968a..27ec7ef 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebDeployer.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebDeployer.java
@@ -36,7 +36,6 @@
 import org.jvnet.hk2.annotations.Service;
 
 import java.io.File;
-import java.lang.String;
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 import java.util.logging.Level;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleContextConfig.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleContextConfig.java
index 2840409..2a8cce2 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleContextConfig.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleContextConfig.java
@@ -36,7 +36,6 @@
 import org.glassfish.web.valve.GlassFishValve;
 
 import javax.naming.NamingException;
-import java.lang.String;
 import java.text.MessageFormat;
 import java.util.*;
 import java.util.logging.Level;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/MapperListener.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/MapperListener.java
index bd22804..a654d30 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/MapperListener.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/MapperListener.java
@@ -18,7 +18,6 @@
 package com.sun.enterprise.web.connector;
 
 import javax.management.*;
-import java.lang.String;
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/coyote/PECoyoteConnector.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/coyote/PECoyoteConnector.java
index d23c907..6affe3d 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/coyote/PECoyoteConnector.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/coyote/PECoyoteConnector.java
@@ -36,8 +36,6 @@
 import javax.management.Notification;
 import jakarta.servlet.http.HttpServletRequest;
 import java.io.*;
-import java.lang.Object;
-import java.lang.String;
 import java.text.MessageFormat;
 import java.util.Enumeration;
 import java.util.Properties;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/extension/GrizzlyConfig.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/extension/GrizzlyConfig.java
index aa4f7c9..056d1ad 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/extension/GrizzlyConfig.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/extension/GrizzlyConfig.java
@@ -29,7 +29,6 @@
 import org.glassfish.web.LogFacade;
 
 import javax.management.ObjectName;
-import java.lang.String;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.ResourceBundle;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/connector/coyote/PwcCoyoteRequest.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/connector/coyote/PwcCoyoteRequest.java
index c0bb31a..63046b6 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/connector/coyote/PwcCoyoteRequest.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/connector/coyote/PwcCoyoteRequest.java
@@ -29,7 +29,6 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.lang.String;
 import java.nio.charset.Charset;
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/web/server/J2EEInstanceListener.java b/appserver/web/web-glue/src/main/java/com/sun/web/server/J2EEInstanceListener.java
index 9c8ef3c..d22df20 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/web/server/J2EEInstanceListener.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/web/server/J2EEInstanceListener.java
@@ -41,7 +41,6 @@
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import java.lang.String;
 import java.security.*;
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/web/server/WebContainerListener.java b/appserver/web/web-glue/src/main/java/com/sun/web/server/WebContainerListener.java
index c0098cd..81b33a4 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/web/server/WebContainerListener.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/web/server/WebContainerListener.java
@@ -28,7 +28,6 @@
 
 import javax.naming.NamingException;
 import jakarta.validation.ValidatorFactory;
-import java.lang.String;
 import java.text.MessageFormat;
 import java.util.HashSet;
 import java.util.ResourceBundle;
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/embed/impl/WebContainerImpl.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/embed/impl/WebContainerImpl.java
index a9d1d9d..2745503 100644
--- a/appserver/web/web-glue/src/main/java/org/glassfish/web/embed/impl/WebContainerImpl.java
+++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/embed/impl/WebContainerImpl.java
@@ -19,7 +19,6 @@
 import java.beans.PropertyVetoException;
 import java.io.File;
 
-import java.lang.System;
 import java.util.*;
 import java.util.logging.*;
 
diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/BaseDirContext.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/BaseDirContext.java
index 3883504..625a05d 100644
--- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/BaseDirContext.java
+++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/BaseDirContext.java
@@ -28,7 +28,6 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.CompositeName;
-import javax.naming.NameParser;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.Attribute;
diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLConnection.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLConnection.java
index 5ed189d..52c35d0 100644
--- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLConnection.java
+++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLConnection.java
@@ -40,8 +40,6 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import org.apache.naming.JndiPermission;
-import org.apache.naming.resources.Resource;
-import org.apache.naming.resources.ResourceAttributes;
 
 /**
  * Connection to a JNDI directory context.
diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java
index 36741dd..fd4fcb3 100644
--- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java
+++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java
@@ -21,7 +21,6 @@
 import jakarta.enterprise.context.spi.CreationalContext;
 import jakarta.servlet.AsyncContext;
 import jakarta.servlet.http.HttpServletRequest;
-import jakarta.enterprise.context.spi.CreationalContext;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServiceDelegate.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServiceDelegate.java
index f85ccc6..b5302ee 100644
--- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServiceDelegate.java
+++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServiceDelegate.java
@@ -16,8 +16,6 @@
 
 package org.glassfish.webservices;
 
-import java.lang.UnsupportedOperationException;
-
 import java.net.URL;
 import java.net.URI;
 
diff --git a/nucleus/admin/cli/src/test/java/com/sun/enterprise/admin/cli/CLIUtilTest.java b/nucleus/admin/cli/src/test/java/com/sun/enterprise/admin/cli/CLIUtilTest.java
index a12e5ca..3ba14a2 100644
--- a/nucleus/admin/cli/src/test/java/com/sun/enterprise/admin/cli/CLIUtilTest.java
+++ b/nucleus/admin/cli/src/test/java/com/sun/enterprise/admin/cli/CLIUtilTest.java
@@ -24,7 +24,6 @@
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.util.Map;
-import com.sun.enterprise.admin.cli.CLIUtil;
 import org.glassfish.api.admin.CommandException;
 
 
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Config.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Config.java
index f5a4a09..a48383a 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Config.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Config.java
@@ -18,7 +18,6 @@
 
 import com.sun.common.util.logging.LoggingConfigImpl;
 import com.sun.enterprise.config.modularity.parser.ModuleConfigurationLoader;
-import com.sun.enterprise.config.serverbeans.GroupManagementService;
 import com.sun.enterprise.config.serverbeans.customvalidators.NotDuplicateTargetName;
 import com.sun.enterprise.config.serverbeans.customvalidators.NotTargetKeyword;
 import com.sun.enterprise.config.util.ServerHelper;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourcePool.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourcePool.java
index 4ff2b97..c6e848d 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourcePool.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourcePool.java
@@ -16,7 +16,6 @@
 
 package com.sun.enterprise.config.serverbeans;
 
-import com.sun.enterprise.config.serverbeans.Resource;
 import com.sun.enterprise.config.serverbeans.customvalidators.ResourceNameConstraint;
 import org.jvnet.hk2.config.Attribute;
 import org.jvnet.hk2.config.DuckTyped;
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypedVetoableChangeSupport.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypedVetoableChangeSupport.java
index c729380..3e00382 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypedVetoableChangeSupport.java
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypedVetoableChangeSupport.java
@@ -16,8 +16,6 @@
 
 package org.glassfish.config.support;
 
-import org.glassfish.config.support.TypedChangeEvent;
-
 import java.beans.PropertyVetoException;
 import java.beans.VetoableChangeSupport;
 
diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/CollectionsAccessTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/CollectionsAccessTest.java
index cee0ae8..59345e9 100644
--- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/CollectionsAccessTest.java
+++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/CollectionsAccessTest.java
@@ -27,7 +27,6 @@
 
 import java.util.List;
 import java.beans.PropertyVetoException;
-import org.glassfish.api.admin.config.ApplicationName;
 
 /**
  * User: Jerome Dochez
diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DirectRemovalTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DirectRemovalTest.java
index c846efe..088c9f8 100644
--- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DirectRemovalTest.java
+++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DirectRemovalTest.java
@@ -20,7 +20,6 @@
 import org.glassfish.grizzly.config.dom.NetworkListeners;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.tests.utils.Utils;
-import org.glassfish.hk2.api.ServiceLocator;
 import org.jvnet.hk2.config.ConfigBean;
 import org.jvnet.hk2.config.ConfigSupport;
 import org.jvnet.hk2.config.TransactionFailure;
diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/DomainConfigValidator.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/DomainConfigValidator.java
index 49a9938..aae9d5b 100644
--- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/DomainConfigValidator.java
+++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/DomainConfigValidator.java
@@ -17,7 +17,6 @@
 package com.sun.enterprise.admin.servermgmt;
 
 import com.sun.enterprise.util.i18n.StringManager;
-import com.sun.enterprise.admin.servermgmt.InvalidConfigException;
 
 import java.util.HashMap;
 
diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainPortValidator.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainPortValidator.java
index e82f376..9601ffc 100644
--- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainPortValidator.java
+++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainPortValidator.java
@@ -23,7 +23,6 @@
 import com.sun.enterprise.admin.servermgmt.DomainConfig;
 import com.sun.enterprise.admin.servermgmt.DomainException;
 import com.sun.enterprise.admin.servermgmt.SLogger;
-import com.sun.enterprise.admin.servermgmt.domain.SubstitutableTokens;
 import com.sun.enterprise.universal.i18n.LocalStringsImpl;
 import com.sun.enterprise.util.net.NetUtils;
 
diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEDomainConfigValidator.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEDomainConfigValidator.java
index d93fedf..0fac12f 100644
--- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEDomainConfigValidator.java
+++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEDomainConfigValidator.java
@@ -23,7 +23,6 @@
 import com.sun.enterprise.admin.servermgmt.PortValidator;
 import com.sun.enterprise.admin.servermgmt.StringValidator;
 import com.sun.enterprise.util.i18n.StringManager;
-import java.lang.StringBuffer;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map.Entry;
diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEScriptsTokens.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEScriptsTokens.java
index a75a2fc..4f7b9e9 100644
--- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEScriptsTokens.java
+++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEScriptsTokens.java
@@ -19,7 +19,6 @@
 import com.sun.enterprise.admin.util.TokenValue;
 import com.sun.enterprise.admin.util.TokenValueSet;
 import com.sun.enterprise.admin.servermgmt.DomainConfig;
-import com.sun.enterprise.admin.servermgmt.pe.PEFileLayout;
 
 /**
  * This class defines the tokens required by the startserv & stopserv scripts.
diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/LinuxService.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/LinuxService.java
index f7cf919..a7ad74d 100644
--- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/LinuxService.java
+++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/LinuxService.java
@@ -25,7 +25,6 @@
 import com.sun.enterprise.util.io.FileUtils;
 import com.sun.enterprise.util.io.ServerDirs;
 import java.io.File;
-import java.lang.String;
 import java.util.*;
 import java.util.ArrayList;
 import java.util.LinkedList;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java
index 7e9529f..66bfb97 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java
@@ -30,8 +30,6 @@
 import com.sun.enterprise.config.serverbeans.JmxConnector;
 import org.glassfish.api.admin.config.ConfigurationUpgrade;
 import jakarta.inject.Inject;
-import jakarta.inject.Inject;
-
 
 import org.jvnet.hk2.annotations.Service;
 import org.glassfish.hk2.api.PerLookup;
@@ -40,7 +38,6 @@
 import org.jvnet.hk2.config.ConfigSupport;
 import org.jvnet.hk2.config.SingleConfigCode;
 import org.jvnet.hk2.config.TransactionFailure;
-import jakarta.inject.Inject;
 import org.jvnet.hk2.component.*;
 import org.jvnet.hk2.config.*;
 
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceInstanceCommand.java
index a5bec33..8d16b97 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceInstanceCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceInstanceCommand.java
@@ -21,8 +21,6 @@
 import org.glassfish.api.admin.*;
 import jakarta.inject.Inject;
 import com.sun.enterprise.v3.admin.RestartServer;
-import com.sun.enterprise.v3.admin.RestartServer;
-
 
 import org.jvnet.hk2.annotations.Service;
 import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/StopLocalInstanceCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/StopLocalInstanceCommand.java
index 5cd803a..53d5e9c 100644
--- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/StopLocalInstanceCommand.java
+++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/StopLocalInstanceCommand.java
@@ -18,7 +18,6 @@
 
 import java.util.logging.Level;
 import com.sun.enterprise.admin.cli.*;
-import com.sun.enterprise.admin.cli.cluster.Strings;
 import com.sun.enterprise.admin.cli.remote.RemoteCLICommand;
 import com.sun.enterprise.universal.process.ProcessUtils;
 import com.sun.enterprise.util.HostAndPort;
diff --git a/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/connect/NodeRunner.java b/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/connect/NodeRunner.java
index e61ad70..8cdbd9b 100644
--- a/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/connect/NodeRunner.java
+++ b/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/connect/NodeRunner.java
@@ -28,7 +28,6 @@
 import com.sun.enterprise.util.SystemPropertyConstants;
 import com.sun.enterprise.util.StringUtils;
 import org.glassfish.cluster.ssh.launcher.SSHLauncher;
-import org.glassfish.cluster.ssh.connect.NodeRunnerSsh;
 import org.glassfish.common.util.admin.AuthTokenManager;
 import org.glassfish.hk2.api.ServiceLocator;
 
diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java
index d393d5b..a89ee9c 100644
--- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java
+++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java
@@ -35,7 +35,6 @@
 import org.glassfish.external.arc.Stability;
 import org.glassfish.external.arc.Taxonomy;
 import org.glassfish.admin.amx.config.AMXConfigConstants;
-import org.glassfish.admin.amx.impl.config.AMXConfigLoader;
 import org.glassfish.admin.amx.impl.util.ImplUtil;
 import org.glassfish.admin.amx.impl.util.InjectedValues;
 import org.glassfish.admin.amx.util.AMXLoggerInfo;
diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java
index d48c05f..a25bbd3 100644
--- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java
+++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java
@@ -45,7 +45,6 @@
 import com.sun.enterprise.security.auth.realm.Realm;
 import com.sun.enterprise.security.auth.realm.User;
 import org.glassfish.admin.amx.base.Realms;
-import org.glassfish.admin.amx.impl.mbean.AMXImplBase;
 import org.glassfish.admin.amx.util.CollectionUtil;
 import org.glassfish.admin.amx.impl.util.InjectedValues;
 import org.glassfish.api.admin.ServerEnvironment;
diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SampleImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SampleImpl.java
index 2fa9699..27a558e 100644
--- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SampleImpl.java
+++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SampleImpl.java
@@ -31,7 +31,6 @@
 import java.util.List;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.HashMap;
 
 import org.glassfish.admin.amx.base.Sample;
 import org.glassfish.admin.amx.util.jmx.JMXUtil;
diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ServerRuntimeImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ServerRuntimeImpl.java
index 050652b..7f6bcf0 100644
--- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ServerRuntimeImpl.java
+++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ServerRuntimeImpl.java
@@ -18,7 +18,6 @@
 
 import javax.management.ObjectName;
 import org.glassfish.admin.amx.base.ServerRuntime;
-import org.glassfish.admin.amx.impl.mbean.AMXImplBase;
 
 /**
  * Parent for all runtime-related MBeans for a particular server
diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/AMXDebugHelper.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/AMXDebugHelper.java
index 27b65ca..588c93e 100644
--- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/AMXDebugHelper.java
+++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/AMXDebugHelper.java
@@ -16,9 +16,6 @@
 
 package org.glassfish.admin.amx.util;
 
-import org.glassfish.admin.amx.util.Output;
-import org.glassfish.admin.amx.util.StringUtil;
-
 /**
 Convenient wrapper around {@link AMXDebug}.
 Can be made non-final if necessary; declared as 'final' until needed.
diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/FeatureAvailability.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/FeatureAvailability.java
index e560207..e464eee 100644
--- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/FeatureAvailability.java
+++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/FeatureAvailability.java
@@ -16,8 +16,6 @@
 
 package org.glassfish.admin.amx.util;
 
-import org.glassfish.admin.amx.util.ExceptionUtil;
-
 import javax.management.MBeanServer;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/nucleus/common/common-util/src/main/java/com/sun/appserv/management/client/prefs/LoginInfoStoreFactory.java b/nucleus/common/common-util/src/main/java/com/sun/appserv/management/client/prefs/LoginInfoStoreFactory.java
index dd0941d..2d6dcec 100644
--- a/nucleus/common/common-util/src/main/java/com/sun/appserv/management/client/prefs/LoginInfoStoreFactory.java
+++ b/nucleus/common/common-util/src/main/java/com/sun/appserv/management/client/prefs/LoginInfoStoreFactory.java
@@ -17,8 +17,6 @@
 package com.sun.appserv.management.client.prefs;
 
 import java.util.Arrays;
-import com.sun.appserv.management.client.prefs.LoginInfo;
-import com.sun.appserv.management.client.prefs.LoginInfoStoreFactory;
 
 /** A factory class to create instances of LoginInfoStore.
  * @since Appserver 9.0
diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ProcessExecutor.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ProcessExecutor.java
index 6e6971d..04c4b73 100644
--- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ProcessExecutor.java
+++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ProcessExecutor.java
@@ -34,7 +34,6 @@
 import java.io.FileReader;
 import java.io.RandomAccessFile;
 import java.util.ArrayList;
-import java.lang.IllegalArgumentException;
 
 
 /**
diff --git a/nucleus/common/glassfish-api/src/test/java/org/glassfish/api/admin/WrappedAdminCommandTest.java b/nucleus/common/glassfish-api/src/test/java/org/glassfish/api/admin/WrappedAdminCommandTest.java
index cc11828..d44cbc2 100644
--- a/nucleus/common/glassfish-api/src/test/java/org/glassfish/api/admin/WrappedAdminCommandTest.java
+++ b/nucleus/common/glassfish-api/src/test/java/org/glassfish/api/admin/WrappedAdminCommandTest.java
@@ -20,9 +20,6 @@
 import static org.junit.Assert.assertNull;
 
 import org.glassfish.api.Param;
-import org.glassfish.api.admin.AdminCommand;
-import org.glassfish.api.admin.AdminCommandContext;
-import org.glassfish.api.admin.WrappedAdminCommand;
 import org.junit.Test;
 
 /**
diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/ClassLoaderHierarchy.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/ClassLoaderHierarchy.java
index 159bf17..52736ce 100644
--- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/ClassLoaderHierarchy.java
+++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/ClassLoaderHierarchy.java
@@ -16,7 +16,6 @@
 
 package org.glassfish.internal.api;
 
-import org.glassfish.internal.api.DelegatingClassLoader;
 import org.glassfish.api.deployment.DeploymentContext;
 import org.jvnet.hk2.annotations.Contract;
 
diff --git a/nucleus/core/bootstrap/src/test/java/com/sun/enterprise/glassfish/bootstrap/MainHelperTest.java b/nucleus/core/bootstrap/src/test/java/com/sun/enterprise/glassfish/bootstrap/MainHelperTest.java
index 647839c..87f0fc1 100644
--- a/nucleus/core/bootstrap/src/test/java/com/sun/enterprise/glassfish/bootstrap/MainHelperTest.java
+++ b/nucleus/core/bootstrap/src/test/java/com/sun/enterprise/glassfish/bootstrap/MainHelperTest.java
@@ -22,7 +22,6 @@
 
 import static org.junit.Assert.*;
 import org.junit.Test;
-import com.sun.enterprise.glassfish.bootstrap.MainHelper;
 import java.io.*;
 import java.util.*;
 
diff --git a/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/wireadapters/glassfish/DefaultWireAdapterTest.java b/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/wireadapters/glassfish/DefaultWireAdapterTest.java
index 53bd485..d1e5765 100644
--- a/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/wireadapters/glassfish/DefaultWireAdapterTest.java
+++ b/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/wireadapters/glassfish/DefaultWireAdapterTest.java
@@ -45,7 +45,6 @@
 import org.glassfish.contextpropagation.wireadapters.AbstractWireAdapter;
 import org.glassfish.contextpropagation.wireadapters.Catalog;
 import org.glassfish.contextpropagation.wireadapters.WireAdapter;
-import org.glassfish.contextpropagation.wireadapters.glassfish.DefaultWireAdapter;
 import org.glassfish.contextpropagation.wireadapters.wls.MyWLSContext;
 import org.glassfish.contextpropagation.wireadapters.wls.WLSWireAdapter;
 import org.junit.Before;
diff --git a/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/wireadapters/glassfish/WirePropagationTest.java b/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/wireadapters/glassfish/WirePropagationTest.java
index 963f674..d173f5f 100644
--- a/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/wireadapters/glassfish/WirePropagationTest.java
+++ b/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/wireadapters/glassfish/WirePropagationTest.java
@@ -26,7 +26,6 @@
 import org.glassfish.contextpropagation.internal.Utils;
 import org.glassfish.contextpropagation.spi.ContextMapHelper;
 import org.glassfish.contextpropagation.spi.ContextMapPropagator;
-import org.glassfish.contextpropagation.wireadapters.glassfish.DefaultWireAdapter;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RuntimeInfo.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RuntimeInfo.java
index 6b4f428..3253992 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RuntimeInfo.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RuntimeInfo.java
@@ -23,7 +23,6 @@
 import com.sun.enterprise.config.serverbeans.JavaConfig;
 import java.util.Properties;
 import org.glassfish.internal.api.Globals;
-import static com.sun.enterprise.util.StringUtils.ok;
 import com.sun.enterprise.util.SystemPropertyConstants;
 import com.sun.enterprise.util.OS;
 import org.glassfish.api.ActionReport;
diff --git a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/AdminAdapterTest.java b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/AdminAdapterTest.java
index 86e9b7c..b6864df 100644
--- a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/AdminAdapterTest.java
+++ b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/AdminAdapterTest.java
@@ -20,7 +20,6 @@
 import org.junit.Test;
 import org.junit.Before;
 import org.glassfish.api.admin.ParameterMap;
-import com.sun.enterprise.v3.admin.AdminAdapter;
 import java.util.Properties;
 
 
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LoggerInfoMetadataService.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LoggerInfoMetadataService.java
index 64be0e1..79a574b 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LoggerInfoMetadataService.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LoggerInfoMetadataService.java
@@ -44,7 +44,6 @@
 import com.sun.enterprise.module.ModulesRegistry;
 import com.sun.enterprise.module.HK2Module;
 import com.sun.enterprise.module.ModuleDefinition;
-import com.sun.enterprise.module.HK2Module;
 import com.sun.enterprise.module.ModuleChangeListener;
 
 @Service
diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ModuleExploder.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ModuleExploder.java
index 6e8353e..a80c3f5 100644
--- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ModuleExploder.java
+++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ModuleExploder.java
@@ -17,7 +17,6 @@
 package org.glassfish.deployment.common;
 
 
-import org.glassfish.deployment.common.DeploymentException;
 import org.glassfish.api.deployment.archive.Archive;
 import java.io.*;
 import java.util.Enumeration;
diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/SecurityRoleMapper.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/SecurityRoleMapper.java
index c4b3196..b4de570 100644
--- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/SecurityRoleMapper.java
+++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/SecurityRoleMapper.java
@@ -16,7 +16,6 @@
 
 package org.glassfish.deployment.common;
 
-import org.glassfish.deployment.common.RootDeploymentDescriptor;
 import org.glassfish.security.common.Role;
 
 import java.security.Principal;
diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningSyntaxException.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningSyntaxException.java
index df13d06..c524dcb 100644
--- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningSyntaxException.java
+++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningSyntaxException.java
@@ -16,8 +16,6 @@
 
 package org.glassfish.deployment.versioning;
 
-import org.glassfish.deployment.versioning.VersioningException;
-
 /**
  * This class is an exception used when application name that complies
  * with versioning incorporates critical pattern.
diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningWildcardException.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningWildcardException.java
index 2053919..94b44ff 100644
--- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningWildcardException.java
+++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningWildcardException.java
@@ -16,8 +16,6 @@
 
 package org.glassfish.deployment.versioning;
 
-import org.glassfish.deployment.versioning.VersioningException;
-
 /**
  * This class is an exception used when application name that complies
  * with versioning incorporates critical pattern.
diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeRegistry.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeRegistry.java
index e01bd8c..9668fc5 100644
--- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeRegistry.java
+++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeRegistry.java
@@ -19,7 +19,6 @@
 import java.util.Collection;
 import java.util.ArrayList;
 
-import org.glassfish.flashlight.provider.FlashlightProbe;
 import org.glassfish.flashlight.impl.core.*;
 
 import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Populator.java b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Populator.java
index 7b9407e..9c42322 100644
--- a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Populator.java
+++ b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Populator.java
@@ -17,7 +17,6 @@
 package org.jvnet.hk2.config;
 
 import org.jvnet.hk2.annotations.Contract;
-import org.jvnet.hk2.config.ConfigParser;
 
 /**
  * Populates {@link Habitat}.
diff --git a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/UnprocessedChangeEvents.java b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/UnprocessedChangeEvents.java
index 91f5371..1f3f688 100644
--- a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/UnprocessedChangeEvents.java
+++ b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/UnprocessedChangeEvents.java
@@ -16,7 +16,6 @@
 
 package org.jvnet.hk2.config;
 
-import java.lang.StringBuffer;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Collection;