diff --git a/platform/lang-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanDelegate.java b/platform/lang-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanDelegate.java
index 8d9471c6db62..3c36e63c4764 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanDelegate.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanDelegate.java
@@ -9,7 +9,6 @@ import com.intellij.psi.PsiElement;
 import com.intellij.refactoring.rename.RenameProcessor;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.util.containers.MultiMap;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -78,24 +77,6 @@ public abstract class InvertBooleanDelegate {
     return false;
   }
 
-  /**
-   * Use {@link #collectForeignElementsToInvert(PsiElement, PsiElement, Language, Collection)} instead
-   * @deprecated To be removed in 2018.3
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2018.3")
-  protected static PsiElement getForeignElementToInvert(PsiElement namedElement,
-                                                        PsiElement expression,
-                                                        Language language) {
-    if (!expression.getLanguage().is(language)){
-      final InvertBooleanDelegate delegate = findInvertBooleanDelegate(expression);
-      if (delegate != null) {
-        return delegate.getElementToInvert(namedElement, expression);
-      }
-    }
-    return null;
-  }
-
   /**
    * Should be called from {@link #collectRefElements(PsiElement, RenameProcessor, String, Collection)}
    * to process found usages in foreign languages
diff --git a/platform/testRunner/src/com/intellij/execution/testframework/AbstractTestProxy.java b/platform/testRunner/src/com/intellij/execution/testframework/AbstractTestProxy.java
index cf27f034fd5f..e8ad4efd36ba 100644
--- a/platform/testRunner/src/com/intellij/execution/testframework/AbstractTestProxy.java
+++ b/platform/testRunner/src/com/intellij/execution/testframework/AbstractTestProxy.java
@@ -22,7 +22,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.pom.Navigatable;
 import com.intellij.psi.search.GlobalSearchScope;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -120,27 +119,6 @@ public abstract class AbstractTestProxy extends CompositePrintable {
     }
   }
 
-  /**
-   * @deprecated to be deleted in 2017.1
-   */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2017.1")
-  public static void flushOutput(AbstractTestProxy testProxy) {
-    testProxy.flush();
-
-    AbstractTestProxy parent = testProxy.getParent();
-    while (parent != null) {
-      final List<? extends AbstractTestProxy> children = parent.getChildren();
-      if (!testProxy.isInProgress() && testProxy.equals(children.get(children.size() - 1))) {
-        parent.flush();
-      } else {
-        break;
-      }
-      testProxy = parent;
-      parent = parent.getParent();
-    }
-  }
-
   @Override
   public int getExceptionMark() {
     if (myExceptionMark == 0 && getChildren().size() > 0) {
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestClassConfigurationProducer.java b/plugins/junit/src/com/intellij/execution/junit/TestClassConfigurationProducer.java
index b49d3c4fb2d1..b6ea25c3e2b3 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestClassConfigurationProducer.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestClassConfigurationProducer.java
@@ -9,7 +9,10 @@ import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
-@ApiStatus.ScheduledForRemoval(inVersion = "2018")
+/**
+ * @deprecated use {@link TestInClassConfigurationProducer} instead
+ */
+@ApiStatus.ScheduledForRemoval(inVersion = "2019.3")
 @Deprecated
 public class TestClassConfigurationProducer extends AbstractInClassConfigurationProducer<JUnitConfiguration> {
   public TestClassConfigurationProducer() {
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestMethodConfigurationProducer.java b/plugins/junit/src/com/intellij/execution/junit/TestMethodConfigurationProducer.java
index 32d307f237d3..978d24fe9025 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestMethodConfigurationProducer.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestMethodConfigurationProducer.java
@@ -9,7 +9,10 @@ import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
-@ApiStatus.ScheduledForRemoval(inVersion = "2018")
+/**
+ * @deprecated use {@link TestInClassConfigurationProducer} instead
+ */
+@ApiStatus.ScheduledForRemoval(inVersion = "2019.3")
 @Deprecated
 public class TestMethodConfigurationProducer extends AbstractInClassConfigurationProducer<JUnitConfiguration> {
   @NotNull
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/AbstractTestNGInClassConfigurationProducer.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/AbstractTestNGInClassConfigurationProducer.java
deleted file mode 100644
index 7cfa00464dd3..000000000000
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/AbstractTestNGInClassConfigurationProducer.java
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.theoryinpractice.testng.configuration;
-
-
-import org.jetbrains.annotations.ApiStatus;
-
-@Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2018")
-public abstract class AbstractTestNGInClassConfigurationProducer extends TestNGInClassConfigurationProducer {
-}