diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java
index 6b0f8bd88af6..8a3de84948ac 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java
@@ -66,8 +66,8 @@ public abstract class XVariablesViewBase extends XDebugView {
   protected XVariablesViewBase(@NotNull Project project, @NotNull XDebuggerEditorsProvider editorsProvider, @Nullable XValueMarkers<?, ?> markers) {
     myTreePanel = new XDebuggerTreePanel(
       project, editorsProvider, this, null, this instanceof XWatchesView ? XDebuggerActions.WATCHES_TREE_POPUP_GROUP : XDebuggerActions.VARIABLES_TREE_POPUP_GROUP, markers);
-    myTreePanel.getTree().getEmptyText().setText(XDebuggerBundle.message("debugger.variables.not.available"));
-    DnDManager.getInstance().registerSource(myTreePanel, myTreePanel.getTree());
+    getTree().getEmptyText().setText(XDebuggerBundle.message("debugger.variables.not.available"));
+    DnDManager.getInstance().registerSource(myTreePanel, getTree());
   }
 
   protected void buildTreeAndRestoreState(@NotNull final XStackFrame stackFrame) {
@@ -118,7 +118,7 @@ public abstract class XVariablesViewBase extends XDebugView {
     disposeTreeRestorer();
     removeSelectionListener();
     myFrameEqualityObject = stackFrame != null ? stackFrame.getEqualityObject() : null;
-    myTreeState = XDebuggerTreeState.saveState(myTreePanel.getTree());
+    myTreeState = XDebuggerTreeState.saveState(getTree());
   }
 
   private void removeSelectionListener() {
@@ -140,7 +140,7 @@ public abstract class XVariablesViewBase extends XDebugView {
     }
   }
 
-  public XDebuggerTree getTree() {
+  public final XDebuggerTree getTree() {
     return myTreePanel.getTree();
   }
 
@@ -152,7 +152,7 @@ public abstract class XVariablesViewBase extends XDebugView {
   public void dispose() {
     disposeTreeRestorer();
     removeSelectionListener();
-    DnDManager.getInstance().unregisterSource(myTreePanel, myTreePanel.getTree());
+    DnDManager.getInstance().unregisterSource(myTreePanel, getTree());
   }
 
   private class MySelectionListener implements SelectionListener {
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java
index 9aeff5030f14..78603db49d2f 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java
@@ -385,9 +385,6 @@ public class XDebuggerTree extends DnDAwareTree implements DataProvider, Disposa
           removeTreeListener(this); // remove the listener on first match
         }
       }
-
-      @Override
-      public void childrenLoaded(@NotNull XDebuggerTreeNode node, @NotNull List<XValueContainerNode<?>> children, boolean last) {}
     });
   }
 
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeListener.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeListener.java
index f2415f43bed3..9667bd915ebf 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeListener.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,9 @@ import java.util.List;
  * @author nik
  */
 public interface XDebuggerTreeListener {
-  void nodeLoaded(@NotNull RestorableStateNode node, final String name);
+  default void nodeLoaded(@NotNull RestorableStateNode node, final String name) {
+  }
 
-  void childrenLoaded(@NotNull XDebuggerTreeNode node, @NotNull List<XValueContainerNode<?>> children, final boolean last);
+  default void childrenLoaded(@NotNull XDebuggerTreeNode node, @NotNull List<XValueContainerNode<?>> children, final boolean last) {
+  }
 }
\ No newline at end of file
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeSpeedSearch.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeSpeedSearch.java
index 992af0a08d90..491863807bb3 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeSpeedSearch.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeSpeedSearch.java
@@ -18,10 +18,7 @@ package com.intellij.xdebugger.impl.ui.tree;
 import com.intellij.ui.TreeSpeedSearch;
 import com.intellij.util.ObjectUtils;
 import com.intellij.util.containers.Convertor;
-import com.intellij.xdebugger.impl.ui.tree.nodes.RestorableStateNode;
 import com.intellij.xdebugger.impl.ui.tree.nodes.XDebuggerTreeNode;
-import com.intellij.xdebugger.impl.ui.tree.nodes.XValueContainerNode;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.tree.TreeNode;
@@ -29,11 +26,9 @@ import javax.swing.tree.TreePath;
 import java.util.LinkedList;
 import java.util.List;
 
-class XDebuggerTreeSpeedSearch extends TreeSpeedSearch implements XDebuggerTreeListener {
+class XDebuggerTreeSpeedSearch extends TreeSpeedSearch {
   public XDebuggerTreeSpeedSearch(XDebuggerTree tree, Convertor<TreePath, String> toStringConvertor) {
     super(tree, toStringConvertor, true);
-
-    //((XDebuggerTree)myComponent).addTreeListener(this);
   }
 
   @Nullable
@@ -161,12 +156,4 @@ class XDebuggerTreeSpeedSearch extends TreeSpeedSearch implements XDebuggerTreeL
     TreePath path = node instanceof XDebuggerTreeNode ? ((XDebuggerTreeNode)node).getPath() : null;
     return isMatchingElement(path, string) ? path : null;
   }
-
-  @Override
-  public void nodeLoaded(@NotNull RestorableStateNode node, String name) {
-  }
-
-  @Override
-  public void childrenLoaded(@NotNull XDebuggerTreeNode node, @NotNull List<XValueContainerNode<?>> children, boolean last) {
-  }
 }
\ No newline at end of file