diff --git a/platform/lang-impl/src/com/intellij/mock/MockFileManager.java b/platform/lang-impl/src/com/intellij/mock/MockFileManager.java
index 361c5aba72a6..d8f711f13b6f 100644
--- a/platform/lang-impl/src/com/intellij/mock/MockFileManager.java
+++ b/platform/lang-impl/src/com/intellij/mock/MockFileManager.java
@@ -16,10 +16,12 @@
 package com.intellij.mock;
 
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.*;
+import com.intellij.psi.FileViewProvider;
+import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.SingleRootFileViewProvider;
 import com.intellij.psi.impl.PsiManagerEx;
 import com.intellij.psi.impl.file.impl.FileManager;
-import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.containers.FactoryMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -50,10 +52,6 @@ public class MockFileManager implements FileManager {
     throw new UnsupportedOperationException("Method dispose is not yet implemented in " + getClass().getName());
   }
 
-  public void runStartupActivity() {
-    throw new UnsupportedOperationException("Method runStartupActivity is not yet implemented in " + getClass().getName());
-  }
-
   @Nullable
   public PsiFile findFile(@NotNull VirtualFile vFile) {
     return getCachedPsiFile(vFile);
@@ -75,16 +73,6 @@ public class MockFileManager implements FileManager {
     return provider.getPsi(provider.getBaseLanguage());
   }
 
-  @NotNull
-  public GlobalSearchScope getResolveScope(@NotNull PsiElement element) {
-    return new MockGlobalSearchScope();
-  }
-
-  @NotNull
-  public GlobalSearchScope getUseScope(@NotNull PsiElement element) {
-    return GlobalSearchScope.allScope(element.getProject());
-  }
-
   public void cleanupForNextTest() {
     myViewProviders.clear();
   }
@@ -104,5 +92,4 @@ public class MockFileManager implements FileManager {
   public List<PsiFile> getAllCachedFiles() {
     throw new UnsupportedOperationException("Method getAllCachedFiles is not yet implemented in " + getClass().getName());
   }
-
 }
diff --git a/platform/lang-impl/src/com/intellij/mock/MockPsiManager.java b/platform/lang-impl/src/com/intellij/mock/MockPsiManager.java
index 354d5cdf47e8..998029ded646 100644
--- a/platform/lang-impl/src/com/intellij/mock/MockPsiManager.java
+++ b/platform/lang-impl/src/com/intellij/mock/MockPsiManager.java
@@ -26,7 +26,6 @@ import com.intellij.psi.impl.PsiManagerEx;
 import com.intellij.psi.impl.PsiModificationTrackerImpl;
 import com.intellij.psi.impl.PsiTreeChangeEventImpl;
 import com.intellij.psi.impl.file.impl.FileManager;
-import com.intellij.psi.impl.source.resolve.ResolveCache;
 import com.intellij.psi.util.PsiModificationTracker;
 import gnu.trove.THashMap;
 import org.jetbrains.annotations.NotNull;
@@ -39,7 +38,6 @@ public class MockPsiManager extends PsiManagerEx {
   private final Map<VirtualFile,PsiDirectory> myDirectories = new THashMap<VirtualFile, PsiDirectory>();
   private MockFileManager myMockFileManager;
   private PsiModificationTrackerImpl myPsiModificationTracker;
-  private ResolveCache myResolveCache;
 
   public MockPsiManager() {
     this(null);
@@ -139,14 +137,6 @@ public class MockPsiManager extends PsiManagerEx {
     throw new UnsupportedOperationException();
   }
 
-  @NotNull
-  public ResolveCache getResolveCache() {
-    if (myResolveCache == null) {
-      myResolveCache = new ResolveCache(getProject().getMessageBus());
-    }
-    return myResolveCache;
-  }
-
   public void registerRunnableToRunOnChange(@NotNull Runnable runnable) {
   }
 
diff --git a/platform/testFramework/src/com/intellij/mock/MockProject.java b/platform/testFramework/src/com/intellij/mock/MockProject.java
index afe7d9274caf..f5e91689d222 100644
--- a/platform/testFramework/src/com/intellij/mock/MockProject.java
+++ b/platform/testFramework/src/com/intellij/mock/MockProject.java
@@ -16,13 +16,10 @@
 package com.intellij.mock;
 
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.components.impl.stores.IProjectStore;
 import com.intellij.openapi.project.ex.ProjectEx;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.pom.PomModel;
-import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -45,11 +42,6 @@ public class MockProject extends MockComponentManager implements ProjectEx {
   public void checkUnknownMacros(final boolean showDialog) {
   }
 
-  @NotNull
-  public PomModel getModel() {
-    return ServiceManager.getService(this, PomModel.class);
-  }
-
   @NotNull
   @Override
   public Condition getDisposed() {
@@ -143,9 +135,4 @@ public class MockProject extends MockComponentManager implements ProjectEx {
   @Override
   public void save() {
   }
-
-  public GlobalSearchScope getAllScope() {
-    return new MockGlobalSearchScope();
-  }
-
 }