diff --git a/idea/idea.iml b/idea/idea.iml
index 7223af26e6a..78bb4b737cc 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -45,7 +45,7 @@
     <orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="android_tests" level="project" />
-    <orderEntry type="module" module-name="android-compiler-plugin" />
-    <orderEntry type="module" module-name="android-idea-plugin" />
+    <orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
+    <orderEntry type="module" module-name="android-idea-plugin" scope="TEST" />
   </component>
 </module>
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt
index 29f47fdfee4..ed591d294a4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt
@@ -30,9 +30,7 @@ import org.jetbrains.kotlin.idea.findUsages.KotlinFunctionFindUsagesOptions
 import org.jetbrains.kotlin.idea.findUsages.toJavaMethodOptions
 import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.components.ServiceManager
-import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor
 import com.intellij.psi.xml.XmlAttribute
-import org.jetbrains.jet.lang.resolve.android.isAndroidSyntheticElement
 import org.jetbrains.kotlin.psi.JetProperty
 import com.intellij.find.findUsages.JavaVariableFindUsagesOptions
 import java.util.ArrayList
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt
index 8d3fd6c6d70..048fa16c7db 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt
@@ -42,9 +42,6 @@ import org.jetbrains.kotlin.resolve.OverrideResolver
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
-import org.jetbrains.jet.lang.resolve.android.isAndroidSyntheticElement
-import com.intellij.openapi.components.ServiceManager
-import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlParser
 
 public class RenameKotlinPropertyProcessor : RenamePsiElementProcessor() {
     override fun canProcessElement(element: PsiElement): Boolean = element.namedUnwrappedElement is JetProperty