diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
index 1c883204b26..a4bfb28937b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
@@ -302,7 +302,7 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
         val projectVersion = loadKotlinVersionFromResource(log)
         val kotlinAnnotationProcessingDep = "org.jetbrains.kotlin:kotlin-annotation-processing:$projectVersion"
 
-        ext.sourceSets.all(Action<AndroidSourceSet> { sourceSet ->
+        ext.sourceSets.all { sourceSet ->
             if (sourceSet is HasConvention) {
                 val sourceSetName = sourceSet.name
                 val kotlinSourceSet = KotlinSourceSetImpl(sourceSetName, project.fileResolver)
@@ -313,17 +313,9 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
                 aptConfigurations.put(sourceSet.name,
                         project.createAptConfiguration(sourceSet.name, kotlinAnnotationProcessingDep))
 
-                /*TODO: before 0.11 gradle android plugin there was:
-                  sourceSet.getAllJava().source(kotlinDirSet)
-                  sourceSet.getAllSource().source(kotlinDirSet)
-                  AndroidGradleWrapper.getResourceFilter(sourceSet)?.exclude(KSpec({ elem ->
-                    kotlinDirSet.contains(elem.getFile())
-                  }))
-                 but those methods were removed so commented as temporary hack*/
-
                 project.logger.kotlinDebug("Created kotlin sourceDirectorySet at ${kotlinDirSet.srcDirs}")
             }
-        })
+        }
 
         val extensions = (ext as ExtensionAware).extensions
         extensions.add("kotlinOptions", K2JVMCompilerArguments::class.java)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
index e67f7ea141b..2f170f9350f 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
@@ -28,10 +28,6 @@ class AndroidGradleWrapper {
   }
 
   static def srcDir(Object androidSourceSet, Object kotlinDirSet) {
-    /*before 0.11 gradle android plugin there was:
-      androidSourceSet.getAllJava().source(kotlinDirSet)
-      androidSourceSet.getAllSource().source(kotlinDirSet)
-      but those methods were removed so as temporary hack next code was suggested*/
     androidSourceSet.getJava().srcDir(kotlinDirSet)
   }