diff --git a/plugins/git4idea/src/git4idea/index/GitStageLineStatusTracker.kt b/plugins/git4idea/src/git4idea/index/GitStageLineStatusTracker.kt
index 1d0b0c057d12..4ac22cd019ac 100644
--- a/plugins/git4idea/src/git4idea/index/GitStageLineStatusTracker.kt
+++ b/plugins/git4idea/src/git4idea/index/GitStageLineStatusTracker.kt
@@ -44,9 +44,6 @@ import git4idea.GitUtil
 import git4idea.i18n.GitBundle
 import git4idea.index.actions.GitAddOperation
 import git4idea.index.actions.GitResetOperation
-import net.miginfocom.layout.CC
-import net.miginfocom.layout.LC
-import net.miginfocom.swing.MigLayout
 import org.jetbrains.annotations.CalledInAwt
 import org.jetbrains.annotations.Nls
 import java.awt.*
diff --git a/plugins/git4idea/src/git4idea/index/ui/GitCommitPanel.kt b/plugins/git4idea/src/git4idea/index/ui/GitCommitPanel.kt
index 21fd21d4080d..4b492c0e0408 100644
--- a/plugins/git4idea/src/git4idea/index/ui/GitCommitPanel.kt
+++ b/plugins/git4idea/src/git4idea/index/ui/GitCommitPanel.kt
@@ -16,8 +16,6 @@ import com.intellij.openapi.vcs.VcsBundle
 import com.intellij.openapi.vcs.VcsRoot
 import com.intellij.openapi.vcs.ui.CommitMessage
 import com.intellij.ui.JBColor
-import com.intellij.ui.components.JBPanel
-import com.intellij.ui.components.panels.HorizontalLayout
 import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.UIUtil
 import com.intellij.util.ui.components.BorderLayoutPanel
@@ -29,7 +27,6 @@ import java.awt.event.ActionEvent
 import javax.swing.AbstractAction
 import javax.swing.JButton
 import javax.swing.JComponent
-import javax.swing.SwingConstants
 import javax.swing.border.Border
 import javax.swing.border.EmptyBorder
 
diff --git a/plugins/git4idea/src/git4idea/index/ui/GitStagePanel.kt b/plugins/git4idea/src/git4idea/index/ui/GitStagePanel.kt
index 29b956ab5fe7..f394abf01ad5 100644
--- a/plugins/git4idea/src/git4idea/index/ui/GitStagePanel.kt
+++ b/plugins/git4idea/src/git4idea/index/ui/GitStagePanel.kt
@@ -38,7 +38,10 @@ import git4idea.i18n.GitBundle
 import git4idea.index.CommitListener
 import git4idea.index.GitStageTracker
 import git4idea.index.GitStageTrackerListener
-import git4idea.index.actions.*
+import git4idea.index.actions.GitAddOperation
+import git4idea.index.actions.GitResetOperation
+import git4idea.index.actions.StagingAreaOperation
+import git4idea.index.actions.performStageOperation
 import git4idea.merge.GitDefaultMergeDialogCustomizer
 import git4idea.merge.GitMergeUtil
 import git4idea.repo.GitRepository