diff --git a/platform/core-api/src/com/intellij/lang/folding/CompositeFoldingBuilder.java b/platform/core-api/src/com/intellij/lang/folding/CompositeFoldingBuilder.java
index fada2bbf298f..04d2c00b14fc 100644
--- a/platform/core-api/src/com/intellij/lang/folding/CompositeFoldingBuilder.java
+++ b/platform/core-api/src/com/intellij/lang/folding/CompositeFoldingBuilder.java
@@ -33,6 +33,7 @@ public class CompositeFoldingBuilder extends FoldingBuilderEx implements Possibl
     myBuilders = builders;
   }
 
+  @Override
   @NotNull
   public FoldingDescriptor[] buildFoldRegions(@NotNull PsiElement root, @NotNull Document document, boolean quick) {
     final List<FoldingDescriptor> descriptors = new ArrayList<>();
@@ -64,6 +65,7 @@ public class CompositeFoldingBuilder extends FoldingBuilderEx implements Possibl
     return !mayUseBuilder(node, builder) ? node.getText() : builder.getPlaceholderText(node);
   }
 
+  @Override
   public boolean isCollapsedByDefault(@NotNull ASTNode node) {
     final FoldingBuilder builder = node.getUserData(FOLDING_BUILDER);
     return mayUseBuilder(node, builder) && builder.isCollapsedByDefault(node);
diff --git a/platform/core-api/src/com/intellij/lang/folding/CustomFoldingBuilder.java b/platform/core-api/src/com/intellij/lang/folding/CustomFoldingBuilder.java
index 12e4be8b3f23..fe225f779c4b 100644
--- a/platform/core-api/src/com/intellij/lang/folding/CustomFoldingBuilder.java
+++ b/platform/core-api/src/com/intellij/lang/folding/CustomFoldingBuilder.java
@@ -32,8 +32,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import static com.intellij.lang.folding.CompositeFoldingBuilder.FOLDING_BUILDER;
-
 /**
  * Builds custom folding regions. If custom folding is supported for a language, its FoldingBuilder must be inherited from this class.
  * 
@@ -99,7 +97,7 @@ public abstract class CustomFoldingBuilder extends FoldingBuilderEx implements P
           ASTNode startNode = localFoldingStack.pop();
           int startOffset = startNode.getTextRange().getStartOffset();
           TextRange range = new TextRange(startOffset, child.getTextRange().getEndOffset());
-          startNode.getPsi().putUserData(FOLDING_BUILDER, this);
+          startNode.getPsi().putUserData(CompositeFoldingBuilder.FOLDING_BUILDER, this);
           descriptors.add(new FoldingDescriptor(startNode, range));
           Set<ASTNode> nodeSet = ourCustomRegionElements.get();
           nodeSet.add(startNode);
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingPolicy.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingPolicy.java
index 577a58d04d62..59fc048cb3b8 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingPolicy.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingPolicy.java
@@ -34,7 +34,7 @@ public class FoldingPolicy {
   
   private FoldingPolicy() {}
 
-  public static boolean isCollapseByDefault(PsiElement element) {
+  static boolean isCollapseByDefault(@NotNull PsiElement element) {
     final Language lang = element.getLanguage();
     final FoldingBuilder foldingBuilder = LanguageFolding.INSTANCE.forLanguage(lang);
     try {
diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialog.java b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialog.java
index 35eabfbc2838..e27f84dd5c0f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialog.java
+++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialog.java
@@ -27,8 +27,6 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import javax.swing.border.Border;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.io.File;
 
@@ -115,19 +113,11 @@ class ProgressDialog implements Disposable {
     }
     myInnerPanel.setPreferredSize(new Dimension(SystemInfo.isMac ? 350 : JBUI.scale(450), -1));
 
-    myCancelButton.addActionListener(new ActionListener() {
-      @Override
-      public void actionPerformed(@NotNull ActionEvent e) {
-        doCancelAction();
-      }
-    });
+    myCancelButton.addActionListener(__ -> doCancelAction());
 
-    myCancelButton.registerKeyboardAction(new ActionListener() {
-      @Override
-      public void actionPerformed(@NotNull ActionEvent e) {
-        if (myCancelButton.isEnabled()) {
-          doCancelAction();
-        }
+    myCancelButton.registerKeyboardAction(__ -> {
+      if (myCancelButton.isEnabled()) {
+        doCancelAction();
       }
     }, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
 
@@ -161,14 +151,6 @@ class ProgressDialog implements Disposable {
     return myPanel;
   }
 
-  void setShouldShowBackground(final boolean shouldShowBackground) {
-    myShouldShowBackground = shouldShowBackground;
-    SwingUtilities.invokeLater(() -> {
-      myBackgroundButton.setVisible(shouldShowBackground);
-      myPanel.revalidate();
-    });
-  }
-
   void changeCancelButtonText(String text) {
     myCancelButton.setText(text);
   }
@@ -195,7 +177,8 @@ class ProgressDialog implements Disposable {
 
     if (enable && !myProgressWindow.isCanceled()) {
       setCancelButtonEnabledASAP(true);
-    } else {
+    }
+    else {
       myDisableCancelAlarm.cancelAllRequests();
       myDisableCancelAlarm.addRequest(() -> setCancelButtonEnabledASAP(false), 500);
     }
@@ -212,15 +195,11 @@ class ProgressDialog implements Disposable {
     myCancelButton.setVisible(myProgressWindow.myShouldShowCancel);
 
     myBackgroundButton.setVisible(myShouldShowBackground);
-    myBackgroundButton.addActionListener(
-      new ActionListener() {
-        @Override
-        public void actionPerformed(@NotNull ActionEvent e) {
-          if (myShouldShowBackground) {
-            myProgressWindow.background();
-          }
-        }
+    myBackgroundButton.addActionListener(__ -> {
+      if (myShouldShowBackground) {
+        myProgressWindow.background();
       }
+     }
     );
   }
 
@@ -304,10 +283,6 @@ class ProgressDialog implements Disposable {
     return myProgressWindow instanceof PotemkinProgress;
   }
 
-  boolean wasShown() {
-    return myProgressWindow.isShowing();
-  }
-
   private class MyDialogWrapper extends DialogWrapper {
     private final boolean myIsCancellable;
 
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/BoundedWildcardInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/BoundedWildcardInspection.java
index 7df015dcae52..f45c4beb430e 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/BoundedWildcardInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/BoundedWildcardInspection.java
@@ -532,7 +532,6 @@ public class BoundedWildcardInspection extends AbstractBaseJavaLocalInspectionTo
                                         @NotNull PsiTypeParameter parameter,
                                         @NotNull PsiSubstitutor superClassSubstitutor) {
     return rootType.accept(new PsiTypeVisitor<Boolean>() {
-      boolean topLevel = true;
       @Nullable
       @Override
       public Boolean visitClassType(PsiClassType classType) {