diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/events/DebuggerContextCommandImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/events/DebuggerContextCommandImpl.java
index af760160a191..7b75c441b52a 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/events/DebuggerContextCommandImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/events/DebuggerContextCommandImpl.java
@@ -9,7 +9,6 @@ import com.intellij.debugger.jdi.ThreadReferenceProxyImpl;
 import com.intellij.openapi.diagnostic.Logger;
 import com.sun.jdi.ObjectCollectedException;
 import com.sun.jdi.ThreadReference;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -84,17 +83,5 @@ public abstract class DebuggerContextCommandImpl extends SuspendContextCommandIm
     }
   }
 
-  /**
-   * @deprecated override {@link #threadAction(SuspendContextImpl)}
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
-  public void threadAction() {
-    throw new AbstractMethodError();
-  }
-
-  public void threadAction(@NotNull SuspendContextImpl suspendContext) {
-    //noinspection deprecation
-    threadAction();
-  }
+  public abstract void threadAction(@NotNull SuspendContextImpl suspendContext);
 }
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
index 6ed299c855f7..7351cf232dc2 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
@@ -362,15 +362,6 @@ public abstract class DebuggerUtilsEx extends DebuggerUtils {
     }
   }
 
-  /**
-   * @deprecated use {@link EvaluationContext#keep(Value)} directly
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
-  public static void keep(Value value, EvaluationContext context) {
-    context.keep(value);
-  }
-
   public static StringReference mirrorOfString(@NotNull String s, VirtualMachineProxyImpl virtualMachineProxy, EvaluationContext context)
     throws EvaluateException {
     return context.computeAndKeep(() -> virtualMachineProxy.mirrorOf(s));
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java
index a03c28d3b3a0..80a837ab1f9c 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java
@@ -344,7 +344,7 @@ public abstract class DebuggerTree extends DnDAwareTree implements DataProvider,
     }
 
     @Override
-    public void threadAction() {
+    public void threadAction(@NotNull SuspendContextImpl suspendContext) {
       ThreadDescriptorImpl threadDescriptor = ((ThreadDescriptorImpl)myNode.getDescriptor());
       ThreadReferenceProxyImpl threadProxy = threadDescriptor.getThreadReference();
       if (!threadProxy.isCollected() && getDebuggerContext().getDebugProcess().getSuspendManager().isSuspended(threadProxy)) {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/DebuggerMethods.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/DebuggerMethods.groovy
index 29ae462b59d8..85c002ca89aa 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/DebuggerMethods.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/DebuggerMethods.groovy
@@ -190,7 +190,7 @@ trait DebuggerMethods extends CompilerMethods {
     }
 
     @Override
-    void threadAction() {
+    void threadAction(@NotNull SuspendContextImpl suspendContext) {
       try {
         myResult = myAction()
       }
diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/dsl/DslFactory.kt b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/dsl/DslFactory.kt
index 6bdf82ec6d03..0e5f00c0c65d 100644
--- a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/dsl/DslFactory.kt
+++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/dsl/DslFactory.kt
@@ -49,9 +49,5 @@ interface DslFactory {
 
   fun updateTime(): Expression
 
-  @Deprecated("use createPeekCall(GenericType, Lambda): IntermediateStreamCall instead")
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
-  fun createPeekCall(elementsType: GenericType, lambda: String): IntermediateStreamCall
-
   fun createPeekCall(elementType: GenericType, lambda: Lambda): IntermediateStreamCall
 }
\ No newline at end of file
diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/dsl/impl/DslImpl.kt b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/dsl/impl/DslImpl.kt
index eb600793b0bf..d91deacf8837 100644
--- a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/dsl/impl/DslImpl.kt
+++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/dsl/impl/DslImpl.kt
@@ -64,9 +64,6 @@ class DslImpl(private val statementFactory: StatementFactory) : Dsl {
 
   override fun updateTime(): Expression = statementFactory.updateCurrentTimeExpression()
 
-  override fun createPeekCall(elementsType: GenericType, lambda: String): IntermediateStreamCall =
-    statementFactory.createPeekCall(elementsType, lambda)
-
   override fun createPeekCall(elementType: GenericType, lambda: Lambda): IntermediateStreamCall =
     statementFactory.createPeekCall(elementType, lambda)