diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/workspacemodel/ArtifactManagerBridge.kt b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/workspacemodel/ArtifactManagerBridge.kt
index e7273f0f3aa5..0b6aa993afeb 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/workspacemodel/ArtifactManagerBridge.kt
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/workspacemodel/ArtifactManagerBridge.kt
@@ -317,7 +317,7 @@ class ArtifactManagerBridge(private val project: Project) : ArtifactManager(), D
 
   @RequiresWriteLock
   fun dropMappings(selector: (ArtifactEntity) -> Boolean) {
-    // XXX @RequiresReadLock annotation doesn't work for kt now
+    // XXX @RequiresWriteLock annotation doesn't work for kt now
     ApplicationManager.getApplication().assertWriteAccessAllowed()
     (project.workspaceModel as WorkspaceModelImpl).updateProjectModelSilent("Drop artifact mappings") {
       val map = it.mutableArtifactsMap
diff --git a/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/facet/FacetManagerBridge.kt b/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/facet/FacetManagerBridge.kt
index e92154ef4a80..e61886c39dc9 100644
--- a/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/facet/FacetManagerBridge.kt
+++ b/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/facet/FacetManagerBridge.kt
@@ -1,7 +1,6 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.workspaceModel.ide.impl.legacyBridge.facet
 
-import com.google.common.collect.HashBiMap
 import com.intellij.facet.*
 import com.intellij.facet.impl.FacetModelBase
 import com.intellij.facet.impl.FacetUtil
@@ -202,15 +201,6 @@ open class FacetModelBridge(private val moduleBridge: ModuleBridge) : FacetModel
     return facet
   }
 
-  fun populateFrom(mapping: HashBiMap<FacetEntity, Facet<*>>) {
-    updateDiffOrStorage {
-      for ((entity, facet) in mapping) {
-        this.addMapping(entity, facet)
-      }
-    }
-    facetsChanged()
-  }
-
   public override fun facetsChanged() {
     super.facetsChanged()
   }
diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/ProjectLibraryTableBridgeImpl.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/ProjectLibraryTableBridgeImpl.kt
index 61705fcce2aa..2bbb1a66012b 100644
--- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/ProjectLibraryTableBridgeImpl.kt
+++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/library/ProjectLibraryTableBridgeImpl.kt
@@ -140,12 +140,12 @@ class ProjectLibraryTableBridgeImpl(
     }
 
     if (targetBuilder == null) {
-      (WorkspaceModel.getInstance(project) as WorkspaceModelImpl).updateProjectModelSilent("Add project library mapping") {
-        for ((entity, library) in libraries) {
-          it.mutableLibraryMap.addIfAbsent(entity, library)
-        }
-      }
       withContext(Dispatchers.EDT) {
+        (WorkspaceModel.getInstance(project) as WorkspaceModelImpl).updateProjectModelSilent("Add project library mapping") {
+          for ((entity, library) in libraries) {
+            it.mutableLibraryMap.addIfAbsent(entity, library)
+          }
+        }
         ApplicationManager.getApplication().runWriteAction {
           for ((_, library) in libraries) {
             dispatcher.multicaster.afterLibraryAdded(library)
diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModuleLibraryTableBridgeImpl.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModuleLibraryTableBridgeImpl.kt
index b039a6ca5539..e24514e1872c 100644
--- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModuleLibraryTableBridgeImpl.kt
+++ b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ModuleLibraryTableBridgeImpl.kt
@@ -8,8 +8,6 @@ import com.intellij.openapi.roots.impl.libraries.LibraryEx
 import com.intellij.openapi.roots.libraries.Library
 import com.intellij.openapi.roots.libraries.PersistentLibraryKind
 import com.intellij.openapi.util.Disposer
-import com.intellij.workspaceModel.ide.WorkspaceModel
-import com.intellij.workspaceModel.ide.impl.WorkspaceModelImpl
 import com.intellij.workspaceModel.ide.impl.legacyBridge.library.LibraryBridgeImpl
 import com.intellij.workspaceModel.ide.impl.legacyBridge.library.ProjectLibraryTableBridgeImpl.Companion.libraryMap
 import com.intellij.workspaceModel.ide.impl.legacyBridge.library.ProjectLibraryTableBridgeImpl.Companion.mutableLibraryMap
@@ -28,7 +26,7 @@ class ModuleLibraryTableBridgeImpl(private val moduleBridge: ModuleBridge) : Mod
     Disposer.register(moduleBridge, this)
   }
 
-  fun registerModuleLibraryInstances(builder: MutableEntityStorage?) {
+  fun registerModuleLibraryInstances(builder: MutableEntityStorage) {
     libraryEntities().forEach { addLibrary(it, builder) }
   }
 
@@ -55,7 +53,7 @@ class ModuleLibraryTableBridgeImpl(private val moduleBridge: ModuleBridge) : Mod
     return false
   }
 
-  fun addLibrary(entity: LibraryEntity, storageBuilder: MutableEntityStorage?): LibraryBridgeImpl {
+  fun addLibrary(entity: LibraryEntity, storageBuilder: MutableEntityStorage): LibraryBridgeImpl {
     val library = LibraryBridgeImpl(
       libraryTable = this,
       project = module.project,
@@ -63,14 +61,7 @@ class ModuleLibraryTableBridgeImpl(private val moduleBridge: ModuleBridge) : Mod
       initialEntityStorage = moduleBridge.entityStorage,
       targetBuilder = storageBuilder
     )
-    if (storageBuilder != null) {
-      storageBuilder.mutableLibraryMap.addMapping(entity, library)
-    }
-    else {
-      (WorkspaceModel.getInstance(moduleBridge.project) as WorkspaceModelImpl).updateProjectModelSilent("Add module library mapping") {
-        it.mutableLibraryMap.addMapping(entity, library)
-      }
-    }
+    storageBuilder.mutableLibraryMap.addMapping(entity, library)
     return library
   }