diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffManager.java b/platform/platform-api/src/com/intellij/openapi/diff/DiffManager.java
index faf011565519..7f82f37c309b 100644
--- a/platform/platform-api/src/com/intellij/openapi/diff/DiffManager.java
+++ b/platform/platform-api/src/com/intellij/openapi/diff/DiffManager.java
@@ -15,13 +15,8 @@
  */
 package com.intellij.openapi.diff;
 
-import com.intellij.openapi.Disposable;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.editor.markup.MarkupEditorFilter;
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NotNull;
-
-import java.awt.*;
 
 /**
  * @deprecated use {@link com.intellij.diff.DiffManager} instead
@@ -46,13 +41,4 @@ public abstract class DiffManager {
   public abstract DiffTool getIdeaDiffTool();
 
   public abstract MarkupEditorFilter getDiffEditorFilter();
-
-  /**
-   * @param window     this window will be disposed, when user clicks on the line number
-   *                   You must call Disposer.dispose() when done.
-   * @param parentTool @deprecated use {@link #createDiffPanel(Window, Project, Disposable)} instead
-   */
-  public abstract DiffPanel createDiffPanel(Window window, @NotNull Project project, DiffTool parentTool);
-
-  public abstract DiffPanel createDiffPanel(Window window, @NotNull Project project, @NotNull Disposable parentDisposable, DiffTool parentTool);
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/BinaryDiffTool.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/BinaryDiffTool.java
index 920c824e4343..9e06b78417f4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/BinaryDiffTool.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/BinaryDiffTool.java
@@ -133,9 +133,7 @@ public class BinaryDiffTool implements DiffTool {
     public DiffPanel create(final Window window, final Disposable disposable, final BinaryDiffTool tool) {
       if (! myCanCreatePanel) return null;
 
-      final Project project = myData.getProject();
-      final DiffPanel panel = DiffManager.getInstance().createDiffPanel(window, project, disposable, tool);
-      panel.setDiffRequest(myData);
+      final DiffPanel panel = DiffManagerImpl.createDiffPanel(myData, window, disposable, tool);
       panel.removeStatusBar();
       return panel;
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffManagerImpl.java
index 002c5f7a4b3c..baaccbf14644 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffManagerImpl.java
@@ -16,7 +16,6 @@ import com.intellij.openapi.diff.impl.DiffUtil;
 import com.intellij.openapi.diff.impl.mergeTool.MergeTool;
 import com.intellij.openapi.diff.impl.processing.HighlightMode;
 import com.intellij.openapi.editor.markup.MarkupEditorFilter;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.vcs.changes.actions.migrate.MigrateDiffTool;
 import com.intellij.util.config.*;
@@ -136,18 +135,6 @@ public class DiffManagerImpl extends DiffManager implements PersistentStateCompo
     return DIFF_EDITOR_FILTER;
   }
 
-  @Override
-  public DiffPanel createDiffPanel(Window window, @NotNull Project project, DiffTool parentTool) {
-    return new DiffPanelImpl(window, project, true, true, FULL_DIFF_DIVIDER_POLYGONS_OFFSET, parentTool);
-  }
-
-  @Override
-  public DiffPanel createDiffPanel(Window window, @NotNull Project project, @NotNull Disposable parentDisposable, DiffTool parentTool) {
-    DiffPanel diffPanel = createDiffPanel(window, project, parentTool);
-    Disposer.register(parentDisposable, diffPanel);
-    return diffPanel;
-  }
-
   public static DiffManagerImpl getInstanceEx() {
     return (DiffManagerImpl)DiffManager.getInstance();
   }
@@ -194,10 +181,11 @@ public class DiffManagerImpl extends DiffManager implements PersistentStateCompo
     return myProperties;
   }
 
-  static DiffPanel createDiffPanel(DiffRequest data, Window window, @NotNull Disposable parentDisposable, FrameDiffTool tool) {
+  static DiffPanel createDiffPanel(DiffRequest data, Window window, @NotNull Disposable parentDisposable, DiffTool tool) {
     DiffPanel diffPanel = null;
     try {
-      diffPanel = DiffManager.getInstance().createDiffPanel(window, data.getProject(), parentDisposable, tool);
+      diffPanel = new DiffPanelImpl(window, data.getProject(), true, true, FULL_DIFF_DIVIDER_POLYGONS_OFFSET, tool);
+      Disposer.register(parentDisposable, diffPanel);
       int contentCount = data.getContents().length;
       LOG.assertTrue(contentCount == 2, String.valueOf(contentCount));
       LOG.assertTrue(data.getContentTitles().length == contentCount);