diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/ExternalProjectSettings.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/ExternalProjectSettings.java
index ba97513e8a31..866848c1adab 100644
--- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/ExternalProjectSettings.java
+++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/ExternalProjectSettings.java
@@ -16,7 +16,6 @@
 package com.intellij.openapi.externalSystem.settings;
 
 import com.intellij.openapi.util.Comparing;
-import com.intellij.util.xmlb.annotations.AbstractCollection;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -37,7 +36,7 @@ public abstract class ExternalProjectSettings implements Comparable<ExternalProj
 
   @NotNull
   public Set<String> getModules() {
-    return myModules == null ? Collections.<String>emptySet() : myModules;
+    return myModules == null ? Collections.emptySet() : myModules;
   }
 
   public void setModules(@Nullable Set<String> modules) {
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/TaskCompletionProvider.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/TaskCompletionProvider.java
index bb178343685a..fabdfe8e2fa8 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/TaskCompletionProvider.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/TaskCompletionProvider.java
@@ -32,7 +32,6 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.TextAccessor;
-import com.intellij.util.BooleanFunction;
 import com.intellij.util.containers.ContainerUtil;
 import groovyjarjarcommonscli.Options;
 import icons.ExternalSystemIcons;
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalToolWindowManager.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalToolWindowManager.java
index aac83b3abc68..5058c4bd6c7f 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalToolWindowManager.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalToolWindowManager.java
@@ -37,28 +37,22 @@ public class ExternalToolWindowManager {
       settings.subscribe(new ExternalSystemSettingsListenerAdapter() {
         @Override
         public void onProjectsLinked(@NotNull Collection linked) {
-          if (settings.getLinkedProjectsSettings().size() != 1) {
-            return;
-          }
           ToolWindow toolWindow = getToolWindow(project, manager.getSystemId());
           if (toolWindow != null) {
             toolWindow.setAvailable(true, null);
           }
           else {
-            StartupManager.getInstance(project).runWhenProjectIsInitialized(new DumbAwareRunnable() {
-              @Override
-              public void run() {
-                if (project.isDisposed()) return;
+            StartupManager.getInstance(project).runWhenProjectIsInitialized((DumbAwareRunnable)() -> {
+              if (project.isDisposed()) return;
 
-                ExternalSystemUtil.ensureToolWindowInitialized(project, manager.getSystemId());
-                ToolWindowManager.getInstance(project).invokeLater(() -> {
-                  if (project.isDisposed()) return;
-                  ToolWindow toolWindow1 = getToolWindow(project, manager.getSystemId());
-                  if (toolWindow1 != null) {
-                    toolWindow1.setAvailable(true, null);
-                  }
-                });
-              }
+              ExternalSystemUtil.ensureToolWindowInitialized(project, manager.getSystemId());
+              ToolWindowManager.getInstance(project).invokeLater(() -> {
+                if (project.isDisposed()) return;
+                ToolWindow toolWindow1 = getToolWindow(project, manager.getSystemId());
+                if (toolWindow1 != null) {
+                  toolWindow1.setAvailable(true, null);
+                }
+              });
             });
           }
         }
diff --git a/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/AbstractExternalSystemTest.groovy b/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/AbstractExternalSystemTest.groovy
index cbb967d50584..97e51ae185a7 100644
--- a/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/AbstractExternalSystemTest.groovy
+++ b/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/AbstractExternalSystemTest.groovy
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 package com.intellij.openapi.externalSystem.test
+
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.extensions.ExtensionPoint
 import com.intellij.openapi.extensions.Extensions
@@ -21,12 +22,9 @@ import com.intellij.openapi.externalSystem.ExternalSystemManager
 import com.intellij.openapi.externalSystem.model.DataNode
 import com.intellij.openapi.externalSystem.model.project.ProjectData
 import com.intellij.openapi.externalSystem.service.project.manage.ProjectDataManager
-import com.intellij.openapi.externalSystem.util.DisposeAwareProjectChange
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.roots.ex.ProjectRootManagerEx
 import com.intellij.openapi.util.io.FileUtil
-import com.intellij.testFramework.PlatformTestCase
 import com.intellij.testFramework.SkipInHeadlessEnvironment
 import com.intellij.testFramework.UsefulTestCase
 import com.intellij.testFramework.fixtures.IdeaProjectTestFixture
@@ -37,6 +35,7 @@ import org.jetbrains.annotations.Nullable
 
 import java.lang.reflect.Field
 import java.lang.reflect.Modifier
+
 /**
  * @author Denis Zhdanov
  * @since 8/7/13 2:04 PM
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/GradleManager.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/GradleManager.java
index 42a2b87ea91a..fc892bb85a67 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/GradleManager.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/GradleManager.java
@@ -53,7 +53,6 @@ import com.intellij.util.Function;
 import com.intellij.util.PathUtil;
 import com.intellij.util.PathsList;
 import com.intellij.util.containers.ContainerUtilRt;
-import com.intellij.util.execution.ParametersListUtil;
 import com.intellij.util.messages.MessageBusConnection;
 import icons.GradleIcons;
 import org.jetbrains.annotations.NotNull;