diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/Context.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/Context.kt
index 18936dc60f0..18e0036bed5 100644
--- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/Context.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/Context.kt
@@ -35,7 +35,7 @@ open class Context(val buffer: StringBuffer = StringBuffer(), private var indent
         indentDepth--
         if (indentDepth < 0)
             throw InvalidIndent(indentDepth)
-        currentIndent = currentIndent.substring(0, currentIndent.length - indentUnit.length)
+        currentIndent = currentIndent.substring(0, currentIndent.length() - indentUnit.length())
     }
 
     public open fun write(what: String) {
diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/KotlinWriter.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/KotlinWriter.kt
index 2e807ed35e6..2837ecaabf2 100644
--- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/KotlinWriter.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/KotlinWriter.kt
@@ -26,28 +26,6 @@ class KotlinStringWriter : KotlinWriter {
     private val imports = ctx.fork()
     private val body = ctx.fork()
 
-    fun writeFunction(name: String,
-                      args: Collection<String>?,
-                      retType: String,
-                      statements: Collection<String>) {
-        val returnTerm = if (retType == "" || retType == "Unit") "" else ": $retType"
-        val argStr = if (args != null) args.join(", ") else ""
-        body.writeln("fun $name($argStr)$returnTerm {")
-        body.incIndent()
-        for (stmt in statements)
-            body.writeln(stmt)
-        body.decIndent()
-        body.writeln("}")
-    }
-
-    fun writeExtensionFunction(receiver: String,
-                               name: String,
-                               args: Collection<String>?,
-                               retType: String,
-                               body: Collection<String>) {
-        writeFunction("$receiver.$name", args, retType, body)
-    }
-
     fun writeImmutableProperty(name: String,
                                retType: String,
                                getterBody: Collection<String>) {
diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt
index 28f1a03f9c0..5dc5e1a6061 100644
--- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt
+++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt
@@ -63,7 +63,7 @@ public abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() {
     }
 
     private fun needsInvocationTest(path: String): Boolean {
-        return !FileUtil.findFilesByMask(Pattern.compile("^0.kt$"), File(path)).empty
+        return !FileUtil.findFilesByMask(Pattern.compile("^0.kt$"), File(path)).isEmpty()
     }
 
     override fun codegenTestBasePath(): String {
diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt
index e83038bc263..19fbb351c8d 100644
--- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt
+++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt
@@ -28,10 +28,6 @@ public abstract class AbstractAndroidBytecodeShapeTest : AbstractBytecodeTextTes
         return createEnvironmentForConfiguration(JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.ANDROID_API), path)
     }
 
-    private fun createFakeAndroidEnvironment(path: String) {
-        return createEnvironmentForConfiguration(JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK), path)
-    }
-
     private fun createEnvironmentForConfiguration(configuration: CompilerConfiguration, path: String) {
         val resPath = path + "res/layout/"
         val manifestPath = path + "../AndroidManifest.xml"
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractParserResultEqualityTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractParserResultEqualityTest.kt
index 70e738676d1..23087849e20 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractParserResultEqualityTest.kt
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractParserResultEqualityTest.kt
@@ -40,14 +40,7 @@ public abstract class AbstractParserResultEqualityTest : KotlinAndroidTestCase()
 
         assertEquals(cliResult, ideResult)
     }
-
-    private fun getEnvironment(testPath: String): KotlinCoreEnvironment {
-        val configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK)
-                configuration.put<String>(AndroidConfigurationKeys.ANDROID_RES_PATH, testPath + "/layout")
-                configuration.put<String>(AndroidConfigurationKeys.ANDROID_MANIFEST, testPath + "/AndroidManifest.xml")
-        return KotlinCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
-    }
-
+    
     override fun getTestDataPath(): String? {
         return KotlinAndroidTestCaseBase.getPluginTestDataPathBase() + "/parserResultEquality/" + getTestName(true) + "/"
     }