diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipRendererProvider.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipRendererProvider.java
index 04a2637c5b0e..5f6bce7f18c6 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipRendererProvider.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonTooltipRendererProvider.java
@@ -45,11 +45,11 @@ import javax.swing.*;
 import java.util.Collection;
 import java.util.List;
 
-public class DaemonTooltipRendererProvider implements ErrorStripTooltipRendererProvider {
+class DaemonTooltipRendererProvider implements ErrorStripTooltipRendererProvider {
   @NonNls private static final String END_MARKER = "<!-- end marker -->";
   private final Project myProject;
 
-  public DaemonTooltipRendererProvider(final Project project) {
+  DaemonTooltipRendererProvider(final Project project) {
     myProject = project;
   }
 
diff --git a/platform/platform-impl/src/com/intellij/configurationStore/StateStorageBase.kt b/platform/platform-impl/src/com/intellij/configurationStore/StateStorageBase.kt
index acf8dc54dff4..f72d8a2bc4d1 100644
--- a/platform/platform-impl/src/com/intellij/configurationStore/StateStorageBase.kt
+++ b/platform/platform-impl/src/com/intellij/configurationStore/StateStorageBase.kt
@@ -31,11 +31,15 @@ abstract class StateStorageBase<T : Any> : StateStorage {
   protected val storageDataRef: AtomicReference<T> = AtomicReference()
 
   override final fun <S : Any> getState(component: Any?, componentName: String, stateClass: Class<S>, mergeInto: S?, reload: Boolean): S? {
-    return getState(component, componentName, stateClass, true, reload, mergeInto)
+    return getState(component, componentName, stateClass, reload, mergeInto)
   }
 
-  fun <S: Any> getState(component: Any?, componentName: String, stateClass: Class<S>, archive: Boolean = true, reload: Boolean = false, mergeInto: S? = null): S? {
-    return deserializeState(getSerializedState(getStorageData(reload), component, componentName, archive), stateClass, mergeInto)
+  fun <S: Any> getState(component: Any?,
+                        componentName: String,
+                        stateClass: Class<S>,
+                        reload: Boolean = false,
+                        mergeInto: S? = null): S? {
+    return deserializeState(getSerializedState(getStorageData(reload), component, componentName, true), stateClass, mergeInto)
   }
 
   open fun <S: Any> deserializeState(serializedState: Element?, stateClass: Class<S>, mergeInto: S?): S? {
diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java
index a20c461c3341..06bcb4378a4b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java
+++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java
@@ -33,7 +33,6 @@ import org.jetbrains.ide.PooledThreadExecutor;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
-import java.util.function.BiConsumer;
 
 /**
  * Methods in this class are used to equip long background processes which take read actions with a special listener
@@ -177,7 +176,7 @@ public class ProgressIndicatorUtils {
         }
       };
       application.addApplicationListener(listener);
-      future.whenComplete((BiConsumer<Object, Throwable>)(o, throwable) -> application.removeApplicationListener(listener));
+      future.whenComplete((__, ___) -> application.removeApplicationListener(listener));
       try {
         executor.execute(new Runnable() {
           @Override