diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerAction.java
index 111f1a627095..85abb77298a5 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerAction.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 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.
@@ -112,12 +112,6 @@ public abstract class DebuggerAction extends AnAction {
     }
   }
 
-  @Nullable
-  public static DebuggerStateManager getContextManager(DataContext dataContext) {
-    DebuggerTreePanel panel = getPanel(dataContext);
-    return panel == null ? null : panel.getContextManager();
-  }
-
   public static boolean isContextView(AnActionEvent e) {
     return DebuggerActions.EVALUATION_DIALOG_POPUP.equals(e.getPlace()) ||
            DebuggerActions.FRAME_PANEL_POPUP.equals(e.getPlace()) ||
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java
index 1dee56cb0cf1..d5a2a198f340 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java
@@ -46,7 +46,6 @@ import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.EditorNotifications;
@@ -337,7 +336,6 @@ public class JavaDebugProcess extends XDebugProcess {
         final Content threadsContent = ui.createContent(
           DebuggerContentInfo.THREADS_CONTENT, panel, XDebuggerBundle.message("debugger.session.tab.threads.title"),
           AllIcons.Debugger.Threads, null);
-        Disposer.register(threadsContent, panel);
         threadsContent.setCloseable(false);
         ui.addContent(threadsContent, 0, PlaceInGrid.left, true);
         ui.addListener(new ContentManagerAdapter() {
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/UpdatableDebuggerView.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/UpdatableDebuggerView.java
index 4a99a054d7c0..6bc3a5c41fbd 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/UpdatableDebuggerView.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/UpdatableDebuggerView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 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.
@@ -41,11 +41,7 @@ public abstract class UpdatableDebuggerView extends JPanel implements DebuggerVi
     myProject = project;
     myStateManager = stateManager;
 
-    final DebuggerContextListener contextListener = new DebuggerContextListener() {
-      public void changeEvent(@NotNull DebuggerContextImpl newContext, DebuggerSession.Event event) {
-        UpdatableDebuggerView.this.changeEvent(newContext, event);
-      }
-    };
+    final DebuggerContextListener contextListener = this::changeEvent;
     myStateManager.addListener(contextListener);
 
     registerDisposable(new Disposable() {