diff --git a/idea/testData/editor/optimizeImports/common/TypeAliasUsage.kt b/idea/testData/editor/optimizeImports/common/TypeAliasUsage.kt
deleted file mode 100644
index 23c3ef723c2..00000000000
--- a/idea/testData/editor/optimizeImports/common/TypeAliasUsage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-import kotlin.Any
-
-fun foo(): Any  {
-    throw UnsupportedOperationException()
-}
\ No newline at end of file
diff --git a/idea/testData/editor/optimizeImports/common/TypeAliasUsage.kt.after b/idea/testData/editor/optimizeImports/common/TypeAliasUsage.kt.after
deleted file mode 100644
index 27c7029047d..00000000000
--- a/idea/testData/editor/optimizeImports/common/TypeAliasUsage.kt.after
+++ /dev/null
@@ -1,3 +0,0 @@
-fun foo(): Any  {
-    throw UnsupportedOperationException()
-}
\ No newline at end of file
diff --git a/idea/testData/editor/optimizeImports/js/DefaultJsImports.kt b/idea/testData/editor/optimizeImports/js/DefaultJsImports.kt
index 2aca1955775..3d77e417e90 100644
--- a/idea/testData/editor/optimizeImports/js/DefaultJsImports.kt
+++ b/idea/testData/editor/optimizeImports/js/DefaultJsImports.kt
@@ -10,4 +10,3 @@ fun main(args: Array<String>) {
 }
 
 // For KT-3620 Don't auto-import kotlin.js.* and remove in `optimize imports`
-// JS
diff --git a/idea/testData/editor/optimizeImports/js/DefaultJsImports.kt.after b/idea/testData/editor/optimizeImports/js/DefaultJsImports.kt.after
index 71337f115af..79835cbdbec 100644
--- a/idea/testData/editor/optimizeImports/js/DefaultJsImports.kt.after
+++ b/idea/testData/editor/optimizeImports/js/DefaultJsImports.kt.after
@@ -8,4 +8,3 @@ fun main(args: Array<String>) {
 }
 
 // For KT-3620 Don't auto-import kotlin.js.* and remove in `optimize imports`
-// JS
diff --git a/idea/testData/editor/optimizeImports/jvm/KDocReference.kt b/idea/testData/editor/optimizeImports/jvm/KDocReference.kt
index 74f6890e09e..de92f1a10b5 100644
--- a/idea/testData/editor/optimizeImports/jvm/KDocReference.kt
+++ b/idea/testData/editor/optimizeImports/jvm/KDocReference.kt
@@ -1,4 +1,3 @@
-// RUNTIME
 import kotlin.concurrent.fixedRateTimer
 import kotlin.concurrent.read
 import java.util.ArrayList
diff --git a/idea/testData/editor/optimizeImports/jvm/KDocReference.kt.after b/idea/testData/editor/optimizeImports/jvm/KDocReference.kt.after
index ef56925a10b..62198b1319e 100644
--- a/idea/testData/editor/optimizeImports/jvm/KDocReference.kt.after
+++ b/idea/testData/editor/optimizeImports/jvm/KDocReference.kt.after
@@ -1,4 +1,3 @@
-// RUNTIME
 import java.util.ArrayList
 import kotlin.concurrent.fixedRateTimer
 
diff --git a/idea/testData/editor/optimizeImports/jvm/UnusedImports.kt.after b/idea/testData/editor/optimizeImports/jvm/UnusedImports.kt.after
index c7d967b7a13..8f83e37726c 100644
--- a/idea/testData/editor/optimizeImports/jvm/UnusedImports.kt.after
+++ b/idea/testData/editor/optimizeImports/jvm/UnusedImports.kt.after
@@ -1,7 +1,6 @@
 import java.util.ArrayList
 import java.util.HashMap
 import kotlin.system.measureTimeMillis
