diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt
index 42e2857b715..c916a251e4a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt
@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.psi
 
-import com.intellij.lang.ASTNode
 import com.intellij.lang.ASTNode
 import com.intellij.navigation.ItemPresentation
 import com.intellij.navigation.ItemPresentationProviders
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
index 2d55457acc5..9eb675300ee 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
@@ -43,7 +43,6 @@ import org.jetbrains.kotlin.js.translate.utils.PsiUtils.getPrimaryConstructorPar
 import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.simpleReturnFunction
 import org.jetbrains.kotlin.js.translate.utils.jsAstUtils.toInvocationWith
 import org.jetbrains.kotlin.psi.JetClass
-import org.jetbrains.kotlin.psi.JetClass
 import org.jetbrains.kotlin.psi.JetClassOrObject
 import org.jetbrains.kotlin.psi.JetObjectDeclaration
 import org.jetbrains.kotlin.psi.JetSecondaryConstructor
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt
index f2c496d7056..dd2af1d92d4 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt
@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils
 import org.jetbrains.kotlin.js.translate.context.Namer.*
 import org.jetbrains.kotlin.js.translate.utils.jsAstUtils.*
 import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.*
-import org.jetbrains.kotlin.resolve.DescriptorUtils.isExtension
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
 
@@ -64,7 +63,7 @@ public fun MutableList<JsPropertyInitializer>.addGetterAndSetter(
         generateSetter: () -> JsPropertyInitializer
 ) {
     val to: MutableList<JsPropertyInitializer>
-    if (!isExtension(descriptor)) {
+    if (!descriptor.isExtension) {
         to = SmartList<JsPropertyInitializer>()
         this.add(JsPropertyInitializer(context.getNameForDescriptor(descriptor).makeRef(), JsObjectLiteral(to, true)))
     }
@@ -138,7 +137,7 @@ private class PropertyTranslator(
         val delegateRef = getDelegateNameRef(propertyName)
         val delegatedJsCall = CallTranslator.translate(context(), delegatedCall, delegateRef)
 
-        if (isExtension(getterDescriptor)) {
+        if (getterDescriptor.isExtension) {
             val receiver = function.addParameter(getReceiverParameterName()).getName()
             val arguments = (delegatedJsCall as JsInvocation).getArguments()
             arguments.set(0, receiver.makeRef())
@@ -168,7 +167,7 @@ private class PropertyTranslator(
             val delegatedJsCall = CallTranslator.translate(withAliased, delegatedCall, getDelegateNameRef(correspondingPropertyName))
             function.addStatement(delegatedJsCall.makeStmt())
 
-            if (isExtension(setterDescriptor)) {
+            if (setterDescriptor.isExtension) {
                 val receiver = function.addParameter(getReceiverParameterName(), 0).getName()
                 (delegatedJsCall as JsInvocation).getArguments().set(0, receiver.makeRef())
             }