diff --git a/platform/platform-impl/src/com/intellij/util/ContentUtilEx.java b/platform/platform-impl/src/com/intellij/util/ContentUtilEx.java
index 83e7e63517d4..822fd572bc33 100644
--- a/platform/platform-impl/src/com/intellij/util/ContentUtilEx.java
+++ b/platform/platform-impl/src/com/intellij/util/ContentUtilEx.java
@@ -110,11 +110,6 @@ public class ContentUtilEx extends ContentsUtil {
     return tabbedContent;
   }
 
-  public static boolean isContentTab(@NotNull Content content, @NotNull String groupPrefix) {
-    return (content instanceof TabbedContent && content.getTabName().startsWith(getFullPrefix(groupPrefix))) ||
-           groupPrefix.equals(content.getUserData(Content.TAB_GROUP_NAME_KEY));
-  }
-
   @NotNull
   public static String getFullName(@NotNull String groupPrefix, @NotNull String tabName) {
     return getFullPrefix(groupPrefix) + tabName;
@@ -219,23 +214,22 @@ public class ContentUtilEx extends ContentsUtil {
     return -1;
   }
 
-  public static boolean renameTabbedContent(@NotNull ContentManager manager,
-                                            @NotNull JComponent contentComponent,
-                                            @NotNull String newName) {
+  public static void renameTabbedContent(@NotNull ContentManager manager,
+                                         @NotNull JComponent contentComponent,
+                                         @NotNull String newName) {
     for (Content content : manager.getContents()) {
       if (content instanceof TabbedContentImpl) {
         if (((TabbedContentImpl)content).rename(contentComponent, newName)) {
-          return true;
+          return;
         }
       }
       else if (Comparing.equal(content.getComponent(), contentComponent)) {
         String groupPrefix = content.getUserData(Content.TAB_GROUP_NAME_KEY);
         if (groupPrefix != null) {
           content.setDisplayName(getFullName(groupPrefix, newName));
-          return true;
+          return;
         }
       }
     }
-    return false;
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/util/IJSwingUtilities.java b/platform/platform-impl/src/com/intellij/util/IJSwingUtilities.java
index 9dc34d4e4d38..5cf404ec3ead 100644
--- a/platform/platform-impl/src/com/intellij/util/IJSwingUtilities.java
+++ b/platform/platform-impl/src/com/intellij/util/IJSwingUtilities.java
@@ -5,6 +5,7 @@ import com.intellij.ide.ui.UISettings;
 import com.intellij.openapi.wm.ex.WindowManagerEx;
 import com.intellij.ui.EditorTextField;
 import com.intellij.util.ui.JBSwingUtilities;
+import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -29,8 +30,7 @@ public class IJSwingUtilities extends JBSwingUtilities {
     Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
 
     // verify focusOwner is a descendant of c
-    for (Component temp = focusOwner; temp != null; temp = (temp instanceof Window) ? null : temp.getParent())
-    {
+    for (Component temp = focusOwner; temp != null; temp = (temp instanceof Window) ? null : temp.getParent()) {
       if (temp == c) {
         return focusOwner;
       }
@@ -45,11 +45,11 @@ public class IJSwingUtilities extends JBSwingUtilities {
    */
   public static boolean hasFocus2(Component component) {
     WindowManagerEx windowManager = WindowManagerEx.getInstanceEx();
-    Window activeWindow=null;
+    Window activeWindow = null;
     if (windowManager != null) {
       activeWindow = windowManager.getMostRecentFocusedWindow();
     }
-    if(activeWindow==null){
+    if (activeWindow == null) {
       return false;
     }
     Component focusedComponent = windowManager.getFocusedComponent(activeWindow);
@@ -60,57 +60,22 @@ public class IJSwingUtilities extends JBSwingUtilities {
     return SwingUtilities.isDescendingFrom(focusedComponent, component);
   }
 
-  /**
-   * This method is copied from {@code SwingUtilities}.
-   * Returns index of the first occurrence of {@code mnemonic}
-   * within string {@code text}. Matching algorithm is not
-   * case-sensitive.
-   *
-   * @param text The text to search through, may be null
-   * @param mnemonic The mnemonic to find the character for.
-   * @return index into the string if exists, otherwise -1
-   */
-  public static int findDisplayedMnemonicIndex(String text, int mnemonic) {
-    if (text == null || mnemonic == '\0') {
-      return -1;
-    }
-
-    char uc = Character.toUpperCase((char)mnemonic);
-    char lc = Character.toLowerCase((char)mnemonic);
-
-    int uci = text.indexOf(uc);
-    int lci = text.indexOf(lc);
-
-    if (uci == -1) {
-      return lci;
-    } else if(lci == -1) {
-      return uci;
-    } else {
-      return (lci < uci) ? lci : uci;
-    }
-  }
-
-  public static void adjustComponentsOnMac(@Nullable JComponent component) {
-    adjustComponentsOnMac(null, component);
-  }
-
-
   public static void adjustComponentsOnMac(@Nullable JLabel label, @Nullable JComponent component) {
     if (component == null) return;
     if (!UIUtil.isUnderAquaLookAndFeel()) return;
 
     if (component instanceof JComboBox) {
-      UIUtil.addInsets(component, new Insets(0,-2,0,0));
+      UIUtil.addInsets(component, JBUI.insetsLeft(-2));
       if (label != null) {
-        UIUtil.addInsets(label, new Insets(0,2,0,0));
+        UIUtil.addInsets(label, JBUI.insetsLeft(2));
       }
     }
     if (component instanceof JCheckBox) {
-      UIUtil.addInsets(component, new Insets(0,-5,0,0));
+      UIUtil.addInsets(component, JBUI.insetsLeft(-5));
     }
     if (component instanceof JTextField || component instanceof EditorTextField) {
       if (label != null) {
-        UIUtil.addInsets(label, new Insets(0,3,0,0));
+        UIUtil.addInsets(label, JBUI.insetsLeft(3));
       }
     }
   }
@@ -127,9 +92,9 @@ public class IJSwingUtilities extends JBSwingUtilities {
 
   /**
    * A copy of javax.swing.SwingUtilities#updateComponentTreeUI that invokes children updateUI() first
-
+   *
    * @param c component
-   * @see javax.swing.SwingUtilities#updateComponentTreeUI
+   * @see SwingUtilities#updateComponentTreeUI
    */
   public static void updateComponentTreeUI(@Nullable Component c) {
     if (c == null) return;
diff --git a/platform/platform-impl/src/com/intellij/util/SingleAlarm.kt b/platform/platform-impl/src/com/intellij/util/SingleAlarm.kt
index 13f6d039d894..62cae30819ba 100644
--- a/platform/platform-impl/src/com/intellij/util/SingleAlarm.kt
+++ b/platform/platform-impl/src/com/intellij/util/SingleAlarm.kt
@@ -15,11 +15,12 @@ class SingleAlarm @JvmOverloads constructor(private val task: Runnable,
                                                                                                              threadToUse = ThreadToUse.SWING_THREAD,
                                                                                                              modalityState = modalityState)
 
-  constructor(task: Runnable, delay: Int, threadToUse: Alarm.ThreadToUse, parentDisposable: Disposable) : this(task,
-                                                                                                               delay = delay,
-                                                                                                               parentDisposable = parentDisposable,
-                                                                                                               threadToUse = threadToUse,
-                                                                                                               modalityState = computeDefaultModality(threadToUse))
+  constructor(task: Runnable, delay: Int, threadToUse: ThreadToUse, parentDisposable: Disposable) : this(task,
+                                                                                                         delay = delay,
+                                                                                                         parentDisposable = parentDisposable,
+                                                                                                         threadToUse = threadToUse,
+                                                                                                         modalityState = computeDefaultModality(
+                                                                                                           threadToUse))
 
   init {
     if (threadToUse == ThreadToUse.SWING_THREAD && modalityState == null) {