diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts
index 3102a8f3160..eb7536a674a 100644
--- a/idea/idea-maven/build.gradle.kts
+++ b/idea/idea-maven/build.gradle.kts
@@ -26,7 +26,10 @@ dependencies {
     testCompile(projectTests(":idea:idea-test-framework"))
 
     testCompileOnly(intellijDep())
-    testCompileOnly(intellijPluginDep("maven"))
+    if (Ide.IJ()) {
+        testCompileOnly(intellijPluginDep("maven"))
+        testRuntime(intellijPluginDep("maven"))
+    }
 
     testCompile(project(":idea:idea-native")) { isTransitive = false }
     testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false }
@@ -51,14 +54,20 @@ dependencies {
     testRuntime(intellijPluginDep("gradle"))
     testRuntime(intellijPluginDep("Groovy"))
     testRuntime(intellijPluginDep("coverage"))
-    testRuntime(intellijPluginDep("maven"))
     testRuntime(intellijPluginDep("android"))
     testRuntime(intellijPluginDep("smali"))
 }
 
-sourceSets {
-    "main" { projectDefault() }
-    "test" { projectDefault() }
+if (Ide.IJ()) {
+    sourceSets {
+        "main" { projectDefault() }
+        "test" { projectDefault() }
+    }
+} else {
+    sourceSets {
+        "main" { }
+        "test" { }
+    }
 }
 
 testsJar()
@@ -67,8 +76,11 @@ projectTest {
     workingDir = rootDir
 }
 
-runtimeJar {
-    archiveName = "maven-ide.jar"
-}
 
-ideaPlugin()
\ No newline at end of file
+if (Ide.IJ()) {
+    runtimeJar {
+        archiveName = "maven-ide.jar"
+    }
+
+    ideaPlugin()
+}
diff --git a/idea/idea-maven/build.gradle.kts.as32 b/idea/idea-maven/build.gradle.kts.as32
deleted file mode 100644
index 7d78a259b88..00000000000
--- a/idea/idea-maven/build.gradle.kts.as32
+++ /dev/null
@@ -1,68 +0,0 @@
-
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-dependencies {
-    compile(project(":core:util.runtime"))
-    compile(project(":compiler:frontend"))
-    compile(project(":compiler:frontend.java"))
-    compile(project(":compiler:util"))
-    compile(project(":compiler:cli-common"))
-    compile(project(":kotlin-build-common"))
-
-    compile(project(":js:js.frontend"))
-
-    compile(project(":idea"))
-    compile(project(":idea:idea-jvm"))
-    compile(project(":idea:idea-jps-common"))
-
-    compileOnly(intellijDep())
-    excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) }
-
-    testCompile(projectTests(":idea"))
-    testCompile(projectTests(":compiler:tests-common"))
-    testCompile(projectTests(":idea:idea-test-framework"))
-
-    testCompileOnly(intellijDep())
-    //testCompileOnly(intellijPluginDep("maven"))
-
-    testCompile(project(":idea:idea-native")) { isTransitive = false }
-    testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false }
-    testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false }
-
-    testRuntime(project(":kotlin-reflect"))
-    testRuntime(project(":idea:idea-jvm"))
-    testRuntime(project(":idea:idea-android"))
-    testRuntime(project(":plugins:android-extensions-ide"))
-    testRuntime(project(":plugins:lint"))
-    testRuntime(project(":sam-with-receiver-ide-plugin"))
-    testRuntime(project(":allopen-ide-plugin"))
-    testRuntime(project(":noarg-ide-plugin"))
-    testRuntime(project(":kotlin-scripting-idea"))
-    testRuntime(project(":kotlinx-serialization-ide-plugin"))
-
-    testRuntime(intellijDep())
-    // TODO: the order of the plugins matters here, consider avoiding order-dependency
-    testRuntime(intellijPluginDep("junit"))
-    testRuntime(intellijPluginDep("testng"))
-    testRuntime(intellijPluginDep("properties"))
-    testRuntime(intellijPluginDep("gradle"))
-    testRuntime(intellijPluginDep("Groovy"))
-    testRuntime(intellijPluginDep("coverage"))
-    //testRuntime(intellijPluginDep("maven"))
-    testRuntime(intellijPluginDep("android"))
-    testRuntime(intellijPluginDep("smali"))
-}
-
-sourceSets {
-    "main" { /*projectDefault()*/ }
-    "test" { /*projectDefault()*/ }
-}
-
-testsJar()
-
-projectTest {
-    workingDir = rootDir
-}
diff --git a/idea/idea-maven/build.gradle.kts.as33 b/idea/idea-maven/build.gradle.kts.as33
deleted file mode 100644
index 4ecbe3f70dc..00000000000
--- a/idea/idea-maven/build.gradle.kts.as33
+++ /dev/null
@@ -1,74 +0,0 @@
-
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-dependencies {
-    compile(project(":core:util.runtime"))
-    compile(project(":compiler:frontend"))
-    compile(project(":compiler:frontend.java"))
-    compile(project(":compiler:util"))
-    compile(project(":compiler:cli-common"))
-    compile(project(":kotlin-build-common"))
-
-    compile(project(":js:js.frontend"))
-
-    compile(project(":idea"))
-    compile(project(":idea:idea-jvm"))
-    compile(project(":idea:idea-jps-common"))
-
-    compileOnly(intellijDep())
-    excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) }
-
-    testCompile(projectTests(":idea"))
-    testCompile(projectTests(":compiler:tests-common"))
-    testCompile(projectTests(":idea:idea-test-framework"))
-
-    testCompileOnly(intellijDep())
-    //testCompileOnly(intellijPluginDep("maven"))
-
-    testCompile(project(":idea:idea-native")) { isTransitive = false }
-    testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false }
-    testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false }
-
-    testRuntime(project(":kotlin-reflect"))
-    testRuntime(project(":idea:idea-jvm"))
-    testRuntime(project(":idea:idea-android"))
-    testRuntime(project(":plugins:android-extensions-ide"))
-    testRuntime(project(":plugins:lint"))
-    testRuntime(project(":sam-with-receiver-ide-plugin"))
-    testRuntime(project(":allopen-ide-plugin"))
-    testRuntime(project(":noarg-ide-plugin"))
-    testRuntime(project(":kotlin-scripting-idea"))
-    testRuntime(project(":kotlinx-serialization-ide-plugin"))
-
-    testRuntime(intellijDep())
-    // TODO: the order of the plugins matters here, consider avoiding order-dependency
-    testRuntime(intellijPluginDep("junit"))
-    testRuntime(intellijPluginDep("testng"))
-    testRuntime(intellijPluginDep("properties"))
-    testRuntime(intellijPluginDep("gradle"))
-    testRuntime(intellijPluginDep("Groovy"))
-    testRuntime(intellijPluginDep("coverage"))
-    //testRuntime(intellijPluginDep("maven"))
-    testRuntime(intellijPluginDep("android"))
-    testRuntime(intellijPluginDep("smali"))
-}
-
-sourceSets {
-    "main" { /*projectDefault()*/ }
-    "test" { /*projectDefault()*/ }
-}
-
-testsJar()
-
-projectTest {
-    workingDir = rootDir
-}
-
-runtimeJar {
-    archiveName = "maven-ide.jar"
-}
-
-ideaPlugin()
\ No newline at end of file
diff --git a/idea/idea-maven/build.gradle.kts.as34 b/idea/idea-maven/build.gradle.kts.as34
deleted file mode 100644
index 4ecbe3f70dc..00000000000
--- a/idea/idea-maven/build.gradle.kts.as34
+++ /dev/null
@@ -1,74 +0,0 @@
-
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-dependencies {
-    compile(project(":core:util.runtime"))
-    compile(project(":compiler:frontend"))
-    compile(project(":compiler:frontend.java"))
-    compile(project(":compiler:util"))
-    compile(project(":compiler:cli-common"))
-    compile(project(":kotlin-build-common"))
-
-    compile(project(":js:js.frontend"))
-
-    compile(project(":idea"))
-    compile(project(":idea:idea-jvm"))
-    compile(project(":idea:idea-jps-common"))
-
-    compileOnly(intellijDep())
-    excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) }
-
-    testCompile(projectTests(":idea"))
-    testCompile(projectTests(":compiler:tests-common"))
-    testCompile(projectTests(":idea:idea-test-framework"))
-
-    testCompileOnly(intellijDep())
-    //testCompileOnly(intellijPluginDep("maven"))
-
-    testCompile(project(":idea:idea-native")) { isTransitive = false }
-    testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false }
-    testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false }
-
-    testRuntime(project(":kotlin-reflect"))
-    testRuntime(project(":idea:idea-jvm"))
-    testRuntime(project(":idea:idea-android"))
-    testRuntime(project(":plugins:android-extensions-ide"))
-    testRuntime(project(":plugins:lint"))
-    testRuntime(project(":sam-with-receiver-ide-plugin"))
-    testRuntime(project(":allopen-ide-plugin"))
-    testRuntime(project(":noarg-ide-plugin"))
-    testRuntime(project(":kotlin-scripting-idea"))
-    testRuntime(project(":kotlinx-serialization-ide-plugin"))
-
-    testRuntime(intellijDep())
-    // TODO: the order of the plugins matters here, consider avoiding order-dependency
-    testRuntime(intellijPluginDep("junit"))
-    testRuntime(intellijPluginDep("testng"))
-    testRuntime(intellijPluginDep("properties"))
-    testRuntime(intellijPluginDep("gradle"))
-    testRuntime(intellijPluginDep("Groovy"))
-    testRuntime(intellijPluginDep("coverage"))
-    //testRuntime(intellijPluginDep("maven"))
-    testRuntime(intellijPluginDep("android"))
-    testRuntime(intellijPluginDep("smali"))
-}
-
-sourceSets {
-    "main" { /*projectDefault()*/ }
-    "test" { /*projectDefault()*/ }
-}
-
-testsJar()
-
-projectTest {
-    workingDir = rootDir
-}
-
-runtimeJar {
-    archiveName = "maven-ide.jar"
-}
-
-ideaPlugin()
\ No newline at end of file