diff --git a/java/java-tests/testSrc/com/intellij/roots/OrderEntriesTest.java b/java/java-tests/testSrc/com/intellij/roots/OrderEntriesTest.java
index c2bffba57dda..e2ff28a82912 100644
--- a/java/java-tests/testSrc/com/intellij/roots/OrderEntriesTest.java
+++ b/java/java-tests/testSrc/com/intellij/roots/OrderEntriesTest.java
@@ -83,7 +83,6 @@ public class OrderEntriesTest extends ModuleRootManagerTestCase {
   }
 
   private void assertOrderFiles(final OrderRootType type, VirtualFile... files) {
-    assertOrderedEquals(ModuleRootManager.getInstance(myModule).getFiles(type), files);
     assertRoots(collectByOrderEnumerator(type), files);
   }
 
diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/ModifiableRootModel.java b/platform/projectModel-api/src/com/intellij/openapi/roots/ModifiableRootModel.java
index 2277d4f19954..87e0c9dbce80 100644
--- a/platform/projectModel-api/src/com/intellij/openapi/roots/ModifiableRootModel.java
+++ b/platform/projectModel-api/src/com/intellij/openapi/roots/ModifiableRootModel.java
@@ -151,23 +151,12 @@ public interface ModifiableRootModel extends ModuleRootModel {
    */
   void inheritSdk();
 
-  /**
-   * @deprecated see {@link ModuleRootManager#getFiles(OrderRootType)} for replacement
-   */
-  @NotNull VirtualFile[] getOrderedRoots(OrderRootType type);
-
-
   void setExplodedDirectory(VirtualFile file);
 
   void setExplodedDirectory(String url);
 
   boolean isChanged();
 
-  /**
-   * @deprecated see {@link ModuleRootManager#getUrls(OrderRootType)} for replacement
-   */
-  @NotNull String[] getOrderedRootUrls(OrderRootType type);
-
   boolean isExcludeExplodedDirectory();
 
   void setExcludeExplodedDirectory(boolean excludeExplodedDir);
diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootManager.java b/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootManager.java
index 6acc55da8169..deb9134da0c0 100644
--- a/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootManager.java
+++ b/platform/projectModel-api/src/com/intellij/openapi/roots/ModuleRootManager.java
@@ -16,7 +16,6 @@
 package com.intellij.openapi.roots;
 
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -35,34 +34,6 @@ public abstract class ModuleRootManager implements ModuleRootModel {
     return module.getComponent(ModuleRootManager.class);
   }
 
-  /**
-   * Returns the list of roots of the specified type for the current module and all modules it depends on.
-   *
-   * @param type the type of roots requested.
-   * @return the list of roots.
-   *
-   * @deprecated
-   * <ul>
-   *   <li> to get {@link OrderRootType#CLASSES} use <code>OrderEnumerator.orderEntries(module).getAllLibrariesAndSdkClassesRoots()<code>
-   *   <li> to get {@link OrderRootType#SOURCES} use <code>OrderEnumerator.orderEntries(module).getAllSourceRoots()<code>
-   */
-  @NotNull
-  public abstract VirtualFile[] getFiles(OrderRootType type);
-
-  /**
-   * Returns the list of URLs of roots of the specified type for the current module and all modules it depends on.
-   *
-   * @param type the type of roots requested.
-   * @return the list of root URLs.
-
-   * @deprecated
-   * <ul>
-   *   <li> to get {@link OrderRootType#CLASSES} use <code>OrderEnumerator.orderEntries(module).withoutModuleSourceEntries().recursively().exportedOnly().classes().getUrls()<code>
-   *   <li> to get {@link OrderRootType#SOURCES} use <code>OrderEnumerator.orderEntries(module).recursively().exportedOnly().sources().getUrls()<code>
-   */
-  @NotNull
-  public abstract String[] getUrls(OrderRootType type);
-
   /**
    * Returns the file index for the current module.
    *
diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectRootManager.java b/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectRootManager.java
index 2f6b4204bbff..8da7c492019a 100644
--- a/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectRootManager.java
+++ b/platform/projectModel-api/src/com/intellij/openapi/roots/ProjectRootManager.java
@@ -51,11 +51,6 @@ public abstract class ProjectRootManager implements ModificationTracker {
   @NotNull
   public abstract ProjectFileIndex getFileIndex();
 
-  /**
-   * @deprecated use {@link #orderEntries()}
-   */
-  public abstract VirtualFile[] getFilesFromAllModules(OrderRootType type);
-
   /**
    * Creates new enumerator instance to process dependencies of all modules in the project. Only first level dependencies of
    * modules are processed so {@link OrderEnumerator#recursively()} option is ignored and {@link OrderEnumerator#withoutDepModules()} option is forced
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java
index 431ff368eea0..71ff5f7bf1a3 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java
@@ -168,16 +168,6 @@ public class ModuleRootManagerImpl extends ModuleRootManager implements ModuleCo
     return myRootModel.isSdkInherited();
   }
 
-  @NotNull
-  public VirtualFile[] getFiles(OrderRootType type) {
-    return getCachingEnumeratorForType(type, myModule, false).getRoots();
-  }
-
-  @NotNull
-  public String[] getUrls(OrderRootType type) {
-    return getCachingEnumeratorForType(type, myModule, false).getUrls();
-  }
-
   void commitModel(RootModelImpl rootModel) {
     ApplicationManager.getApplication().assertWriteAccessAllowed();
     LOG.assertTrue(rootModel.myModuleRootManager == this);
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java
index 7bcb2d0f215e..0271361b07c3 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java
@@ -176,16 +176,6 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj
     return VfsUtilCore.toVirtualFileArray(result);
   }
 
-  @Override
-  public VirtualFile[] getFilesFromAllModules(OrderRootType type) {
-    final List<VirtualFile> result = new ArrayList<VirtualFile>();
-    for (Module module : getModuleManager().getSortedModules()) {
-      final VirtualFile[] files = ModuleRootManager.getInstance(module).getFiles(type);
-      ContainerUtil.addAll(result, files);
-    }
-    return VfsUtilCore.toVirtualFileArray(result);
-  }
-
   @NotNull
   @Override
   public OrderEnumerator orderEntries() {
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java
index c50c7949a17c..b32f7201af8f 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java
@@ -247,28 +247,6 @@ public class RootModelImpl extends RootModelBase implements ModifiableRootModel
     return myOrderRootPointerContainers.get(orderRootType);
   }
 
-  @Override
-  @NotNull
-  public VirtualFile[] getOrderedRoots(OrderRootType type) {
-    final ArrayList<VirtualFile> result = new ArrayList<VirtualFile>();
-
-    for (OrderEntry orderEntry : getOrderEntries()) {
-      ContainerUtil.addAll(result, orderEntry.getFiles(type));
-    }
-    return ContainerUtil.toArray(result, new VirtualFile[result.size()]);
-  }
-
-  @Override
-  @NotNull
-  public String[] getOrderedRootUrls(OrderRootType type) {
-    final ArrayList<String> result = new ArrayList<String>();
-
-    for (OrderEntry orderEntry : getOrderEntries()) {
-      ContainerUtil.addAll(result, orderEntry.getUrls(type));
-    }
-    return ContainerUtil.toArray(result, new String[result.size()]);
-  }
-
   @Override
   @NotNull
   public OrderEntry[] getOrderEntries() {
diff --git a/plugins/git4idea/tests/git4idea/test/GitMockProjectRootManager.groovy b/plugins/git4idea/tests/git4idea/test/GitMockProjectRootManager.groovy
index f88dbf85c1ce..edcd0b9e5960 100644
--- a/plugins/git4idea/tests/git4idea/test/GitMockProjectRootManager.groovy
+++ b/plugins/git4idea/tests/git4idea/test/GitMockProjectRootManager.groovy
@@ -45,10 +45,6 @@ class GitMockProjectRootManager extends ProjectRootManager {
 
 
 
-  @Override
-  VirtualFile[] getFilesFromAllModules(OrderRootType type) {
-    throw new UnsupportedOperationException()
-  }
 
   @Override
   OrderEnumerator orderEntries() {