diff --git a/platform/execution-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java b/platform/execution-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java
index bec06c424d12..dd9a516024b1 100644
--- a/platform/execution-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java
+++ b/platform/execution-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java
@@ -301,11 +301,7 @@ final class ProjectStartupConfigurable implements SearchableConfigurable, Config
 
   private void showPopup(AnActionButton button, JBPopup popup) {
     final RelativePoint point = button.getPreferredPopupPoint();
-    if (point != null) {
-      popup.show(point);
-    } else {
-      popup.showInCenterOf(myDecorator.getActionsPanel());
-    }
+    popup.show(point);
   }
 
   @Override
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java
index 2ad248815762..c1ff8fa62b84 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java
@@ -337,9 +337,7 @@ public final class ExternalProjectDataSelectorDialog extends DialogWrapper {
             rootModuleNode[0] = treeNode;
           }
           String ideGrouping = moduleData.getIdeGrouping();
-          if (ideGrouping != null) {
-            ideGroupingMap.put(ideGrouping, node);
-          }
+          ideGroupingMap.put(ideGrouping, node);
         } else {
           // add elements under module node like web/enterprise artifacts
           DataNode<ModuleData> parentModule = node.getParent(ModuleData.class);
diff --git a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
index 904d4c99f409..31869c181398 100644
--- a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
+++ b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
@@ -150,8 +150,7 @@ public abstract class AbstractWizard<T extends Step> extends DialogWrapper {
       buttonPanel.add(myNextButton);
       principalTouchbarButtons.add(myNextButton);
 
-      if (SystemInfo.isMac)
-        Touchbar.setButtonActions(panel, touchbarButtons, principalTouchbarButtons, myNextButton);
+      Touchbar.setButtonActions(panel, touchbarButtons, principalTouchbarButtons, myNextButton);
     }
     else {
       panel.add(buttonPanel, BorderLayout.CENTER);
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/SubCompositeConfigurable.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/SubCompositeConfigurable.java
index df73410701ea..731c8b5bd193 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/SubCompositeConfigurable.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/SubCompositeConfigurable.java
@@ -91,10 +91,7 @@ abstract class SubCompositeConfigurable implements SearchableConfigurable.Parent
 
       buildConfigurables();
       if (isChildrenMerged()) {
-        if (children.length == 0) {
-          rootComponent = root == null ? null : root.getComponent();
-        }
-        else if (root == null && children.length == 1) {
+        if (root == null) {
           rootComponent = children[0].createComponent();
         }
         else {