diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibraryVersioning.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibraryVersioning.kt
index 0da8ee40e44..2ecea235483 100644
--- a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibraryVersioning.kt
+++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibraryVersioning.kt
@@ -11,11 +11,11 @@ data class KotlinLibraryVersioning(
 )
 
 fun Properties.writeKonanLibraryVersioning(versions: KotlinLibraryVersioning) {
-    versions.abiVersion ?. let { this.setProperty(KLIB_PROPERTY_ABI_VERSION, it.toString()) }
-    versions.libraryVersion ?. let { this.setProperty(KLIB_PROPERTY_LIBRARY_VERSION, it) }
-    versions.compilerVersion ?. let { this.setProperty(KLIB_PROPERTY_COMPILER_VERSION, it) }
-    versions.metadataVersion ?. let { this.setProperty(KLIB_PROPERTY_METADATA_VERSION, it) }
-    versions.irVersion ?. let { this.setProperty(KLIB_PROPERTY_IR_VERSION, it) }
+    versions.abiVersion?.let { this.setProperty(KLIB_PROPERTY_ABI_VERSION, it.toString()) }
+    versions.libraryVersion?.let { this.setProperty(KLIB_PROPERTY_LIBRARY_VERSION, it) }
+    versions.compilerVersion?.let { this.setProperty(KLIB_PROPERTY_COMPILER_VERSION, it) }
+    versions.metadataVersion?.let { this.setProperty(KLIB_PROPERTY_METADATA_VERSION, it) }
+    versions.irVersion?.let { this.setProperty(KLIB_PROPERTY_IR_VERSION, it) }
 }
 
 fun Properties.readKonanLibraryVersioning(): KotlinLibraryVersioning {
diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryImpl.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryImpl.kt
index 845c191827a..a198772b222 100644
--- a/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryImpl.kt
+++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryImpl.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.konan.properties.Properties
 import org.jetbrains.kotlin.konan.properties.loadProperties
 import org.jetbrains.kotlin.library.*
 
-open class BaseKotlinLibraryImpl(
+class BaseKotlinLibraryImpl(
     val access: BaseLibraryAccess<KotlinLibraryLayout>,
     override val isDefault: Boolean
 ) : BaseKotlinLibrary {
@@ -53,7 +53,7 @@ open class BaseKotlinLibraryImpl(
     }
 }
 
-open class MetadataLibraryImpl(
+class MetadataLibraryImpl(
     val access: MetadataLibraryAccess<MetadataKotlinLibraryLayout>
 ) : MetadataLibrary {
 
@@ -292,7 +292,7 @@ class IrPerFileLibraryImpl(_access: IrLibraryAccess<IrKotlinLibraryLayout>) : Ir
     }
 }
 
-open class KotlinLibraryImpl(
+class KotlinLibraryImpl(
     val base: BaseKotlinLibraryImpl,
     val metadata: MetadataLibraryImpl,
     val ir: IrLibraryImpl
diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryLayoutImpl.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryLayoutImpl.kt
index 9f67ec929ba..ae820e49318 100644
--- a/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryLayoutImpl.kt
+++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryLayoutImpl.kt
@@ -73,11 +73,11 @@ open class BaseLibraryAccess<L : KotlinLibraryLayout>(val klib: File, component:
 }
 
 
-open class MetadataLibraryAccess<L : KotlinLibraryLayout>(klib: File, component: String) : BaseLibraryAccess<L>(klib, component) {
+class MetadataLibraryAccess<L : KotlinLibraryLayout>(klib: File, component: String) : BaseLibraryAccess<L>(klib, component) {
     override val layout = MetadataLibraryLayoutImpl(klib, component)
 }
 
-open class IrLibraryAccess<L : KotlinLibraryLayout>(klib: File, component: String) : BaseLibraryAccess<L>(klib, component) {
+class IrLibraryAccess<L : KotlinLibraryLayout>(klib: File, component: String) : BaseLibraryAccess<L>(klib, component) {
     override val layout = IrLibraryLayoutImpl(klib, component)
 }
 
@@ -123,7 +123,7 @@ open class ExtractingKotlinLibraryLayout(zipped: KotlinLibraryLayoutImpl) : Kotl
     override val component = zipped.component
 }
 
-open class ExtractingBaseLibraryImpl(zipped: KotlinLibraryLayoutImpl) :
+class ExtractingBaseLibraryImpl(zipped: KotlinLibraryLayoutImpl) :
     ExtractingKotlinLibraryLayout(zipped) {
     override val manifestFile: File by lazy { zipped.extract(zipped.manifestFile) }
     override val resourcesDir: File by lazy { zipped.extractDir(zipped.resourcesDir) }
diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryWriterImpl.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryWriterImpl.kt
index 3dd2827aaf0..b6d3620dba8 100644
--- a/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryWriterImpl.kt
+++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/impl/KotlinLibraryWriterImpl.kt
@@ -24,7 +24,7 @@ open class KotlinLibraryLayoutForWriter(
         get() = File(unzippedDir, KLIB_MANIFEST_FILE_NAME)
 }
 
-open class BaseWriterImpl(
+class BaseWriterImpl(
     val libraryLayout: KotlinLibraryLayoutForWriter,
     moduleName: String,
     _versions: KotlinLibraryVersioning,
diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle
index 4b36103be04..ee395603a1a 100644
--- a/kotlin-native/build.gradle
+++ b/kotlin-native/build.gradle
@@ -80,8 +80,6 @@ ext {
 
     kotlinCompilerModule = project(":kotlin-compiler")
     kotlinStdLibModule= project(":kotlin-stdlib")
-    kotlinScriptRuntimeModule= project(":kotlin-script-runtime")
-    kotlinUtilKliMetadatabModule= project(":kotlin-util-klib-metadata")
 
     // A separate map for each build for automatic cleaning the daemon after the build have finished.
     toolClassLoadersMap = new ConcurrentHashMap<Object, URLClassLoader>()
diff --git a/kotlin-native/gradle/kotlinGradlePlugin.gradle b/kotlin-native/gradle/kotlinGradlePlugin.gradle
index 5a1992a65d7..ee8ebc44453 100644
--- a/kotlin-native/gradle/kotlinGradlePlugin.gradle
+++ b/kotlin-native/gradle/kotlinGradlePlugin.gradle
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.UtilsKt
-
 def kotlinRoot = ext.properties.containsKey("rootBuildDirectory") ? file("${ext.rootBuildDirectory}/..") : rootProject.projectDir
 File versionPropertiesFile = new File(kotlinRoot, "gradle/versions.properties")
 def versionProperties = new Properties()