diff --git a/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java b/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java
index 36edb918712e8..72fe24c25bb10 100644
--- a/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java
+++ b/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java
@@ -148,8 +148,6 @@ public Logger getLogger(String name, Module module) {
     private static System.LoggerFinder loadLoggerFinder() {
         System.LoggerFinder result;
         try {
-            // Iterator iterates with the access control context stored
-            // at ServiceLoader creation time.
             final Iterator<System.LoggerFinder> iterator =
                     findLoggerFinderProviders();
             if (iterator.hasNext()) {
@@ -197,8 +195,6 @@ private static System.LoggerFinder loadDefaultImplementation() {
 
         DefaultLoggerFinder result = null;
         try {
-            // Iterator iterates with the access control context stored
-            // at ServiceLoader creation time.
             if (iterator.hasNext()) {
                 result = iterator.next();
             }
diff --git a/src/java.logging/share/classes/java/util/logging/LogManager.java b/src/java.logging/share/classes/java/util/logging/LogManager.java
index 0b7a854dddf3b..9c9c708a06243 100644
--- a/src/java.logging/share/classes/java/util/logging/LogManager.java
+++ b/src/java.logging/share/classes/java/util/logging/LogManager.java
@@ -164,7 +164,7 @@ public class LogManager {
     // LoggerContext for system loggers and user loggers
     private final LoggerContext systemContext = new SystemLoggerContext();
     private final LoggerContext userContext = new LoggerContext();
-    // non final field - make it volatile to make sure that other threads
+    // non-final field - make it volatile to make sure that other threads
     // will see the new value once ensureLogManagerInitialized() has finished
     // executing.
     private volatile Logger rootLogger;
@@ -312,7 +312,6 @@ protected LogManager() {
      */
     private boolean initializedCalled = false;
     private volatile boolean initializationDone = false;
-    @SuppressWarnings("removal")
     final void ensureLogManagerInitialized() {
         final LogManager owner = this;
         if (initializationDone || owner != manager) {
@@ -422,15 +421,11 @@ private void readPrimordialConfiguration() { // must be called while holding con
         }
     }
 
-    // LoggerContext maps from AppContext
-    private WeakHashMap<Object, LoggerContext> contextsMap = null;
-
     // Returns the LoggerContext for the user code (i.e. application or AppContext).
     // Loggers are isolated from each AppContext.
     private LoggerContext getUserContext() {
-        LoggerContext context = null;
-        // for standalone app, return userContext
-        return context != null ? context : userContext;
+        // return userContext
+        return userContext;
     }
 
     // The system context.
@@ -447,7 +442,7 @@ private List<LoggerContext> contexts() {
 
     // Find or create a specified logger instance. If a logger has
     // already been created with the given name it is returned.
-    // Otherwise a new logger instance is created and registered
+    // Otherwise, a new logger instance is created and registered
     // in the LogManager global namespace.
     // This method will always return a non-null Logger object.
     // Synchronization is not required here. All synchronization for