-import kotlin.test.Asserter
 
 class Action {
     fun test() {
diff --git a/idea/testData/editor/optimizeImports/jvm/UnusedImportsInScript.kts b/idea/testData/editor/optimizeImports/jvm/UnusedImportsInScript.kts
index 0b58a114845..8a05f70b9c7 100644
--- a/idea/testData/editor/optimizeImports/jvm/UnusedImportsInScript.kts
+++ b/idea/testData/editor/optimizeImports/jvm/UnusedImportsInScript.kts
@@ -1,19 +1,13 @@
-import com.sun.corba.se.impl.util.JDKBridge
 import kotlin.collections.filter
 import java.lang.StringBuilder
-import java.net.HttpRetryException
 import java.util.ArrayList
 import java.util.HashMap
-import kotlin.test.Asserter
-import kotlin.Charsets
-import kotlin.Assertions
+import kotlin.text.Charsets
 import kotlin.system.measureTimeMillis
 
 class Action {
     fun test() {
         val chs = Charsets.UTF8
-        val traait : Asserter? = null
-        val objectImport : Assertions? = null
         measureTimeMillis({ println(HashMap<String, Int>().size) })
         val test : ArrayList<Int>? = null
     }
diff --git a/idea/testData/editor/optimizeImports/jvm/UnusedImportsInScript.kts.after b/idea/testData/editor/optimizeImports/jvm/UnusedImportsInScript.kts.after
index 2c86d7f4e12..a92bab40094 100644
--- a/idea/testData/editor/optimizeImports/jvm/UnusedImportsInScript.kts.after
+++ b/idea/testData/editor/optimizeImports/jvm/UnusedImportsInScript.kts.after
@@ -5,8 +5,6 @@ import kotlin.system.measureTimeMillis
 class Action {
     fun test() {
         val chs = Charsets.UTF8
-        val traait : Asserter? = null
-        val objectImport : Assertions? = null
         measureTimeMillis({ println(HashMap<String, Int>().size) })
         val test : ArrayList<Int>? = null
     }
diff --git a/idea/testData/editor/optimizeImports/jvm/UnusedImportsInScript.kts.log b/idea/testData/editor/optimizeImports/jvm/UnusedImportsInScript.kts.log
new file mode 100644
index 00000000000..38cc289e418
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/jvm/UnusedImportsInScript.kts.log
@@ -0,0 +1,2 @@
+Additional checking of reference Getter: Charsets
+Additional checking of reference KtSimpleNameReference: Charsets
diff --git a/idea/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt b/idea/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt
index d275aa9bd55..328e7f7b9a3 100644
--- a/idea/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt
+++ b/idea/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt
@@ -1,5 +1,4 @@
 // NAME_COUNT_TO_USE_STAR_IMPORT: 1
-// RUNTIME_WITH_FULL_JDK
 import java.lang.Character.*
 
 /**
diff --git a/idea/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt.after b/idea/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt.after
index 61bf3b9bfd4..d29294db141 100644
--- a/idea/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt.after
+++ b/idea/testData/editor/optimizeImports/jvm/allUnderImports/ClassNameConflictWithinDefaultImports.kt.after
@@ -1,5 +1,4 @@
 // NAME_COUNT_TO_USE_STAR_IMPORT: 1
-// RUNTIME_WITH_FULL_JDK
 import java.lang.Character.UPPERCASE_LETTER
 
 /**
diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/JsOptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/imports/JsOptimizeImportsTestGenerated.java
index dd7bebe02a2..ed5da5feebd 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/imports/JsOptimizeImportsTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/imports/JsOptimizeImportsTestGenerated.java
@@ -174,11 +174,6 @@ public class JsOptimizeImportsTestGenerated extends AbstractJsOptimizeImportsTes
             runTest("idea/testData/editor/optimizeImports/common/TwoConstructors.kt");
         }
 
-        @TestMetadata("TypeAliasUsage.kt")
-        public void testTypeAliasUsage() throws Exception {
-            runTest("idea/testData/editor/optimizeImports/common/TypeAliasUsage.kt");
-        }
-
         @TestMetadata("idea/testData/editor/optimizeImports/common/kt21515")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/JvmOptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/imports/JvmOptimizeImportsTestGenerated.java
index 013bfc6ad5a..7d6660f1909 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/imports/JvmOptimizeImportsTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/imports/JvmOptimizeImportsTestGenerated.java
@@ -367,11 +367,6 @@ public class JvmOptimizeImportsTestGenerated extends AbstractJvmOptimizeImportsT
             runTest("idea/testData/editor/optimizeImports/common/TwoConstructors.kt");
         }
 
-        @TestMetadata("TypeAliasUsage.kt")
-        public void testTypeAliasUsage() throws Exception {
-            runTest("idea/testData/editor/optimizeImports/common/TypeAliasUsage.kt");
-        }
-
         @TestMetadata("idea/testData/editor/optimizeImports/common/kt21515")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)