diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
index 4fe4d407eb1..6fc8044ab7a 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.codegen.ClassBuilder
 import org.jetbrains.kotlin.codegen.SourceInfo
 import org.jetbrains.org.objectweb.asm.Label
 import org.jetbrains.org.objectweb.asm.MethodVisitor
-import java.util
 import java.util.*
 
 //TODO join parameter
@@ -352,7 +351,7 @@ data open public class RangeMapping(val source: Int, val dest: Int, var range: I
         return source + (destLine - dest)
     }
 
-    object Comparator : util.Comparator<RangeMapping> {
+    object Comparator : java.util.Comparator<RangeMapping> {
         override fun compare(o1: RangeMapping, o2: RangeMapping): Int {
             if (o1 == o2) return 0
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt
index 6d9a214ece3..4bd8f72caf1 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt
@@ -19,11 +19,11 @@ package org.jetbrains.kotlin.codegen.optimization.common
 import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.org.objectweb.asm.Type
 import org.jetbrains.org.objectweb.asm.tree.*
-import org.jetbrains.org.objectweb.asm.tree.analysis
-import org.jetbrains.org.objectweb.asm.tree.analysis.*
-import org.jetbrains.org.objectweb.asm.util.Printer
+import org.jetbrains.org.objectweb.asm.tree.analysis.AnalyzerException
+import org.jetbrains.org.objectweb.asm.tree.analysis.Frame
+import org.jetbrains.org.objectweb.asm.tree.analysis.Interpreter
+import org.jetbrains.org.objectweb.asm.tree.analysis.Value
 import java.util.*
-import kotlin.properties.Delegates
 
 public open class MethodAnalyzer<V : Value>(
         public val owner: String,
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateClassNameDiagnostics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateClassNameDiagnostics.kt
index e313fc5cd0f..4d162ab133d 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateClassNameDiagnostics.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateClassNameDiagnostics.kt
@@ -16,24 +16,12 @@
 
 package org.jetbrains.kotlin.codegen.state
 
-import com.intellij.psi.PsiElement
-import com.intellij.util.containers.MultiMap
 import org.jetbrains.kotlin.codegen.ClassBuilderFactory
-import org.jetbrains.kotlin.codegen.ClassBuilderMode
 import org.jetbrains.kotlin.codegen.ClassNameCollectionClassBuilderFactory
-import org.jetbrains.kotlin.codegen.SignatureCollectingClassBuilderFactory
-import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.diagnostics.DiagnosticSink
-import org.jetbrains.kotlin.diagnostics.Errors
-import org.jetbrains.kotlin.load.java.descriptors.SamAdapterDescriptor
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
-import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
-import org.jetbrains.kotlin.resolve.jvm
-import org.jetbrains.kotlin.resolve.jvm.diagnostics.*
-import org.jetbrains.kotlin.utils.addIfNotNull
-import org.jetbrains.kotlin.utils.join
-import java.util.*
+import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
+import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
 
 
 class BuilderFactoryForDuplicateClassNameDiagnostics(
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.kt b/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.kt
index 4d08ae2dad8..fb4d21e248a 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.kt
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.kt
@@ -27,8 +27,7 @@ import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.org.objectweb.asm.*
 import org.jetbrains.org.objectweb.asm.tree.MethodNode
-import java.util.ArrayList
-import java.util.HashSet
+import java.util.*
 import kotlin.properties.Delegates
 
 public object InlineTestUtil {
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt
index d53ba8682ca..4854f4c8e0c 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt
@@ -17,10 +17,8 @@
 package org.jetbrains.kotlin.load.kotlin
 
 import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer
-import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver
 import org.jetbrains.kotlin.types.FlexibleTypeCapabilities
-import org.jetbrains.kotlin.types
 
 object JavaFlexibleTypeCapabilitiesDeserializer : FlexibleTypeCapabilitiesDeserializer {
     override fun capabilitiesById(id: String): FlexibleTypeCapabilities? {
diff --git a/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt b/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt
index 093dec7c230..d4a29ea803e 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt
@@ -17,13 +17,13 @@
 package org.jetbrains.kotlin.generators.test.evaluate
 
 import com.intellij.testFramework.UsefulTestCase
-import org.jetbrains.kotlin.generators.evaluate
+import org.jetbrains.kotlin.generators.evaluate.DEST_FILE
+import org.jetbrains.kotlin.generators.evaluate.generate
 import org.jetbrains.kotlin.test.JetTestUtils
-import org.junit.Ignore
 
 public class GenerateOperationsMapTest : UsefulTestCase() {
     public fun testGeneratedDataIsUpToDate(): Unit {
-        val text = evaluate.generate()
-        JetTestUtils.assertEqualsToFile(evaluate.DEST_FILE, text)
+        val text = generate()
+        JetTestUtils.assertEqualsToFile(DEST_FILE, text)
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/refactoring/fqName/fqNameUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/refactoring/fqName/fqNameUtil.kt
index c5cc549dcc1..2ce7e0de8d0 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/refactoring/fqName/fqNameUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/refactoring/fqName/fqNameUtil.kt
@@ -23,7 +23,6 @@ import com.intellij.psi.PsiPackage
 import org.jetbrains.kotlin.asJava.namedUnwrappedElement
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.isOneSegmentFQN
-import org.jetbrains.kotlin.psi
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement
 import org.jetbrains.kotlin.resolve.ImportPath
@@ -54,7 +53,7 @@ fun JetSimpleNameExpression.changeQualifiedName(fqName: FqName): JetElement {
     assert(!fqName.isRoot()) { "Can't set empty FqName for element $this" }
 
     val shortName = fqName.shortName().asString()
-    val psiFactory = psi.JetPsiFactory(this)
+    val psiFactory = JetPsiFactory(this)
     val fqNameBase = (getParent() as? JetCallExpression)?.let { parent ->
         val callCopy = parent.copy() as JetCallExpression
         callCopy.getCalleeExpression()!!.replace(psiFactory.createSimpleName(shortName)).getParent()!!.getText()
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileStubForIde.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileStubForIde.kt
index 74199a4acc6..53110d22253 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileStubForIde.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileStubForIde.kt
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.psi.stubs.KotlinFileStub
-import org.jetbrains.kotlin.psi.stubs.impl
 import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl
 
 public class KotlinFileStubForIde(
diff --git a/idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt b/idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt
index 7ceb7d9087d..8477c78beb7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt
@@ -16,20 +16,15 @@
 
 package org.jetbrains.kotlin.idea
 
-import com.intellij.debugger.engine
-import com.intellij.debugger.engine.SuspendContext
-import org.jetbrains.kotlin.idea.debugger.JetPositionManager
-import com.sun.jdi.Location
-import org.jetbrains.kotlin.idea.util.application.runReadAction
 import com.intellij.debugger.NoDataException
-import com.sun.jdi.request.StepRequest
-import java.util.regex.Pattern
-import java.util.WeakHashMap
-import com.intellij.openapi.extensions.Extensions
-import com.intellij.ui.classFilter.DebuggerClassFilterProvider
+import com.intellij.debugger.engine.SuspendContext
 import com.intellij.debugger.settings.DebuggerSettings
+import com.sun.jdi.Location
+import com.sun.jdi.request.StepRequest
+import org.jetbrains.kotlin.idea.debugger.JetPositionManager
+import org.jetbrains.kotlin.idea.util.application.runReadAction
 
-public class ExtraSteppingFilter : engine.ExtraSteppingFilter {
+public class ExtraSteppingFilter : com.intellij.debugger.engine.ExtraSteppingFilter {
 
     override fun isApplicable(context: SuspendContext?): Boolean {
         if (context == null) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinCallerChooser.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinCallerChooser.kt
index 9ee84b4ed31..0919f5b7e0d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinCallerChooser.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinCallerChooser.kt
@@ -30,7 +30,6 @@ import com.intellij.ui.JBColor
 import com.intellij.ui.SimpleTextAttributes
 import com.intellij.ui.treeStructure.Tree
 import com.intellij.util.Consumer
-import com.intellij.util.containers
 import com.intellij.util.ui.UIUtil
 import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod
 import org.jetbrains.kotlin.asJava.namedUnwrappedElement
@@ -56,7 +55,7 @@ public class KotlinCallerChooser(
         previousTree: Tree?,
         callback: Consumer<Set<PsiElement>>
 ): CallerChooserBase<PsiElement>(declaration, project, title, previousTree, "dummy." + JetFileType.EXTENSION, callback) {
-    override fun createTreeNode(method: PsiElement?, called: containers.HashSet<PsiElement>, cancelCallback: Runnable): KotlinMethodNode {
+    override fun createTreeNode(method: PsiElement?, called: com.intellij.util.containers.HashSet<PsiElement>, cancelCallback: Runnable): KotlinMethodNode {
         return KotlinMethodNode(method, called, myProject, cancelCallback)
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinVariableInplaceIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinVariableInplaceIntroducer.kt
index 7df0eeb6479..f7f2625a616 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinVariableInplaceIntroducer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinVariableInplaceIntroducer.kt
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.template.TemplateBuilderImpl
 import com.intellij.codeInsight.template.impl.TemplateManagerImpl
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.util
+import com.intellij.openapi.util.Pair
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiElement
@@ -115,7 +115,7 @@ public class KotlinVariableInplaceIntroducer(
     }
 
     override fun buildTemplateAndStart(refs: Collection<PsiReference>,
-                                       stringUsages: Collection<util.Pair<PsiElement, TextRange>>,
+                                       stringUsages: Collection<Pair<PsiElement, TextRange>>,
                                        scope: PsiElement,
                                        containingFile: PsiFile): Boolean {
         myEditor.getCaretModel().moveToOffset(getNameIdentifier()!!.startOffset)
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
index eca21b76fbf..39b3b8c9824 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.jps.build
 
-import com.intellij.openapi.diagnostic
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.util.io.FileUtilRt
 import com.intellij.testFramework.TestLoggerFactory
@@ -77,7 +76,7 @@ public abstract class AbstractIncrementalJpsTest(
     protected var workDir: File by Delegates.notNull()
 
     private fun enableDebugLogging() {
-        diagnostic.Logger.setFactory(javaClass<TestLoggerFactory>())
+        com.intellij.openapi.diagnostic.Logger.setFactory(javaClass<TestLoggerFactory>())
         TestLoggerFactory.dumpLogToStdout("")
         TestLoggerFactory.enableDebugLogging(myTestRootDisposable, "#org")