diff --git a/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessClasspathManager.java b/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessClasspathManager.java
index d6bcb0b79aea..2394632e6501 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessClasspathManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessClasspathManager.java
@@ -15,6 +15,7 @@ import com.intellij.openapi.util.io.FileUtilRt;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.PathUtil;
 import com.intellij.util.io.URLUtil;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -31,10 +32,11 @@ public class BuildProcessClasspathManager {
 
   private volatile List<String> myCompileServerPluginsClasspath;
 
-  public BuildProcessClasspathManager(Disposable parentDisposable) {
+  public BuildProcessClasspathManager(@NotNull Disposable parentDisposable) {
     CompileServerPlugin.EP_NAME.addExtensionPointListener(() -> myCompileServerPluginsClasspath = null, parentDisposable);
   }
 
+  @NotNull
   public List<String> getBuildProcessPluginsClasspath(Project project) {
     List<String> staticClasspath = getStaticClasspath();
     List<String> dynamicClasspath = getDynamicClasspath(project);
@@ -48,6 +50,7 @@ public class BuildProcessClasspathManager {
     }
   }
 
+  @NotNull
   private List<String> getStaticClasspath() {
     List<String> cp = myCompileServerPluginsClasspath;
     if (cp == null) {
@@ -56,6 +59,7 @@ public class BuildProcessClasspathManager {
     return cp;
   }
 
+  @NotNull
   private static List<String> computeCompileServerPluginsClasspath() {
     final List<String> classpath = new ArrayList<>();
 
@@ -132,7 +136,7 @@ public class BuildProcessClasspathManager {
   }
 
   @Nullable
-  private static File getPluginDir(IdeaPluginDescriptor plugin) {
+  private static File getPluginDir(@NotNull IdeaPluginDescriptor plugin) {
     String pluginDirName = StringUtil.getShortName(plugin.getPluginId().getIdString());
     String extraDir = System.getProperty("idea.external.build.development.plugins.dir");
     if (extraDir != null) {
@@ -148,6 +152,7 @@ public class BuildProcessClasspathManager {
     return pluginHome.isDirectory() ? pluginHome : null;
   }
 
+  @NotNull
   private static List<String> getDynamicClasspath(Project project) {
     final List<String> classpath = new ArrayList<>();
     for (BuildProcessParametersProvider provider : BuildProcessParametersProvider.EP_NAME.getExtensionList(project)) {
@@ -156,6 +161,7 @@ public class BuildProcessClasspathManager {
     return classpath;
   }
 
+  @NotNull
   public static List<String> getLauncherClasspath(Project project) {
     final List<String> classpath = new ArrayList<>();
     for (BuildProcessParametersProvider provider : BuildProcessParametersProvider.EP_NAME.getExtensionList(project)) {
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessCustomPluginsConfiguration.java b/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessCustomPluginsConfiguration.java
index 87c98894ab8f..5c1460a21297 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessCustomPluginsConfiguration.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessCustomPluginsConfiguration.java
@@ -47,6 +47,7 @@ public class BuildProcessCustomPluginsConfiguration implements PersistentStateCo
     return myState.myProjectLibraries;
   }
 
+  @NotNull
   public List<String> getCustomPluginsClasspath() {
     return ReadAction.compute(() -> {
       List<String> result = new ArrayList<>();
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionProfileSchemesModel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionProfileSchemesModel.java
index 75b7f942bda4..436489ec2494 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionProfileSchemesModel.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionProfileSchemesModel.java
@@ -91,12 +91,7 @@ public abstract class InspectionProfileSchemesModel implements SchemesModel<Insp
   }
 
   private void removeProfile(@NotNull InspectionProfileImpl profile) {
-    for (SingleInspectionProfilePanel panel : myProfilePanels) {
-      if (panel.getProfile().equals(profile)) {
-        myProfilePanels.remove(panel);
-        break;
-      }
-    }
+    myProfilePanels.removeIf(panel -> panel.getProfile().equals(profile));
   }
 
   void updatePanel(@NotNull InspectionProfileSchemesPanel panel) {