diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java
index 8d97e808fa73..f48f1cd14025 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java
@@ -473,7 +473,7 @@ public class ModulesConfigurator implements ModulesProvider, ModuleEditor.Change
         ContainerUtil.addIfNotNull(modifiableRootModels, modifiableRootModel);
       }
 
-      ModuleDeleteProvider.removeModule(moduleToRemove, null, modifiableRootModels, myModuleModel);
+      ModuleDeleteProvider.removeModule(moduleToRemove, modifiableRootModels, myModuleModel);
       Disposer.dispose(editor);
     }
     processModuleCountChanged();
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/actions/ModuleDeleteProvider.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/actions/ModuleDeleteProvider.java
index 9aabb14c1f5a..ed2f2f74a343 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/actions/ModuleDeleteProvider.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/actions/ModuleDeleteProvider.java
@@ -41,7 +41,6 @@ import com.intellij.util.ArrayUtilRt;
 import com.intellij.util.PathUtilRt;
 import com.intellij.util.PlatformUtils;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -91,14 +90,13 @@ public class ModuleDeleteProvider  implements DeleteProvider, TitledHandler  {
         final ModifiableModuleModel modifiableModuleModel = moduleManager.getModifiableModel();
         final Map<Module, ModifiableRootModel> otherModuleRootModels = new HashMap<>();
         for (final Module module : modules) {
-          final ModifiableRootModel modifiableModel = ModuleRootManager.getInstance(module).getModifiableModel();
           for (final Module otherModule : currentModules) {
             if (otherModule == module || ArrayUtilRt.find(modules, otherModule) != -1) continue;
             if (!otherModuleRootModels.containsKey(otherModule)) {
               otherModuleRootModels.put(otherModule, ModuleRootManager.getInstance(otherModule).getModifiableModel());
             }
           }
-          removeModule(module, modifiableModel, otherModuleRootModels.values(), modifiableModuleModel);
+          removeModule(module, otherModuleRootModels.values(), modifiableModuleModel);
         }
         final ModifiableRootModel[] modifiableRootModels = otherModuleRootModels.values().toArray(new ModifiableRootModel[otherModuleRootModels.size()]);
         ModifiableModelCommitter.multiCommit(modifiableRootModels, modifiableModuleModel);
@@ -120,9 +118,8 @@ public class ModuleDeleteProvider  implements DeleteProvider, TitledHandler  {
   }
 
   public static void removeModule(@NotNull final Module moduleToRemove,
-                                   @Nullable ModifiableRootModel modifiableRootModelToRemove,
-                                   @NotNull Collection<ModifiableRootModel> otherModuleRootModels,
-                                   @NotNull final ModifiableModuleModel moduleModel) {
+                                  @NotNull Collection<ModifiableRootModel> otherModuleRootModels,
+                                  @NotNull final ModifiableModuleModel moduleModel) {
     // remove all dependencies on the module that is about to be removed
     for (final ModifiableRootModel modifiableRootModel : otherModuleRootModels) {
       final OrderEntry[] orderEntries = modifiableRootModel.getOrderEntries();
@@ -135,10 +132,6 @@ public class ModuleDeleteProvider  implements DeleteProvider, TitledHandler  {
         }
       }
     }
-    // destroyProcess editor
-    if (modifiableRootModelToRemove != null) {
-      modifiableRootModelToRemove.dispose();
-    }
     // destroyProcess module
     moduleModel.disposeModule(moduleToRemove);
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java
index 1fe2389befdc..dde2b905353c 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java
@@ -531,7 +531,7 @@ public class MvcModuleStructureUtil {
 
     final ModifiableModuleModel moduleModel = moduleManager.getModifiableModel();
 
-    ModuleDeleteProvider.removeModule(toRemove, null, usingModels, moduleModel);
+    ModuleDeleteProvider.removeModule(toRemove, usingModels, moduleModel);
 
     ModifiableModelCommitter.multiCommit(usingModels, moduleModel);
   }