diff --git a/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java b/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java
index 3d80e790fac3..eb267f580d38 100644
--- a/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java
+++ b/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java
@@ -723,7 +723,7 @@ public class AnnotationUtil {
     {"NotNull", "Nullable", "NonNls", "PropertyKey", "TestOnly", "Language", "Identifier", "Pattern", "PrintFormat", "RegExp", "Subst"};
 
   /** @deprecated simple name is not enough for reliable identification */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static boolean isJetbrainsAnnotation(@NotNull String simpleName) {
     return ArrayUtil.find(SIMPLE_NAMES, simpleName) != -1;
@@ -731,21 +731,21 @@ public class AnnotationUtil {
 
   /** @deprecated use {@link #isAnnotated(PsiModifierListOwner, Collection, int)} */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   public static boolean isAnnotated(@NotNull PsiModifierListOwner listOwner, @NotNull Collection<String> annotations) {
     return isAnnotated(listOwner, annotations, CHECK_TYPE);
   }
 
   /** @deprecated use {@link #isAnnotated(PsiModifierListOwner, String, int)} */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   public static boolean isAnnotated(@NotNull PsiModifierListOwner listOwner, @NotNull String annotationFQN, boolean checkHierarchy) {
     return isAnnotated(listOwner, annotationFQN, flags(checkHierarchy, true, true));
   }
 
   /** @deprecated use {@link #isAnnotated(PsiModifierListOwner, String, int)} */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   public static boolean isAnnotated(@NotNull PsiModifierListOwner listOwner,
                                     @NotNull String annotationFQN,
                                     boolean checkHierarchy,
diff --git a/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java b/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java
index 79f0d0f69a0f..d23eb22b3dd7 100644
--- a/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java
+++ b/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java
@@ -60,7 +60,7 @@ public abstract class NullableNotNullManager {
    * Returns an annotation which marks given element as Nullable, if any.
    * @deprecated use {@link #findEffectiveNullabilityInfo(PsiModifierListOwner)} instead.
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public @Nullable PsiAnnotation getNullableAnnotation(@NotNull PsiModifierListOwner owner, boolean checkBases) {
     NullabilityAnnotationInfo info = findEffectiveNullabilityInfo(owner);
@@ -77,7 +77,7 @@ public abstract class NullableNotNullManager {
    * Returns an annotation which marks given element as NotNull, if any.
    * @deprecated use {@link #findEffectiveNullabilityInfo(PsiModifierListOwner)} instead.
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public @Nullable PsiAnnotation getNotNullAnnotation(@NotNull PsiModifierListOwner owner, boolean checkBases) {
     NullabilityAnnotationInfo info = findEffectiveNullabilityInfo(owner);
diff --git a/java/java-psi-api/src/com/intellij/psi/JavaPsiFacade.java b/java/java-psi-api/src/com/intellij/psi/JavaPsiFacade.java
index d12b0612d3cf..8b448e547f5f 100644
--- a/java/java-psi-api/src/com/intellij/psi/JavaPsiFacade.java
+++ b/java/java-psi-api/src/com/intellij/psi/JavaPsiFacade.java
@@ -89,7 +89,7 @@ public abstract class JavaPsiFacade {
    * @deprecated use {@link PsiNameHelper#getInstance(Project)}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @NotNull
   public abstract PsiNameHelper getNameHelper();
 
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java b/java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java
index 004dc925350e..5278ae499a28 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java
@@ -134,7 +134,7 @@ public interface PsiAnnotation extends PsiAnnotationMemberValue, JvmAnnotation {
    */
   @Nullable
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   default PsiMetaData getMetaData() {
     return null;
   }
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiPrimitiveType.java b/java/java-psi-api/src/com/intellij/psi/PsiPrimitiveType.java
index 81bf2d7d9fa1..e8283b04b901 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiPrimitiveType.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiPrimitiveType.java
@@ -62,7 +62,7 @@ public final class PsiPrimitiveType extends PsiType.Stub implements JvmPrimitive
    * @deprecated please don't use {@link PsiPrimitiveType} to represent fake types
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public PsiPrimitiveType(@NotNull String name, PsiAnnotation @NotNull [] annotations) {
     super(annotations);
     myKind = null;
@@ -267,7 +267,7 @@ public final class PsiPrimitiveType extends PsiType.Stub implements JvmPrimitive
    * @deprecated please use {@link JvmPrimitiveTypeKind#getBoxedFqns}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static Collection<String> getAllBoxedTypeNames() {
     return JvmPrimitiveTypeKind.getBoxedFqns();
   }
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiSwitchLabelStatementBase.java b/java/java-psi-api/src/com/intellij/psi/PsiSwitchLabelStatementBase.java
index c583c9fbad62..b9dcda07e960 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiSwitchLabelStatementBase.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiSwitchLabelStatementBase.java
@@ -26,7 +26,7 @@ public interface PsiSwitchLabelStatementBase extends PsiStatement {
 
   /** @deprecated doesn't support enhanced "switch" statements; use {@link #getCaseValues()} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   default PsiExpression getCaseValue() {
     PsiExpressionList expressionList = getCaseValues();
     if (expressionList != null) {
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiType.java b/java/java-psi-api/src/com/intellij/psi/PsiType.java
index 3841b33e7109..ef3e7daa7e2d 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiType.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiType.java
@@ -73,7 +73,7 @@ public abstract class PsiType implements PsiAnnotationOwner, Cloneable, JvmType
   /** @deprecated use {@link #annotate(TypeAnnotationProvider)} */
   @Deprecated
   @NotNull
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public PsiArrayType createArrayType(PsiAnnotation @NotNull ... annotations) {
     return new PsiArrayType(this, annotations);
   }
diff --git a/java/java-psi-api/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsFacade.java b/java/java-psi-api/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsFacade.java
index c3f050d48b93..620f0244b495 100644
--- a/java/java-psi-api/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsFacade.java
+++ b/java/java-psi-api/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsFacade.java
@@ -9,28 +9,28 @@ import org.jetbrains.annotations.ApiStatus;
  * @deprecated Use {@link JavaFileCodeStyleFacade} for per-file code-style-settings. Note: project settings
  * may not be applicable to a particular file.
  */
-@ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+@ApiStatus.ScheduledForRemoval
 @Deprecated
 public abstract class JavaCodeStyleSettingsFacade {
 
   /**
    * @deprecated Use {@link JavaFileCodeStyleFacade#useFQClassNames()}
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public abstract boolean useFQClassNames();
 
   /**
    * @deprecated Use {@link JavaFileCodeStyleFacade#isGenerateFinalParameters()}
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public abstract boolean isGenerateFinalParameters();
 
   /**
    * @deprecated Use {@link JavaFileCodeStyleFacade#forContext(PsiFile)} instead.
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static JavaCodeStyleSettingsFacade getInstance(Project project) {
     return project.getService(JavaCodeStyleSettingsFacade.class);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
index f85d39d54eab..c35853a9e0de 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
@@ -316,7 +316,7 @@ public final class PsiImplUtil {
    * @deprecated types should be proceed by the callers themselves
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static PsiType normalizeWildcardTypeByPosition(@NotNull PsiType type, @NotNull PsiExpression expression) {
     PsiUtil.ensureValidType(type);
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsCustomNavigationPolicyEx.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsCustomNavigationPolicyEx.java
index 04cbee162e24..0713434990df 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsCustomNavigationPolicyEx.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsCustomNavigationPolicyEx.java
@@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
 
 /** @deprecated use {@link ClsCustomNavigationPolicy} directly */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 @SuppressWarnings("DeprecatedIsStillUsed")
 public abstract class ClsCustomNavigationPolicyEx implements ClsCustomNavigationPolicy {
   public PsiFile getFileNavigationElement(@NotNull ClsFileImpl file) {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementTypes.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementTypes.java
index 19dbb41fd7c0..826d7796caa3 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementTypes.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementTypes.java
@@ -148,6 +148,6 @@ public interface JavaStubElementTypes {
   /**
    * @deprecated use {@link JavaParserDefinition#JAVA_FILE}
    */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated @ApiStatus.ScheduledForRemoval
   IStubFileElementType<?> JAVA_FILE = JavaParserDefinition.JAVA_FILE;
 }
\ No newline at end of file
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiClassStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiClassStub.java
index ff134924f6e9..fb1a75aefc97 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiClassStub.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiClassStub.java
@@ -31,6 +31,6 @@ public interface PsiClassStub<T extends PsiClass> extends PsiMemberStub<T> {
 
   /** @deprecated use {@link PsiJavaFileStub#getLanguageLevel()}; do not override */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   default LanguageLevel getLanguageLevel() { return null; }
 }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiJavaFileStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiJavaFileStub.java
index 7a092d9757d9..ab2bc5004e50 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiJavaFileStub.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiJavaFileStub.java
@@ -18,6 +18,6 @@ public interface PsiJavaFileStub extends PsiClassHolderFileStub<PsiJavaFile> {
 
   /** @deprecated override {@link #getPsiFactory()} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   void setPsiFactory(StubPsiFactory factory);
 }
\ No newline at end of file
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightJavaModule.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightJavaModule.java
index ed0b6195ffe2..5ba270b7240a 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightJavaModule.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightJavaModule.java
@@ -220,7 +220,7 @@ public final class LightJavaModule extends LightElement implements PsiJavaModule
 
   /** @deprecated caching problems; please consider using {@code JavaModuleGraphUtil} methods instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.2")
+  @ApiStatus.ScheduledForRemoval
   public static @Nullable LightJavaModule findModule(@NotNull PsiManager manager, @NotNull VirtualFile root) {
     PsiElement directory = manager.findDirectory(root);
     if (directory == null) return null;
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
index 4892a66d142a..536f3d3a3a20 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
@@ -38,7 +38,7 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
    * @deprecated Use {@link #PsiResolveHelperImpl(Project)}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public PsiResolveHelperImpl(@NotNull PsiManager manager) {
     myManager = manager;
   }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java
index e4f529a1573c..e3033c8d6ba2 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java
@@ -148,7 +148,7 @@ public class PsiLiteralExpressionImpl
    * @deprecated use {@link PsiLiteralUtil#getStringLiteralContent(PsiLiteralExpression)} instead.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.2")
+  @ApiStatus.ScheduledForRemoval
   @Nullable
   public String getInnerText() {
     return PsiLiteralUtil.getStringLiteralContent(this);
diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/OutputFileObject.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/OutputFileObject.java
index 5da0b2011644..beb4980b11f4 100644
--- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/OutputFileObject.java
+++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/OutputFileObject.java
@@ -80,7 +80,7 @@ public final class OutputFileObject extends JpsFileObject {
    * @deprecated In general, an output object may be generated from several source files. Use {@link OutputFileObject#getSourceFiles()} method instead.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @Nullable
   public File getSourceFile() {
     final Iterator<File> it = getSourceFiles().iterator();
diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/BuildTargetIndex.java b/jps/jps-builders/src/org/jetbrains/jps/builders/BuildTargetIndex.java
index 603b6b73aff3..38ac7fe8ff3a 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/builders/BuildTargetIndex.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/builders/BuildTargetIndex.java
@@ -37,7 +37,7 @@ public interface BuildTargetIndex extends BuildTargetRegistry {
    * @deprecated use {@link #getDependencies(BuildTarget, CompileContext)}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   Set<BuildTarget<?>> getDependenciesRecursively(@NotNull BuildTarget<?> target, @NotNull CompileContext context);
 
   @NotNull
diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/AnnotationsChangeTracker.java b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/AnnotationsChangeTracker.java
index d6c1523e3f15..0d9c969cd9d8 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/AnnotationsChangeTracker.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/AnnotationsChangeTracker.java
@@ -75,7 +75,7 @@ public abstract class AnnotationsChangeTracker {
   /**
    * @deprecated Use {@link AnnotationsChangeTracker#methodAnnotationsChanged(NamingContext, ProtoMethodEntity, Difference.Specifier, Difference.Specifier)}
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated // Make sure that Kotlin JPS plugin (located in kotlin repo) doesn't use this API before removing the API
   @NotNull
   public Set<Recompile> methodAnnotationsChanged(
@@ -113,7 +113,7 @@ public abstract class AnnotationsChangeTracker {
   /**
    * @deprecated Use {@link AnnotationsChangeTracker#fieldAnnotationsChanged(NamingContext, ProtoFieldEntity, Difference.Specifier)}
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated // Make sure that Kotlin JPS plugin (located in kotlin repo) doesn't use this API before removing the API
   public Set<Recompile> fieldAnnotationsChanged(NamingContext context, FieldRepr field, Difference.Specifier<TypeRepr.ClassType, Difference> annotationsDiff) {
     return RECOMPILE_NONE;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java
index 419a8f6983b7..592d2afae169 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java
@@ -60,7 +60,7 @@ public final class FSOperations {
    *
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static void markDirty(CompileContext context, final File file) throws IOException {
     markDirty(context, CompilationRound.NEXT, file);
   }
diff --git a/jps/model-api/src/com/intellij/openapi/fileTypes/FileNameMatcherEx.java b/jps/model-api/src/com/intellij/openapi/fileTypes/FileNameMatcherEx.java
index 5aa04ba2b761..1b4b4831ad48 100644
--- a/jps/model-api/src/com/intellij/openapi/fileTypes/FileNameMatcherEx.java
+++ b/jps/model-api/src/com/intellij/openapi/fileTypes/FileNameMatcherEx.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
  * @deprecated please implement {@link FileNameMatcher} directly and define {@link #acceptsCharSequence(CharSequence)} there.
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 public abstract class FileNameMatcherEx implements FileNameMatcher {
   /**
    * @deprecated call {@link #acceptsCharSequence(CharSequence)} instead
diff --git a/jps/model-api/src/org/jetbrains/jps/service/SharedThreadPool.java b/jps/model-api/src/org/jetbrains/jps/service/SharedThreadPool.java
index ccaf749fe11f..fc6a85ef77e5 100644
--- a/jps/model-api/src/org/jetbrains/jps/service/SharedThreadPool.java
+++ b/jps/model-api/src/org/jetbrains/jps/service/SharedThreadPool.java
@@ -30,7 +30,7 @@ public abstract class SharedThreadPool implements ExecutorService {
    * @deprecated Use {@link #submit(Runnable)} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @NotNull
   public abstract Future<?> executeOnPooledThread(@NotNull Runnable action);
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaSdkUtil.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaSdkUtil.java
index 86590f144756..626e2ad336d5 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaSdkUtil.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaSdkUtil.java
@@ -19,7 +19,7 @@ import java.util.Set;
 
 public final class JavaSdkUtil {
   /** @deprecated use {@link #getJdkClassesRoots(Path, boolean)} instead */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static @NotNull List<File> getJdkClassesRoots(@NotNull File home, boolean isJre) {
     return ContainerUtil.map(getJdkClassesRoots(home.toPath(), isJre), Path::toFile);
diff --git a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/artifact/JpsArtifactExtensionSerializer.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/artifact/JpsArtifactExtensionSerializer.java
index ebedca7b5180..3e25f02ba8ae 100644
--- a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/artifact/JpsArtifactExtensionSerializer.java
+++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/artifact/JpsArtifactExtensionSerializer.java
@@ -45,7 +45,7 @@ public abstract class JpsArtifactExtensionSerializer<E extends JpsElement> {
    * @deprecated the build process doesn't save project configuration so there is no need to implement this method, it isn't called by the platform
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public void saveExtension(@NotNull E extension, @NotNull Element optionsTag) {
   }
 }
diff --git a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/artifact/JpsPackagingElementSerializer.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/artifact/JpsPackagingElementSerializer.java
index ca097352c03d..8e770e6d6d62 100644
--- a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/artifact/JpsPackagingElementSerializer.java
+++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/artifact/JpsPackagingElementSerializer.java
@@ -42,7 +42,7 @@ public abstract class JpsPackagingElementSerializer<E extends JpsPackagingElemen
    * @deprecated the build process doesn't save project configuration so there is no need to implement this method, it isn't called by the platform
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public void save(E element, Element tag) {
   }
 }
diff --git a/platform/core-api/src/com/intellij/ide/util/PropertiesComponent.java b/platform/core-api/src/com/intellij/ide/util/PropertiesComponent.java
index b4f52b3b741f..879ee8a962d2 100644
--- a/platform/core-api/src/com/intellij/ide/util/PropertiesComponent.java
+++ b/platform/core-api/src/com/intellij/ide/util/PropertiesComponent.java
@@ -118,7 +118,7 @@ public abstract class PropertiesComponent {
    * Init was never performed and in any case is not recommended.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public final int getOrInitInt(@NonNls @NotNull String name, int defaultValue) {
     return getInt(name, defaultValue);
   }
@@ -136,7 +136,7 @@ public abstract class PropertiesComponent {
    * Init was never performed and in any case is not recommended.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public final long getOrInitLong(@NonNls @NotNull String name, long defaultValue) {
     return getLong(name, defaultValue);
   }
diff --git a/platform/core-api/src/com/intellij/lang/LanguageExtensionPoint.java b/platform/core-api/src/com/intellij/lang/LanguageExtensionPoint.java
index 8c60d293cfa6..f68e84e5daee 100644
--- a/platform/core-api/src/com/intellij/lang/LanguageExtensionPoint.java
+++ b/platform/core-api/src/com/intellij/lang/LanguageExtensionPoint.java
@@ -31,7 +31,7 @@ public class LanguageExtensionPoint<T> extends CustomLoadingExtensionPointBean<T
    * @deprecated You must pass plugin descriptor, use {@link LanguageExtensionPoint#LanguageExtensionPoint(String, Object)}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public LanguageExtensionPoint() {
   }
 
diff --git a/platform/core-api/src/com/intellij/navigation/NavigationTarget.java b/platform/core-api/src/com/intellij/navigation/NavigationTarget.java
index b32d40fc99af..71c0dd9c9283 100644
--- a/platform/core-api/src/com/intellij/navigation/NavigationTarget.java
+++ b/platform/core-api/src/com/intellij/navigation/NavigationTarget.java
@@ -60,7 +60,7 @@ public interface NavigationTarget {
    * Please define your own interface if you need this method in your implementation.
    */
   @Deprecated
-  @ScheduledForRemoval(inVersion = "2022.1")
+  @ScheduledForRemoval
   default @NotNull Navigatable getNavigatable() {
     return EmptyNavigatable.INSTANCE;
   }
diff --git a/platform/core-api/src/com/intellij/openapi/application/ApplicationInfo.java b/platform/core-api/src/com/intellij/openapi/application/ApplicationInfo.java
index 906331bde0fd..147008893037 100644
--- a/platform/core-api/src/com/intellij/openapi/application/ApplicationInfo.java
+++ b/platform/core-api/src/com/intellij/openapi/application/ApplicationInfo.java
@@ -91,7 +91,7 @@ public abstract class ApplicationInfo {
 
   /** @deprecated use {@link #getBuild()} */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   public String getBuildNumber() {
     return getBuild().asString();
   }
diff --git a/platform/core-api/src/com/intellij/openapi/application/BaseActionRunnable.java b/platform/core-api/src/com/intellij/openapi/application/BaseActionRunnable.java
index 9cdb0d610552..094e8fb94eaa 100644
--- a/platform/core-api/src/com/intellij/openapi/application/BaseActionRunnable.java
+++ b/platform/core-api/src/com/intellij/openapi/application/BaseActionRunnable.java
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
  * @deprecated Use {@link WriteAction#run(ThrowableRunnable)} or {@link ReadAction#run(ThrowableRunnable)} or similar method instead
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 public abstract class BaseActionRunnable<T> {
   protected abstract void run(@NotNull Result<? super T> result) throws Throwable;
 
diff --git a/platform/core-api/src/com/intellij/openapi/application/ReadAction.java b/platform/core-api/src/com/intellij/openapi/application/ReadAction.java
index c9c9f50ec2f3..c5964aee3b11 100644
--- a/platform/core-api/src/com/intellij/openapi/application/ReadAction.java
+++ b/platform/core-api/src/com/intellij/openapi/application/ReadAction.java
@@ -39,7 +39,7 @@ public abstract class ReadAction<T> extends BaseActionRunnable<T> {
    * @deprecated use {@link #run(ThrowableRunnable)} or {@link #compute(ThrowableComputable)} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
+  @ApiStatus.ScheduledForRemoval
   public static AccessToken start() {
     return ApplicationManager.getApplication().acquireReadActionLock();
   }
diff --git a/platform/core-api/src/com/intellij/openapi/application/WriteAction.java b/platform/core-api/src/com/intellij/openapi/application/WriteAction.java
index 4f51b8febec6..0304d8a27769 100644
--- a/platform/core-api/src/com/intellij/openapi/application/WriteAction.java
+++ b/platform/core-api/src/com/intellij/openapi/application/WriteAction.java
@@ -25,7 +25,7 @@ public abstract class WriteAction<T> extends BaseActionRunnable<T> {
   /**
    * @deprecated Use {@link #run(ThrowableRunnable)} or {@link #compute(ThrowableComputable)} or similar method instead
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public WriteAction() {
   }
@@ -70,7 +70,7 @@ public abstract class WriteAction<T> extends BaseActionRunnable<T> {
    */
   @Deprecated
   @NotNull
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
+  @ApiStatus.ScheduledForRemoval
   public static AccessToken start() {
     // get useful information about the write action
     Class<?> callerClass = ObjectUtils.notNull(ReflectionUtil.getCallerClass(3), WriteAction.class);
diff --git a/platform/core-api/src/com/intellij/openapi/command/CommandProcessor.java b/platform/core-api/src/com/intellij/openapi/command/CommandProcessor.java
index a9f18dafec49..0c9d3cd016ad 100644
--- a/platform/core-api/src/com/intellij/openapi/command/CommandProcessor.java
+++ b/platform/core-api/src/com/intellij/openapi/command/CommandProcessor.java
@@ -117,6 +117,6 @@ public abstract class CommandProcessor {
    * @deprecated use {@link CommandListener#TOPIC}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public abstract void removeCommandListener(@NotNull CommandListener listener);
 }
diff --git a/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java b/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
index 51ae20aaf684..16d5e10a42fc 100644
--- a/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
+++ b/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
@@ -287,7 +287,7 @@ public abstract class WriteCommandAction<T> extends BaseActionRunnable<T> {
    * @deprecated Use {@link #writeCommandAction(Project)}.withGlobalUndo() instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   protected boolean isGlobalUndoAction() {
     return false;
   }
@@ -298,7 +298,7 @@ public abstract class WriteCommandAction<T> extends BaseActionRunnable<T> {
    * @deprecated Use {@link #writeCommandAction(Project)}.withUndoConfirmationPolicy() instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @NotNull
   protected UndoConfirmationPolicy getUndoConfirmationPolicy() {
     return UndoConfirmationPolicy.DO_NOT_REQUEST_CONFIRMATION;
diff --git a/platform/core-api/src/com/intellij/openapi/command/undo/UndoConstants.java b/platform/core-api/src/com/intellij/openapi/command/undo/UndoConstants.java
index cb2b3ef1fcf8..d82ef584470d 100644
--- a/platform/core-api/src/com/intellij/openapi/command/undo/UndoConstants.java
+++ b/platform/core-api/src/com/intellij/openapi/command/undo/UndoConstants.java
@@ -23,20 +23,20 @@ import org.jetbrains.annotations.ApiStatus;
 /**
  * @deprecated Use {@link UndoUtil} instead
  */
-@ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+@ApiStatus.ScheduledForRemoval
 @Deprecated
 public interface UndoConstants {
   /**
    * @deprecated Use {@link UndoUtil#forceUndoIn(VirtualFile, Runnable)} instead
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   Key<Boolean> FORCE_RECORD_UNDO = Key.create("FORCE_RECORD_UNDO");
 
   /**
    * @deprecated Use {@link UndoUtil#disableUndoIn(Document, Runnable)} instead
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   Key<Boolean> DONT_RECORD_UNDO = Key.create("DONT_RECORD_UNDO");
 }
diff --git a/platform/core-api/src/com/intellij/openapi/components/ExportableApplicationComponent.java b/platform/core-api/src/com/intellij/openapi/components/ExportableApplicationComponent.java
index 3ffad1788dfc..8af4b7f496e2 100644
--- a/platform/core-api/src/com/intellij/openapi/components/ExportableApplicationComponent.java
+++ b/platform/core-api/src/com/intellij/openapi/components/ExportableApplicationComponent.java
@@ -4,6 +4,6 @@ package com.intellij.openapi.components;
 import org.jetbrains.annotations.ApiStatus;
 
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2020.2")
+@ApiStatus.ScheduledForRemoval
 public interface ExportableApplicationComponent extends ApplicationComponent, ExportableComponent {
 }
diff --git a/platform/core-api/src/com/intellij/openapi/components/ServiceManager.java b/platform/core-api/src/com/intellij/openapi/components/ServiceManager.java
index eea53c1bea93..4b8989dfa7a7 100644
--- a/platform/core-api/src/com/intellij/openapi/components/ServiceManager.java
+++ b/platform/core-api/src/com/intellij/openapi/components/ServiceManager.java
@@ -31,7 +31,7 @@ public final class ServiceManager {
    * @deprecated Use {@link ComponentManager#getServiceIfCreated(Class)}: {@code Application.getServiceIfCreated() / Project.getServiceIfCreated()}.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static @Nullable <T> T getServiceIfCreated(@NotNull Project project, @NotNull Class<T> serviceClass) {
     return project.getServiceIfCreated(serviceClass);
   }
@@ -45,7 +45,7 @@ public final class ServiceManager {
    * @deprecated Don't use this method; it has no benefit over normal ServiceManager.getService
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static @NotNull <T> NotNullLazyKey<T, Project> createLazyKey(@NotNull Class<? extends T> serviceClass) {
     return NotNullLazyKey.create("Service: " + serviceClass.getName(), project -> project.getService(serviceClass));
   }
diff --git a/platform/core-api/src/com/intellij/openapi/editor/Document.java b/platform/core-api/src/com/intellij/openapi/editor/Document.java
index 03b5e98fb886..926d31238316 100644
--- a/platform/core-api/src/com/intellij/openapi/editor/Document.java
+++ b/platform/core-api/src/com/intellij/openapi/editor/Document.java
@@ -75,7 +75,7 @@ public interface Document extends UserDataHolder {
    * @deprecated Use {@link #getCharsSequence()} or {@link #getText()} instead.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   default char @NotNull [] getChars() {
     return CharArrayUtil.fromSequence(getImmutableCharSequence());
   }
diff --git a/platform/core-api/src/com/intellij/openapi/editor/colors/CodeInsightColors.java b/platform/core-api/src/com/intellij/openapi/editor/colors/CodeInsightColors.java
index ae108d24c5ac..1da7a76a16ae 100644
--- a/platform/core-api/src/com/intellij/openapi/editor/colors/CodeInsightColors.java
+++ b/platform/core-api/src/com/intellij/openapi/editor/colors/CodeInsightColors.java
@@ -28,7 +28,7 @@ public interface CodeInsightColors {
   /**
    * @deprecated use {@link #WEAK_WARNING_ATTRIBUTES} instead
    */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated @ApiStatus.ScheduledForRemoval
   TextAttributesKey INFO_ATTRIBUTES = TextAttributesKey.createTextAttributesKey("INFO_ATTRIBUTES");
   TextAttributesKey WEAK_WARNING_ATTRIBUTES = TextAttributesKey.createTextAttributesKey("INFO_ATTRIBUTES");
   TextAttributesKey INFORMATION_ATTRIBUTES = TextAttributesKey.createTextAttributesKey("INFORMATION_ATTRIBUTES");
@@ -42,7 +42,7 @@ public interface CodeInsightColors {
    * For Java-related code use {@link com.intellij.ide.highlighter.JavaHighlightingColors#INSTANCE_FIELD_ATTRIBUTES}.
    * The field will be removed in future versions.
    */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated @ApiStatus.ScheduledForRemoval
   TextAttributesKey INSTANCE_FIELD_ATTRIBUTES = TextAttributesKey.DUMMY_DEPRECATED_ATTRIBUTES;
   /**
    * @deprecated as of version 16.
@@ -50,7 +50,7 @@ public interface CodeInsightColors {
    * For Java-related code use {@link com.intellij.ide.highlighter.JavaHighlightingColors#STATIC_FINAL_FIELD_ATTRIBUTES}.
    * The field will be removed in future versions.
    */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated @ApiStatus.ScheduledForRemoval
   TextAttributesKey STATIC_FINAL_FIELD_ATTRIBUTES = TextAttributesKey.DUMMY_DEPRECATED_ATTRIBUTES;
   /**
    * @deprecated as of version 16.
@@ -59,7 +59,7 @@ public interface CodeInsightColors {
    * The field will be removed in future versions.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   TextAttributesKey METHOD_CALL_ATTRIBUTES = TextAttributesKey.DUMMY_DEPRECATED_ATTRIBUTES;
   /**
    * @deprecated as of version 16.
@@ -68,7 +68,7 @@ public interface CodeInsightColors {
    * The field will be removed in future versions.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   TextAttributesKey ANNOTATION_NAME_ATTRIBUTES = TextAttributesKey.DUMMY_DEPRECATED_ATTRIBUTES;
 
   TextAttributesKey MATCHED_BRACE_ATTRIBUTES = TextAttributesKey.createTextAttributesKey("MATCHED_BRACE_ATTRIBUTES");
diff --git a/platform/core-api/src/com/intellij/openapi/editor/colors/TextAttributesKey.java b/platform/core-api/src/com/intellij/openapi/editor/colors/TextAttributesKey.java
index 2fd854d701f9..a025135988fe 100644
--- a/platform/core-api/src/com/intellij/openapi/editor/colors/TextAttributesKey.java
+++ b/platform/core-api/src/com/intellij/openapi/editor/colors/TextAttributesKey.java
@@ -262,7 +262,7 @@ public final class TextAttributesKey implements Comparable<TextAttributesKey> {
    * @deprecated Use {@link #createTextAttributesKey(String, TextAttributesKey)} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public void setFallbackAttributeKey(@Nullable TextAttributesKey fallbackAttributeKey) {
   }
 
diff --git a/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeRegistry.java b/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeRegistry.java
index 46eb07b38cfa..63a39531d754 100644
--- a/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeRegistry.java
+++ b/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeRegistry.java
@@ -144,7 +144,7 @@ public abstract class FileTypeRegistry {
 
     /** @deprecated not used anymore, do not override */
     @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+    @ApiStatus.ScheduledForRemoval
     default int getVersion() { return 0; }
   }
 }
diff --git a/platform/core-api/src/com/intellij/openapi/fileTypes/OSFileIdeAssociation.java b/platform/core-api/src/com/intellij/openapi/fileTypes/OSFileIdeAssociation.java
index 6f637c921cda..8c790b1fd466 100644
--- a/platform/core-api/src/com/intellij/openapi/fileTypes/OSFileIdeAssociation.java
+++ b/platform/core-api/src/com/intellij/openapi/fileTypes/OSFileIdeAssociation.java
@@ -38,7 +38,7 @@ public interface OSFileIdeAssociation {
 
   /** @deprecated please implement {@link #getExtensionMode()} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @SuppressWarnings("IdentifierGrammar")
   default ExtensionMode getExtensionsMode() {
     return getExtensionMode();
diff --git a/platform/core-api/src/com/intellij/openapi/progress/ProgressIndicator.java b/platform/core-api/src/com/intellij/openapi/progress/ProgressIndicator.java
index fd49a9fd9e85..8acc1dbc8ee2 100644
--- a/platform/core-api/src/com/intellij/openapi/progress/ProgressIndicator.java
+++ b/platform/core-api/src/com/intellij/openapi/progress/ProgressIndicator.java
@@ -133,12 +133,12 @@ public interface ProgressIndicator {
 
   /** @deprecated use {@link ProgressManager#executeNonCancelableSection(Runnable)} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+  @ApiStatus.ScheduledForRemoval
   default void startNonCancelableSection() {}
 
   /** @deprecated use {@link ProgressManager#executeNonCancelableSection(Runnable)} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+  @ApiStatus.ScheduledForRemoval
   default void finishNonCancelableSection() {}
 
   /**
diff --git a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java
index 46e285a29658..f66dcc75a196 100644
--- a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java
+++ b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java
@@ -168,7 +168,7 @@ public abstract class ProgressManager extends ProgressIndicatorProvider {
    * @deprecated use {@link #run(Task)}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public abstract void runProcessWithProgressAsynchronously(@NotNull Project project,
                                                             @NotNull @ProgressTitle String progressTitle,
                                                             @NotNull Runnable process,
diff --git a/platform/core-api/src/com/intellij/openapi/project/DumbModePermission.java b/platform/core-api/src/com/intellij/openapi/project/DumbModePermission.java
index 38eed1b5974b..71fc641b78e6 100644
--- a/platform/core-api/src/com/intellij/openapi/project/DumbModePermission.java
+++ b/platform/core-api/src/com/intellij/openapi/project/DumbModePermission.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.ApiStatus;
  * @deprecated obsolete API
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 public enum DumbModePermission {
   MAY_START_MODAL,
   MAY_START_BACKGROUND
diff --git a/platform/core-api/src/com/intellij/openapi/project/DumbModeTask.java b/platform/core-api/src/com/intellij/openapi/project/DumbModeTask.java
index c1a8dffdca5a..b7fd7888d6e5 100644
--- a/platform/core-api/src/com/intellij/openapi/project/DumbModeTask.java
+++ b/platform/core-api/src/com/intellij/openapi/project/DumbModeTask.java
@@ -30,7 +30,7 @@ public abstract class DumbModeTask implements Disposable {
    *
    * @deprecated Consider using {@link DumbModeTask()} and overwriting {@link DumbModeTask#tryMergeWith(DumbModeTask)} instead.
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public DumbModeTask(@NotNull Object equivalenceObject) {
     myEquivalenceObject = Pair.create(getClass(), equivalenceObject);
diff --git a/platform/core-api/src/com/intellij/openapi/project/DumbService.java b/platform/core-api/src/com/intellij/openapi/project/DumbService.java
index 5e2f9a76c4a9..8c70f3ba8f2c 100644
--- a/platform/core-api/src/com/intellij/openapi/project/DumbService.java
+++ b/platform/core-api/src/com/intellij/openapi/project/DumbService.java
@@ -447,7 +447,7 @@ public abstract class DumbService {
    * @deprecated Obsolete, does nothing, just executes the passed runnable.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static void allowStartingDumbModeInside(@NotNull DumbModePermission permission, @NotNull Runnable runnable) {
     runnable.run();
   }
diff --git a/platform/core-api/src/com/intellij/openapi/project/ProjectCoreUtil.java b/platform/core-api/src/com/intellij/openapi/project/ProjectCoreUtil.java
index 626077313a3a..c21a086a4010 100644
--- a/platform/core-api/src/com/intellij/openapi/project/ProjectCoreUtil.java
+++ b/platform/core-api/src/com/intellij/openapi/project/ProjectCoreUtil.java
@@ -16,7 +16,7 @@ public final class ProjectCoreUtil {
    * @deprecated for internal use only, use {@link com.intellij.psi.PsiElement#getProject()} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @ApiStatus.Internal
   public static volatile Project theProject;
 
@@ -38,7 +38,7 @@ public final class ProjectCoreUtil {
    * @deprecated Please use {@link com.intellij.psi.PsiElement#getProject()} or {@link com.intellij.openapi.project.ProjectManager#getOpenProjects()} instead.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @ApiStatus.Internal
   @Nullable
   public static Project theOnlyOpenProject() {
diff --git a/platform/core-api/src/com/intellij/openapi/vfs/LocalFileProvider.java b/platform/core-api/src/com/intellij/openapi/vfs/LocalFileProvider.java
index bc19dbac361a..d574789cd2d7 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/LocalFileProvider.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/LocalFileProvider.java
@@ -8,11 +8,11 @@ import org.jetbrains.annotations.Nullable;
 public interface LocalFileProvider {
   /** @deprecated use {@link com.intellij.openapi.vfs.newvfs.ArchiveFileSystem#getLocalByEntry(VirtualFile)} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   VirtualFile getLocalVirtualFileFor(@Nullable VirtualFile entryVFile);
 
   /** @deprecated use {@code ArchiveFileSystem.findFileByPath(path)} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   VirtualFile findLocalVirtualFileByPath(@NotNull String path);
 }
\ No newline at end of file
diff --git a/platform/core-api/src/com/intellij/openapi/vfs/WritingAccessProvider.java b/platform/core-api/src/com/intellij/openapi/vfs/WritingAccessProvider.java
index 16ea254142d4..67097a42189f 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/WritingAccessProvider.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/WritingAccessProvider.java
@@ -17,7 +17,7 @@ public abstract class WritingAccessProvider {
    * @deprecated Use {@link #EP}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static final ExtensionPointName<WritingAccessProvider> EP_NAME = ExtensionPointName.create("com.intellij.writingAccessProvider");
 
   public static final ProjectExtensionPointName<WritingAccessProvider> EP = new ProjectExtensionPointName<>("com.intellij.writingAccessProvider");
diff --git a/platform/core-api/src/com/intellij/openapi/vfs/impl/ArchiveHandler.java b/platform/core-api/src/com/intellij/openapi/vfs/impl/ArchiveHandler.java
index f01c0d0fae98..278a68f71085 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/impl/ArchiveHandler.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/impl/ArchiveHandler.java
@@ -281,7 +281,7 @@ public abstract class ArchiveHandler {
 
   /** @deprecated please use {@link #processEntry} instead to correctly handle invalid entry names */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   protected @NotNull Pair<String, String> splitPath(@NotNull String entryName) {
     return split(entryName);
   }
diff --git a/platform/core-api/src/com/intellij/openapi/vfs/newvfs/BulkFileListener.java b/platform/core-api/src/com/intellij/openapi/vfs/newvfs/BulkFileListener.java
index d1950c581c37..c66bb2f00e3f 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/newvfs/BulkFileListener.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/newvfs/BulkFileListener.java
@@ -29,7 +29,7 @@ import java.util.List;
 public interface BulkFileListener {
   /** @deprecated obsolete, implement {@link BulkFileListener} directly */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   class Adapter implements BulkFileListener { }
 
   default void before(@NotNull List<? extends @NotNull VFileEvent> events) { }
diff --git a/platform/core-api/src/com/intellij/psi/PsiDocumentManager.java b/platform/core-api/src/com/intellij/psi/PsiDocumentManager.java
index 431991a5f5bd..124360c51ee8 100644
--- a/platform/core-api/src/com/intellij/psi/PsiDocumentManager.java
+++ b/platform/core-api/src/com/intellij/psi/PsiDocumentManager.java
@@ -221,7 +221,7 @@ public abstract class PsiDocumentManager {
    * @deprecated Use message bus {@link PsiDocumentListener#TOPIC}.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public abstract void addListener(@NotNull Listener listener);
 
   /**
diff --git a/platform/core-api/src/com/intellij/psi/SmartPointerManager.java b/platform/core-api/src/com/intellij/psi/SmartPointerManager.java
index ace234177278..74636d8a6340 100644
--- a/platform/core-api/src/com/intellij/psi/SmartPointerManager.java
+++ b/platform/core-api/src/com/intellij/psi/SmartPointerManager.java
@@ -61,7 +61,7 @@ public abstract class SmartPointerManager {
    * @deprecated use {@link #createSmartPsiElementPointer(PsiElement)} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @NotNull
   public <E extends PsiElement> SmartPsiElementPointer<E> createLazyPointer(@NotNull E element) {
     return createSmartPsiElementPointer(element);
diff --git a/platform/core-api/src/com/intellij/psi/impl/source/codeStyle/IndentHelper.java b/platform/core-api/src/com/intellij/psi/impl/source/codeStyle/IndentHelper.java
index e41aa21c0fd4..8df8a420c0df 100644
--- a/platform/core-api/src/com/intellij/psi/impl/source/codeStyle/IndentHelper.java
+++ b/platform/core-api/src/com/intellij/psi/impl/source/codeStyle/IndentHelper.java
@@ -18,7 +18,7 @@ public abstract class IndentHelper {
    * @deprecated Use {@link #getIndent(PsiFile, ASTNode)}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public final int getIndent(Project project, FileType fileType, ASTNode element) {
     return getIndent(getFile(element), element);
   }
diff --git a/platform/core-api/src/com/intellij/psi/tree/IReparseableElementType.java b/platform/core-api/src/com/intellij/psi/tree/IReparseableElementType.java
index c4e1dd010990..d6cb8202c076 100644
--- a/platform/core-api/src/com/intellij/psi/tree/IReparseableElementType.java
+++ b/platform/core-api/src/com/intellij/psi/tree/IReparseableElementType.java
@@ -42,7 +42,7 @@ public class IReparseableElementType extends ILazyParseableElementType implement
    * @return true if the content is valid, false if not
    * @deprecated use {@link #isReparseable(ASTNode, CharSequence, Language, Project)} instead
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public boolean isParsable(@NotNull CharSequence buffer,
                             @NotNull Language fileLanguage,
diff --git a/platform/core-api/src/com/intellij/psi/tree/IReparseableElementTypeBase.java b/platform/core-api/src/com/intellij/psi/tree/IReparseableElementTypeBase.java
index f6c5bcc973f0..0f5868fdd206 100644
--- a/platform/core-api/src/com/intellij/psi/tree/IReparseableElementTypeBase.java
+++ b/platform/core-api/src/com/intellij/psi/tree/IReparseableElementTypeBase.java
@@ -34,7 +34,7 @@ public interface IReparseableElementTypeBase extends ILazyParseableElementTypeBa
    * @return true if the content is valid, false if not
    * @deprecated use {@link #isReparseable(ASTNode, CharSequence, Language, Project)} instead
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   default boolean isParsable(@Nullable ASTNode parent,
                              @NotNull CharSequence buffer,
diff --git a/platform/core-api/src/com/intellij/psi/util/PsiModificationTracker.java b/platform/core-api/src/com/intellij/psi/util/PsiModificationTracker.java
index 18fef50b6e2f..4b16c544a6ee 100644
--- a/platform/core-api/src/com/intellij/psi/util/PsiModificationTracker.java
+++ b/platform/core-api/src/com/intellij/psi/util/PsiModificationTracker.java
@@ -57,7 +57,7 @@ public interface PsiModificationTracker extends ModificationTracker {
    * @deprecated rarely supported by language plugins; also a wrong way for optimisations
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
+  @ApiStatus.ScheduledForRemoval
   Key OUT_OF_CODE_BLOCK_MODIFICATION_COUNT = MODIFICATION_COUNT;
 
   /**
@@ -66,7 +66,7 @@ public interface PsiModificationTracker extends ModificationTracker {
    * @deprecated rarely supported by JVM language plugins; also a wrong way for optimisations
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
+  @ApiStatus.ScheduledForRemoval
   Key JAVA_STRUCTURE_MODIFICATION_COUNT = MODIFICATION_COUNT;
 
   /**
@@ -88,7 +88,7 @@ public interface PsiModificationTracker extends ModificationTracker {
    * @deprecated rarely supported by JVM language plugins; also a wrong way for optimisations
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
+  @ApiStatus.ScheduledForRemoval
   @NotNull
   ModificationTracker getJavaStructureModificationTracker();
 
diff --git a/platform/core-api/src/com/intellij/util/ModalityUiUtil.java b/platform/core-api/src/com/intellij/util/ModalityUiUtil.java
index 033fcbf41e2e..7626eaa2a01c 100644
--- a/platform/core-api/src/com/intellij/util/ModalityUiUtil.java
+++ b/platform/core-api/src/com/intellij/util/ModalityUiUtil.java
@@ -64,7 +64,7 @@ public final class ModalityUiUtil {
    * @deprecated Use ModalityUiUtil.invokeLaterIfNeeded(ModalityState, Runnable) instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static void invokeLaterIfNeeded(@NotNull Runnable runnable,
                                          @NotNull ModalityState modalityState) {
     invokeLaterIfNeeded(modalityState,runnable);
@@ -74,7 +74,7 @@ public final class ModalityUiUtil {
    * @deprecated Use ModalityUiUtil.invokeLaterIfNeeded(ModalityState, Condition<?>, Runnable) instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static void invokeLaterIfNeeded(@NotNull Runnable runnable, @NotNull ModalityState modalityState,
                                          @NotNull Condition<?> expired) {
     invokeLaterIfNeeded(modalityState, expired, runnable);
diff --git a/platform/core-api/src/com/intellij/util/PlatformIcons.java b/platform/core-api/src/com/intellij/util/PlatformIcons.java
index 72c1c97a0098..58f08a0191ba 100644
--- a/platform/core-api/src/com/intellij/util/PlatformIcons.java
+++ b/platform/core-api/src/com/intellij/util/PlatformIcons.java
@@ -103,6 +103,6 @@ public interface PlatformIcons {
    * @deprecated use {@link #FOLDER_ICON}
    */
   @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+    @ApiStatus.ScheduledForRemoval
   Icon DIRECTORY_OPEN_ICON = FOLDER_ICON;
 }
diff --git a/platform/core-api/src/org/jetbrains/concurrency/Promise.java b/platform/core-api/src/org/jetbrains/concurrency/Promise.java
index 1a4eb403f1a6..67d8e2aba22c 100644
--- a/platform/core-api/src/org/jetbrains/concurrency/Promise.java
+++ b/platform/core-api/src/org/jetbrains/concurrency/Promise.java
@@ -105,7 +105,7 @@ public interface Promise<T> {
    * @deprecated Use {@link #onError(java.util.function.Consumer)}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @NotNull
   default Promise<T> rejected(@NotNull Consumer<? super Throwable> rejected) {
     return onError(it -> rejected.consume(it));
@@ -131,7 +131,7 @@ public interface Promise<T> {
    * @deprecated use {@link #onProcessed(java.util.function.Consumer)}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @NotNull
   default Promise<T> processed(@NotNull Consumer<? super T> action) {
     return onProcessed(it -> action.consume(it));
diff --git a/platform/core-impl/src/com/intellij/concurrency/JobLauncher.java b/platform/core-impl/src/com/intellij/concurrency/JobLauncher.java
index 22bb7cd36306..9c9cb0f84ac4 100644
--- a/platform/core-impl/src/com/intellij/concurrency/JobLauncher.java
+++ b/platform/core-impl/src/com/intellij/concurrency/JobLauncher.java
@@ -64,7 +64,7 @@ public abstract class JobLauncher {
    * @deprecated use {@link #invokeConcurrentlyUnderProgress(List, ProgressIndicator, Processor)} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public <T> boolean invokeConcurrentlyUnderProgress(@NotNull List<? extends T> things,
                                                      ProgressIndicator progress,
                                                      boolean failFastOnAcquireReadAction,
diff --git a/platform/core-impl/src/com/intellij/core/CoreASTFactory.java b/platform/core-impl/src/com/intellij/core/CoreASTFactory.java
index 15f292f6f160..888e8c68aee2 100644
--- a/platform/core-impl/src/com/intellij/core/CoreASTFactory.java
+++ b/platform/core-impl/src/com/intellij/core/CoreASTFactory.java
@@ -8,6 +8,6 @@ import org.jetbrains.annotations.ApiStatus;
  * @deprecated Please use DefaultASTFactoryImpl directly
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
+@ApiStatus.ScheduledForRemoval
 public class CoreASTFactory extends DefaultASTFactoryImpl {
 }
diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManager.java b/platform/core-impl/src/com/intellij/ide/plugins/PluginManager.java
index d6e73aa200bd..81b420a80e7b 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManager.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManager.java
@@ -50,7 +50,7 @@ public final class PluginManager {
    * @deprecated In a plugin code simply throw error or log using {@link Logger#error(Throwable)}.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static void processException(@NotNull Throwable t) {
     try {
       Class<?> aClass = PluginManager.class.getClassLoader().loadClass("com.intellij.ide.plugins.StartupAbortedException");
@@ -88,7 +88,7 @@ public final class PluginManager {
    * @deprecated Use {@link #getPluginByClass}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+  @ApiStatus.ScheduledForRemoval
   public static @Nullable PluginId getPluginByClassName(@NotNull String className) {
     return getPluginByClassNameAsNoAccessToClass(className);
   }
@@ -112,7 +112,7 @@ public final class PluginManager {
    * {@link DisabledPluginsState#disabledPlugins()} to get an unmodifiable collection of all disabled plugins (rarely needed).
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.2")
+  @ApiStatus.ScheduledForRemoval
   public static @NotNull List<String> getDisabledPlugins() {
     Set<PluginId> list = DisabledPluginsState.disabledPlugins();
     return new AbstractList<String>() {
diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
index abf761740fb8..9da18651aba1 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
@@ -291,7 +291,7 @@ public final class PluginManagerCore {
    * @deprecated Use {@link PluginManager#getPluginByClass}.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+  @ApiStatus.ScheduledForRemoval
   public static @Nullable PluginId getPluginByClassName(@NotNull String className) {
     PluginDescriptor result = getPluginDescriptorOrPlatformByClassName(className);
     PluginId id = result == null ? null : result.getPluginId();
@@ -302,7 +302,7 @@ public final class PluginManagerCore {
    * @deprecated Use {@link PluginManager#getPluginByClass}.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+  @ApiStatus.ScheduledForRemoval
   public static @Nullable PluginId getPluginOrPlatformByClassName(@NotNull String className) {
     PluginDescriptor result = getPluginDescriptorOrPlatformByClassName(className);
     return result == null ? null : result.getPluginId();
@@ -1173,7 +1173,7 @@ public final class PluginManagerCore {
 
   /** @deprecated Use {@link #enablePlugin(PluginId)} */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static boolean enablePlugin(@NotNull String id) {
     return enablePlugin(PluginId.getId(id));
   }
@@ -1181,7 +1181,7 @@ public final class PluginManagerCore {
   /** @deprecated Use {@link DisabledPluginsState#addDisablePluginListener} directly
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.2")
+  @ApiStatus.ScheduledForRemoval
   public static void addDisablePluginListener(@NotNull Runnable listener) {
     DisabledPluginsState.addDisablePluginListener(listener);
   }
diff --git a/platform/core-impl/src/com/intellij/lang/folding/NamedFoldingDescriptor.java b/platform/core-impl/src/com/intellij/lang/folding/NamedFoldingDescriptor.java
index 6b0c2763d52f..161420f42535 100644
--- a/platform/core-impl/src/com/intellij/lang/folding/NamedFoldingDescriptor.java
+++ b/platform/core-impl/src/com/intellij/lang/folding/NamedFoldingDescriptor.java
@@ -29,13 +29,13 @@ import java.util.Set;
  * @deprecated Use {@link FoldingDescriptor} instead.
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 public final class NamedFoldingDescriptor extends FoldingDescriptor {
   /**
    * @deprecated Use {@link FoldingDescriptor#FoldingDescriptor(PsiElement, int, int, FoldingGroup, String)} instead.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public NamedFoldingDescriptor(@NotNull PsiElement e, int start, int end, @Nullable FoldingGroup group, @NotNull String placeholderText) {
     super(e, start, end, group, placeholderText);
   }
@@ -44,7 +44,7 @@ public final class NamedFoldingDescriptor extends FoldingDescriptor {
    * @deprecated Use {@link FoldingDescriptor#FoldingDescriptor(ASTNode, TextRange, FoldingGroup, String)} instead.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public NamedFoldingDescriptor(@NotNull ASTNode node,
                          @NotNull final TextRange range,
                          @Nullable FoldingGroup group,
@@ -56,7 +56,7 @@ public final class NamedFoldingDescriptor extends FoldingDescriptor {
    * @deprecated Use {@link FoldingDescriptor#FoldingDescriptor(ASTNode, TextRange, FoldingGroup, String, Boolean, Set)} instead.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public NamedFoldingDescriptor(@NotNull ASTNode node,
                                 @NotNull final TextRange range,
                                 @Nullable FoldingGroup group,
diff --git a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java
index aa18386896b1..7b0577f33e46 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java
@@ -26,7 +26,7 @@ public abstract class ApplicationInfoEx extends ApplicationInfo {
    * @deprecated use {@link #getSmallApplicationSvgIconUrl()} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+  @ApiStatus.ScheduledForRemoval
   public abstract @NotNull String getSmallIconUrl();
 
   /**
diff --git a/platform/core-impl/src/com/intellij/openapi/editor/ex/DocumentBulkUpdateListener.java b/platform/core-impl/src/com/intellij/openapi/editor/ex/DocumentBulkUpdateListener.java
index 506428dcf848..6fb7ee14dc90 100644
--- a/platform/core-impl/src/com/intellij/openapi/editor/ex/DocumentBulkUpdateListener.java
+++ b/platform/core-impl/src/com/intellij/openapi/editor/ex/DocumentBulkUpdateListener.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
  * @deprecated Use {@link DocumentListener} instead
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 public interface DocumentBulkUpdateListener {
   Topic<DocumentBulkUpdateListener> TOPIC = Topic.create("Bulk document change notification like reformat, etc.", DocumentBulkUpdateListener.class);
 
@@ -40,7 +40,7 @@ public interface DocumentBulkUpdateListener {
    * @deprecated Use {@link DocumentListener} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   abstract class Adapter implements DocumentBulkUpdateListener {
     @Override
     public void updateFinished(@NotNull final Document doc) {}
diff --git a/platform/core-impl/src/com/intellij/openapi/progress/util/AbstractProgressIndicatorExBase.java b/platform/core-impl/src/com/intellij/openapi/progress/util/AbstractProgressIndicatorExBase.java
index 16fd3a7a4d24..1e6514c718b4 100644
--- a/platform/core-impl/src/com/intellij/openapi/progress/util/AbstractProgressIndicatorExBase.java
+++ b/platform/core-impl/src/com/intellij/openapi/progress/util/AbstractProgressIndicatorExBase.java
@@ -204,7 +204,7 @@ public class AbstractProgressIndicatorExBase extends AbstractProgressIndicatorBa
    * @deprecated do not use. Instead, create new indicator and call {@link #addStateDelegate(ProgressIndicatorEx)} with it.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   protected void delegateRunningChange(@NotNull IndicatorAction action) {
   }
 
diff --git a/platform/core-impl/src/com/intellij/pom/tree/events/impl/ChangeInfoImpl.java b/platform/core-impl/src/com/intellij/pom/tree/events/impl/ChangeInfoImpl.java
index f775db7eeaf8..dffe2f24bc4b 100644
--- a/platform/core-impl/src/com/intellij/pom/tree/events/impl/ChangeInfoImpl.java
+++ b/platform/core-impl/src/com/intellij/pom/tree/events/impl/ChangeInfoImpl.java
@@ -45,7 +45,7 @@ public class ChangeInfoImpl implements ChangeInfo {
    * @deprecated for API compatibility with Kotlin plugin
    */
   @Nullable
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public TreeElement getOldChild() {
     return (TreeElement)myOldChild;
diff --git a/platform/core-impl/src/com/intellij/psi/filters/OrFilter.java b/platform/core-impl/src/com/intellij/psi/filters/OrFilter.java
index f4b03e71f37c..032ad8a9aa68 100644
--- a/platform/core-impl/src/com/intellij/psi/filters/OrFilter.java
+++ b/platform/core-impl/src/com/intellij/psi/filters/OrFilter.java
@@ -27,7 +27,7 @@ public class OrFilter implements ElementFilter {
 
   /** @deprecated use {@link #OrFilter(ElementFilter...)} */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public OrFilter() {
     myFilters = new SmartList<>();
   }
@@ -38,7 +38,7 @@ public class OrFilter implements ElementFilter {
 
   /** @deprecated use {@link #OrFilter(ElementFilter...)} */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public void addFilter(ElementFilter filter) {
     myFilters.add(filter);
   }
diff --git a/platform/core-impl/src/com/intellij/psi/impl/AbstractModificationTracker.java b/platform/core-impl/src/com/intellij/psi/impl/AbstractModificationTracker.java
index b9ebc1e907eb..4cb3faa8b1c9 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/AbstractModificationTracker.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/AbstractModificationTracker.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
  * @deprecated see {@link com.intellij.psi.util.PsiModificationTracker#OUT_OF_CODE_BLOCK_MODIFICATION_COUNT}
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
+@ApiStatus.ScheduledForRemoval
 public abstract class AbstractModificationTracker implements PsiTreeChangePreprocessor {
   private final PsiManagerImpl myPsiManager;
   private PsiModificationTrackerImpl myModificationTracker;
diff --git a/platform/core-impl/src/com/intellij/psi/impl/DebugUtil.java b/platform/core-impl/src/com/intellij/psi/impl/DebugUtil.java
index fc2696789cd9..8ea3679fa838 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/DebugUtil.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/DebugUtil.java
@@ -624,14 +624,14 @@ public final class DebugUtil {
   //<editor-fold desc="Deprecated stuff">
   /** @deprecated use {@link #performPsiModification} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+  @ApiStatus.ScheduledForRemoval
   public static void startPsiModification(@Nullable String trace) {
     beginPsiModification(trace);
   }
 
   /** @deprecated use {@link #performPsiModification} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+  @ApiStatus.ScheduledForRemoval
   public static void finishPsiModification() {
     endPsiModification();
   }
diff --git a/platform/core-impl/src/com/intellij/psi/impl/PsiModificationTrackerImpl.java b/platform/core-impl/src/com/intellij/psi/impl/PsiModificationTrackerImpl.java
index 6ce5757a0f92..51f04d45b7cd 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/PsiModificationTrackerImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/PsiModificationTrackerImpl.java
@@ -58,7 +58,7 @@ public final class PsiModificationTrackerImpl implements PsiModificationTracker,
    * @see PsiManager#dropPsiCaches()
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   public void incCounter() {
     ApplicationManager.getApplication().assertWriteAccessAllowed();
     incCountersInner();
@@ -70,7 +70,7 @@ public final class PsiModificationTrackerImpl implements PsiModificationTracker,
    * @see PsiManager#dropPsiCaches()
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   public void incOutOfCodeBlockModificationCounter() {
     ApplicationManager.getApplication().assertWriteAccessAllowed();
     incCountersInner();
diff --git a/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPoint.java b/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPoint.java
index 6df40a40e7d2..349d2966bdfc 100644
--- a/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPoint.java
+++ b/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPoint.java
@@ -30,7 +30,7 @@ public interface ExtensionPoint<@NotNull T> {
    * @deprecated Use {@link com.intellij.testFramework.PlatformTestUtil#maskExtensions} or {@link #registerExtension(Object, LoadingOrder, Disposable)}.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   void registerExtension(@NotNull T extension, @NotNull LoadingOrder order);
 
   @TestOnly
@@ -63,7 +63,7 @@ public interface ExtensionPoint<@NotNull T> {
    * @deprecated Use another solution, because this method instantiates all extensions.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   default @Nullable T getExtension() {
     // method is deprecated and not used, ignore not efficient implementation
     return ContainerUtil.getFirstItem(getExtensionList());
@@ -73,7 +73,7 @@ public interface ExtensionPoint<@NotNull T> {
    * @deprecated Use another solution, because this method instantiates all extensions.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   default boolean hasExtension(@NotNull T extension) {
     // method is deprecated and used only by one external plugin, ignore not efficient implementation
     return ContainerUtil.containsIdentity(getExtensionList(), extension);
@@ -89,7 +89,7 @@ public interface ExtensionPoint<@NotNull T> {
    * @deprecated Use another solution to unregister not applicable extension, because this method instantiates all extensions.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   void unregisterExtensions(@NotNull Predicate<? super T> extension);
 
   /**
@@ -114,7 +114,7 @@ public interface ExtensionPoint<@NotNull T> {
    * @deprecated Use {@link ExtensionPointName#addChangeListener(Runnable, Disposable)}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   void addExtensionPointListener(@NotNull ExtensionPointChangeListener listener, boolean invokeForLoadedExtensions, @Nullable Disposable parentDisposable);
 
   /**
diff --git a/platform/extensions/src/com/intellij/openapi/extensions/PluginDescriptor.java b/platform/extensions/src/com/intellij/openapi/extensions/PluginDescriptor.java
index 072d941c7125..93a13ee5c0b7 100644
--- a/platform/extensions/src/com/intellij/openapi/extensions/PluginDescriptor.java
+++ b/platform/extensions/src/com/intellij/openapi/extensions/PluginDescriptor.java
@@ -80,7 +80,7 @@ public interface PluginDescriptor {
    * @deprecated doesn't make sense for installed plugins; use PluginNode#getDownloads
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   default @Nullable String getDownloads() {
     return null;
   }
diff --git a/platform/util-class-loader/src/com/intellij/util/lang/UrlClassLoader.java b/platform/util-class-loader/src/com/intellij/util/lang/UrlClassLoader.java
index f42872afe8ec..7ded75c8b293 100644
--- a/platform/util-class-loader/src/com/intellij/util/lang/UrlClassLoader.java
+++ b/platform/util-class-loader/src/com/intellij/util/lang/UrlClassLoader.java
@@ -572,7 +572,7 @@ public class UrlClassLoader extends ClassLoader implements ClassPath.ClassDataCo
     /**
      * @deprecated Use {@link #files(List)}. Using of {@link URL} is discouraged in favor of modern {@link Path}.
      */
-    @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+    @ApiStatus.ScheduledForRemoval
     @Deprecated
     public @NotNull UrlClassLoader.Builder urls(@NotNull List<URL> urls) {
       List<Path> files = new ArrayList<>(urls.size());
diff --git a/platform/util-rt/src/com/intellij/openapi/util/Comparing.java b/platform/util-rt/src/com/intellij/openapi/util/Comparing.java
index 61fbccf26cef..b60ffc346700 100644
--- a/platform/util-rt/src/com/intellij/openapi/util/Comparing.java
+++ b/platform/util-rt/src/com/intellij/openapi/util/Comparing.java
@@ -33,7 +33,7 @@ public final class Comparing {
   }
 
   /** @deprecated same as {@link Arrays#equals(Object[], Object[])} */
-  @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated @ApiStatus.ScheduledForRemoval
   public static <T> boolean equal(@Nullable T[] arr1, @Nullable T[] arr2) {
     return Arrays.equals(arr1, arr2);
   }
diff --git a/platform/util-rt/src/com/intellij/openapi/util/Condition.java b/platform/util-rt/src/com/intellij/openapi/util/Condition.java
index f74931087e7c..3487de9db1cc 100644
--- a/platform/util-rt/src/com/intellij/openapi/util/Condition.java
+++ b/platform/util-rt/src/com/intellij/openapi/util/Condition.java
@@ -49,7 +49,7 @@ public interface Condition<T> {
    * @deprecated use {@link Conditions#alwaysTrue()} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   Condition<Object> TRUE = new Condition<Object>() {
     public boolean value(final Object object) {
       return true;
@@ -64,7 +64,7 @@ public interface Condition<T> {
    * @deprecated use {@link Conditions#alwaysFalse()} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   Condition<Object> FALSE = new Condition<Object>() {
     public boolean value(final Object object) {
       return false;
diff --git a/platform/util-rt/src/com/intellij/openapi/util/SystemInfoRt.java b/platform/util-rt/src/com/intellij/openapi/util/SystemInfoRt.java
index d4d817e68448..f858570ef525 100644
--- a/platform/util-rt/src/com/intellij/openapi/util/SystemInfoRt.java
+++ b/platform/util-rt/src/com/intellij/openapi/util/SystemInfoRt.java
@@ -28,6 +28,6 @@ public final class SystemInfoRt {
   private static final String ARCH_DATA_MODEL = System.getProperty("sun.arch.data.model");
   /** @deprecated inexact, please use {@code com.intellij.util.system.CpuArch} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static final boolean is64Bit = !(ARCH_DATA_MODEL == null || ARCH_DATA_MODEL.equals("32"));
 }
diff --git a/platform/util-rt/src/com/intellij/util/Consumer.java b/platform/util-rt/src/com/intellij/util/Consumer.java
index d20742493a12..5add3d57ee9d 100644
--- a/platform/util-rt/src/com/intellij/util/Consumer.java
+++ b/platform/util-rt/src/com/intellij/util/Consumer.java
@@ -11,7 +11,7 @@ public interface Consumer<T> {
    * @deprecated use {@link com.intellij.util.EmptyConsumer#getInstance()} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   Consumer<Object> EMPTY_CONSUMER = new Consumer<Object>() {
     public void consume(Object t) { }
   };
diff --git a/platform/util-rt/src/com/intellij/util/IncorrectOperationException.java b/platform/util-rt/src/com/intellij/util/IncorrectOperationException.java
index 7da46f5210cb..78bbe76b4f6a 100644
--- a/platform/util-rt/src/com/intellij/util/IncorrectOperationException.java
+++ b/platform/util-rt/src/com/intellij/util/IncorrectOperationException.java
@@ -25,7 +25,7 @@ public class IncorrectOperationException extends RuntimeException {
 
   /** @deprecated use {@link #IncorrectOperationException(String, Throwable)} */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   public IncorrectOperationException(String message, Exception e) {
     super(message, e);
   }
diff --git a/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java b/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java
index 1d78db9defdd..b3cb8c3ad0aa 100644
--- a/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java
+++ b/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java
@@ -17,7 +17,7 @@ import java.util.*;
  * Intended to use by external (out-of-IDE-process) runners and helpers so it should not contain any library dependencies.
  * @deprecated Use collection methods instead
  */
-@ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+@ApiStatus.ScheduledForRemoval
 @Deprecated
 public final class ContainerUtilRt {
   /**
@@ -26,7 +26,7 @@ public final class ContainerUtilRt {
   @NotNull
   @Contract(value = " -> new", pure = true)
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static <K, V> HashMap<K, V> newHashMap() {
     return new HashMap<K, V>();
   }
@@ -45,7 +45,7 @@ public final class ContainerUtilRt {
    * @deprecated Use {@link com.intellij.util.containers.ContainerUtil#newArrayList(Object[])} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @NotNull
   @Contract(value = "_ -> new", pure = true)
   public static <T> ArrayList<T> newArrayList(@NotNull T... elements) {
@@ -60,7 +60,7 @@ public final class ContainerUtilRt {
   @NotNull
   @Contract(value = " -> new", pure = true)
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static <T> HashSet<T> newHashSet() {
     return new HashSet<T>();
   }
@@ -69,7 +69,7 @@ public final class ContainerUtilRt {
    * @deprecated Use {@link com.intellij.util.containers.ContainerUtil#newHashSet(Object[])}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @NotNull
   @Contract(value = "_ -> new", pure = true)
   public static <T> HashSet<T> newHashSet(@NotNull T... elements) {
@@ -94,7 +94,7 @@ public final class ContainerUtilRt {
    * @deprecated Use {@link com.intellij.util.containers.ContainerUtil#newLinkedHashSet(Object[])}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @NotNull
   @Contract(value = "_ -> new", pure = true)
   public static <T> LinkedHashSet<T> newLinkedHashSet(@NotNull T... elements) {
@@ -179,7 +179,7 @@ public final class ContainerUtilRt {
    * @deprecated Use {@link com.intellij.util.containers.ContainerUtil#emptyList()}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @NotNull
   @Contract(pure=true)
   public static <T> List<T> emptyList() {
@@ -194,7 +194,7 @@ public final class ContainerUtilRt {
   @Deprecated
   @NotNull
   @Contract(pure=true)
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.2")
+  @ApiStatus.ScheduledForRemoval
   public static <T, V> List<V> map2List(@NotNull Collection<? extends T> collection, @NotNull Function<? super T, ? extends V> mapper) {
     if (collection.isEmpty()) return emptyList();
     List<V> list = new ArrayList<V>(collection.size());
diff --git a/platform/util-rt/src/com/intellij/util/containers/EmptyIterator.java b/platform/util-rt/src/com/intellij/util/containers/EmptyIterator.java
index 21ed389d3a69..1172d34362e6 100644
--- a/platform/util-rt/src/com/intellij/util/containers/EmptyIterator.java
+++ b/platform/util-rt/src/com/intellij/util/containers/EmptyIterator.java
@@ -25,7 +25,7 @@ import java.util.NoSuchElementException;
  * @deprecated Use {@link Collections#emptyIterator()} instead
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 public class EmptyIterator<T> implements Iterator<T> {
   private static final EmptyIterator INSTANCE = new EmptyIterator();
   public static <T> EmptyIterator<T> getInstance() {
diff --git a/platform/util/base/src/com/intellij/util/ArrayUtil.java b/platform/util/base/src/com/intellij/util/ArrayUtil.java
index 7007b348021a..c49e1831da40 100644
--- a/platform/util/base/src/com/intellij/util/ArrayUtil.java
+++ b/platform/util/base/src/com/intellij/util/ArrayUtil.java
@@ -530,7 +530,7 @@ public final class ArrayUtil {
   /**
    * @deprecated Use {@link Arrays#equals(Object[], Object[], Comparator)}
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static <T> boolean equals(T @NotNull [] a1, T @NotNull [] a2, @NotNull Comparator<? super T> comparator) {
     //noinspection ArrayEquality
diff --git a/platform/util/base/src/com/intellij/util/SystemProperties.java b/platform/util/base/src/com/intellij/util/SystemProperties.java
index f7fe2496f651..e144d4a19969 100644
--- a/platform/util/base/src/com/intellij/util/SystemProperties.java
+++ b/platform/util/base/src/com/intellij/util/SystemProperties.java
@@ -79,14 +79,14 @@ public final class SystemProperties {
   //<editor-fold desc="Deprecated stuff.">
   /** @deprecated please use {@link Boolean#getBoolean(String)} or {@link #getBooleanProperty(String, boolean)} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static boolean is(String key) {
     return getBooleanProperty(key, false);
   }
 
   /** @deprecated please use {@link System#lineSeparator()} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static String getLineSeparator() {
     return System.lineSeparator();
   }
diff --git a/platform/util/base/src/com/intellij/util/containers/ConcurrentWeakKeySoftValueHashMap.java b/platform/util/base/src/com/intellij/util/containers/ConcurrentWeakKeySoftValueHashMap.java
index ec0ce031c610..63ad2b0d328f 100644
--- a/platform/util/base/src/com/intellij/util/containers/ConcurrentWeakKeySoftValueHashMap.java
+++ b/platform/util/base/src/com/intellij/util/containers/ConcurrentWeakKeySoftValueHashMap.java
@@ -20,7 +20,7 @@ import java.util.function.Supplier;
  * @deprecated Use {@link ContainerUtil#createConcurrentWeakKeySoftValueMap()} instead
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 public class ConcurrentWeakKeySoftValueHashMap<K, V> implements ConcurrentMap<K, V> {
   private final ConcurrentMap<KeyReference<K,V>, ValueReference<K,V>> myMap;
   final ReferenceQueue<K> myKeyQueue = new ReferenceQueue<>();
diff --git a/platform/util/base/src/com/intellij/util/text/ByteArrayCharSequence.java b/platform/util/base/src/com/intellij/util/text/ByteArrayCharSequence.java
index a60a45d81180..26e12c48e4b6 100644
--- a/platform/util/base/src/com/intellij/util/text/ByteArrayCharSequence.java
+++ b/platform/util/base/src/com/intellij/util/text/ByteArrayCharSequence.java
@@ -68,7 +68,7 @@ public final class ByteArrayCharSequence implements CharSequenceWithStringHash {
    * @deprecated use {@param name} instead because of JEP 254
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @NotNull
   public static CharSequence convertToBytesIfAsciiString(@NotNull String name) {
     return name;
@@ -78,7 +78,7 @@ public final class ByteArrayCharSequence implements CharSequenceWithStringHash {
    * @deprecated use {@param string} instead because of JEP 254
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static @NotNull CharSequence convertToBytesIfPossible(@NotNull CharSequence string) {
     if (JAVA_9) return string; // see JEP 254: Compact Strings
     if (string.length() == 0) return "";
diff --git a/platform/util/src/com/intellij/execution/process/BaseOSProcessHandler.java b/platform/util/src/com/intellij/execution/process/BaseOSProcessHandler.java
index 1e0e94c65a65..aa779b13657a 100644
--- a/platform/util/src/com/intellij/execution/process/BaseOSProcessHandler.java
+++ b/platform/util/src/com/intellij/execution/process/BaseOSProcessHandler.java
@@ -40,7 +40,7 @@ public class BaseOSProcessHandler extends BaseProcessHandler<Process> {
    * @deprecated override {@link #executeTask(Runnable)} instead of this method
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @NotNull
   protected Future<?> executeOnPooledThread(@NotNull final Runnable task) {
     return ProcessIOExecutorService.INSTANCE.submit(task);
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index 38b839d25dae..d85ea0985623 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -222,7 +222,7 @@ public class AllIcons {
     /** @deprecated to be removed in IDEA 2021.1 (use expandable text field instead, see https://jetbrains.design/intellij/controls/built_in_button/) */
     @SuppressWarnings("unused")
     @Deprecated
-    @ScheduledForRemoval(inVersion = "2021.1")
+    @ScheduledForRemoval
     public static final @NotNull Icon ShowViewer = load("actions/showViewer.png", 0, 0);
   }
 
@@ -1190,7 +1190,7 @@ public class AllIcons {
     /** @deprecated to be removed in IDEA 2021.1 */
     @SuppressWarnings("unused")
     @Deprecated
-    @ScheduledForRemoval(inVersion = "2021.1")
+    @ScheduledForRemoval
     public static final @NotNull Icon CreateNewProject = load("welcome/createNewProject.svg", 0, 0);
   }
 
diff --git a/platform/util/src/com/intellij/openapi/util/AtomicNotNullLazyValue.java b/platform/util/src/com/intellij/openapi/util/AtomicNotNullLazyValue.java
index ee6dc7ec33c5..d08ed2153758 100644
--- a/platform/util/src/com/intellij/openapi/util/AtomicNotNullLazyValue.java
+++ b/platform/util/src/com/intellij/openapi/util/AtomicNotNullLazyValue.java
@@ -11,7 +11,7 @@ public abstract class AtomicNotNullLazyValue<T> extends NotNullLazyValue<T> {
   private volatile T myValue;
 
   /** @deprecated Use {@link NotNullLazyValue#atomicLazy(Supplier)} */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   protected AtomicNotNullLazyValue() { }
 
diff --git a/platform/util/src/com/intellij/openapi/util/ClassLoaderUtil.java b/platform/util/src/com/intellij/openapi/util/ClassLoaderUtil.java
index 8e2a671d16b5..cb064ae06937 100644
--- a/platform/util/src/com/intellij/openapi/util/ClassLoaderUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/ClassLoaderUtil.java
@@ -37,7 +37,7 @@ public final class ClassLoaderUtil {
 
   /** @deprecated Use {@link ClassLoaderUtil#computeWithClassLoader(ClassLoader, ThrowableComputable)} instead. */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static <T> T runWithClassLoader(ClassLoader classLoader, Computable<T> computable) {
     return computeWithClassLoader(classLoader, () -> computable.compute());
   }
diff --git a/platform/util/src/com/intellij/openapi/util/Conditions.java b/platform/util/src/com/intellij/openapi/util/Conditions.java
index 77e9ba99ab4f..90bd97c81eca 100644
--- a/platform/util/src/com/intellij/openapi/util/Conditions.java
+++ b/platform/util/src/com/intellij/openapi/util/Conditions.java
@@ -17,7 +17,7 @@ public final class Conditions {
    * @deprecated use {@link #alwaysTrue()} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static final Condition<Object> TRUE = alwaysTrue();
 
   @NotNull
diff --git a/platform/util/src/com/intellij/openapi/util/Disposer.java b/platform/util/src/com/intellij/openapi/util/Disposer.java
index 5e5eb64888c7..418e9efc89f8 100644
--- a/platform/util/src/com/intellij/openapi/util/Disposer.java
+++ b/platform/util/src/com/intellij/openapi/util/Disposer.java
@@ -130,7 +130,7 @@ public final class Disposer {
   /**
    * @deprecated Use {@link #register(Disposable, Disposable)} instead
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static void register(@NotNull Disposable parent, @NotNull Disposable child, @NonNls @NotNull final String key) {
     register(parent, child);
@@ -195,7 +195,7 @@ public final class Disposer {
   /**
    * @deprecated Store and use your own Disposable instead. Instead of {@code Disposer.get("ui")} use {@link com.intellij.openapi.application.ApplicationManager#getApplication()}
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static Disposable get(@NotNull String key) {
     String message = "this method is deprecated and going to be removed soon. Store and use your own Disposable instead";
diff --git a/platform/util/src/com/intellij/openapi/util/IconPathPatcher.java b/platform/util/src/com/intellij/openapi/util/IconPathPatcher.java
index 72b531c529c3..2607ed942a36 100644
--- a/platform/util/src/com/intellij/openapi/util/IconPathPatcher.java
+++ b/platform/util/src/com/intellij/openapi/util/IconPathPatcher.java
@@ -13,7 +13,7 @@ public abstract class IconPathPatcher {
    * @deprecated use {@link #patchPath(String, ClassLoader)}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public @Nullable String patchPath(@NotNull String path) {
     return patchPath(path, null);
   }
@@ -33,7 +33,7 @@ public abstract class IconPathPatcher {
    * @deprecated use {@link #getContextClassLoader(String, ClassLoader)}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public Class<?> getContextClass(@NotNull String path) {
     return null;
   }
diff --git a/platform/util/src/com/intellij/openapi/util/JDOMExternalizerUtil.java b/platform/util/src/com/intellij/openapi/util/JDOMExternalizerUtil.java
index f1d915d8cb82..385c1dc5d9cb 100644
--- a/platform/util/src/com/intellij/openapi/util/JDOMExternalizerUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/JDOMExternalizerUtil.java
@@ -135,7 +135,7 @@ public final class JDOMExternalizerUtil {
   //<editor-fold desc="Deprecated stuff.">
   /** @deprecated use {@link #writeCustomField(Element, String, String)} */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static Element addElementWithValueAttribute(@NotNull Element parent, @NotNull String childTagName, @Nullable String attrValue) {
     writeCustomField(parent, childTagName, attrValue);
     return parent.getChild(childTagName);
@@ -143,7 +143,7 @@ public final class JDOMExternalizerUtil {
 
   /** @deprecated use {@link #readCustomField(Element, String)} */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static String getFirstChildValueAttribute(@NotNull Element parent, @NotNull String childTagName) {
     return readCustomField(parent, childTagName);
   }
diff --git a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
index 45cbd11e536b..ad5fc122e8c1 100644
--- a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
@@ -108,7 +108,7 @@ public final class JDOMUtil {
    * @deprecated Use {@link Element#getChildren} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static Element @NotNull [] getElements(@NotNull Element m) {
     List<Element> list = m.getChildren();
     return list.toArray(new Element[0]);
diff --git a/platform/util/src/com/intellij/openapi/util/LazyInstance.java b/platform/util/src/com/intellij/openapi/util/LazyInstance.java
index 2a8c0d4adaf7..1c756beba358 100644
--- a/platform/util/src/com/intellij/openapi/util/LazyInstance.java
+++ b/platform/util/src/com/intellij/openapi/util/LazyInstance.java
@@ -9,7 +9,7 @@ import java.lang.reflect.Constructor;
 /**
  * @deprecated Use {@link com.intellij.openapi.components.ComponentManager#instantiateClass}
  */
-@ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+@ApiStatus.ScheduledForRemoval
 @Deprecated
 public abstract class LazyInstance<T> extends NotNullLazyValue<T> {
   protected abstract Class<T> getInstanceClass() throws ClassNotFoundException;
diff --git a/platform/util/src/com/intellij/openapi/util/MultiValuesMap.java b/platform/util/src/com/intellij/openapi/util/MultiValuesMap.java
index 92aea9aa07a5..711fab525584 100644
--- a/platform/util/src/com/intellij/openapi/util/MultiValuesMap.java
+++ b/platform/util/src/com/intellij/openapi/util/MultiValuesMap.java
@@ -19,7 +19,7 @@ import java.util.*;
  */
 @Debug.Renderer(text = "\"size = \" + myDelegate.size()", hasChildren = "!isEmpty()", childrenArray = "entrySet().toArray()")
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 public class MultiValuesMap<K, V>{
   private final MultiMap<K, V> myDelegate;
   private final boolean myOrdered;
diff --git a/platform/util/src/com/intellij/openapi/util/NotNullLazyValue.java b/platform/util/src/com/intellij/openapi/util/NotNullLazyValue.java
index 6db70f459673..fa87f5b2d326 100644
--- a/platform/util/src/com/intellij/openapi/util/NotNullLazyValue.java
+++ b/platform/util/src/com/intellij/openapi/util/NotNullLazyValue.java
@@ -17,7 +17,7 @@ public abstract class NotNullLazyValue<T> implements Supplier<T> {
   private T myValue;
 
   /** @deprecated Use {@link NotNullLazyValue#lazy(Supplier)} */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.2")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   @SuppressWarnings("DeprecatedIsStillUsed")
   protected NotNullLazyValue() { }
diff --git a/platform/util/src/com/intellij/openapi/util/RecursionGuard.java b/platform/util/src/com/intellij/openapi/util/RecursionGuard.java
index 1882f9db3f2f..4cf3dd7b92ff 100644
--- a/platform/util/src/com/intellij/openapi/util/RecursionGuard.java
+++ b/platform/util/src/com/intellij/openapi/util/RecursionGuard.java
@@ -55,7 +55,7 @@ public abstract class RecursionGuard<Key> {
   /** @deprecated Use {@link RecursionManager#markStack()} instead */
   @NotNull
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public StackStamp markStack() {
     return RecursionManager.markStack();
   }
diff --git a/platform/util/src/com/intellij/openapi/util/SystemInfo.java b/platform/util/src/com/intellij/openapi/util/SystemInfo.java
index 714daffaf431..2c97b37e568c 100644
--- a/platform/util/src/com/intellij/openapi/util/SystemInfo.java
+++ b/platform/util/src/com/intellij/openapi/util/SystemInfo.java
@@ -187,68 +187,68 @@ public final class SystemInfo {
   //<editor-fold desc="Deprecated stuff.">
   /** @deprecated please use {@link Runtime#version()} (in the platform) or {@link JavaVersion} (in utils) */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static final boolean IS_AT_LEAST_JAVA9 = JavaVersion.current().feature >= 9;
 
   /** @deprecated please use {@link Runtime#version()} (in the platform) or {@link JavaVersion} (in utils) */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static boolean isJavaVersionAtLeast(int major) {
     return JavaVersion.current().feature >= major;
   }
 
   /** @deprecated please use {@link Runtime#version()} (in the platform) or {@link JavaVersion} (in utils) */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static boolean isJavaVersionAtLeast(int major, int minor, int update) {
     return JavaVersion.current().compareTo(JavaVersion.compose(major, minor, update, 0, false)) >= 0;
   }
 
   /** @deprecated please use {@link Runtime#version()} (in the platform) or {@link JavaVersion} (in utils) */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static boolean isJavaVersionAtLeast(String v) {
     return StringUtil.compareVersionNumbers(JAVA_RUNTIME_VERSION, v) >= 0;
   }
 
   /** @deprecated may be inaccurate; please use {@link CpuArch} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static final boolean is32Bit = CpuArch.CURRENT.width == 32;
 
   /** @deprecated may be inaccurate; please use {@link CpuArch} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static final boolean is64Bit = CpuArch.CURRENT.width == 64;
 
   /** @deprecated trivial and mostly outdated */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.2")
+  @ApiStatus.ScheduledForRemoval
   public static final boolean isMacIntel64 = isMac && CpuArch.isIntel64();
 
   /** @deprecated always false */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static final boolean isAppleJvm = false;
 
   /** @deprecated always true (Java 8 requires macOS 10.9+) */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static final boolean isMacOSLeopard = isMac;
 
   /** @deprecated always true (Java 8 requires macOS 10.9+) */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static final boolean isMacOSMountainLion = isMac;
 
   /** @deprecated always true (Java 8 requires Windows Vista / Server 2008) */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static final boolean isWinVistaOrNewer = isWindows;
 
   /** @deprecated always true */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   public static final boolean areSymLinksSupported = isUnix || isWindows;
   //</editor-fold>
 }
diff --git a/platform/util/src/com/intellij/openapi/util/Transform.java b/platform/util/src/com/intellij/openapi/util/Transform.java
index 9df1c9dce626..f34f32c9e1da 100644
--- a/platform/util/src/com/intellij/openapi/util/Transform.java
+++ b/platform/util/src/com/intellij/openapi/util/Transform.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.ApiStatus;
  * @deprecated use {@link java.util.function.Function} instead
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 public interface Transform<S, T> {
   /**
    * @deprecated use {@link java.util.function.Function} instead
diff --git a/platform/util/src/com/intellij/openapi/util/WriteExternalException.java b/platform/util/src/com/intellij/openapi/util/WriteExternalException.java
index 21887c2158a2..6d460bc57b04 100644
--- a/platform/util/src/com/intellij/openapi/util/WriteExternalException.java
+++ b/platform/util/src/com/intellij/openapi/util/WriteExternalException.java
@@ -12,7 +12,7 @@ public class WriteExternalException extends RuntimeException {
    * @deprecated Do not use WriteExternalException as a control flow exception.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public WriteExternalException() {
     super();
   }
diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
index 091318dc8238..eb8493da6474 100644
--- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
@@ -48,7 +48,7 @@ public class FileUtil extends FileUtilRt {
    */
   @SuppressWarnings("unchecked")
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static final TObjectHashingStrategy<String> PATH_HASHING_STRATEGY = 
     SystemInfoRt.isFileSystemCaseSensitive
     ? TObjectHashingStrategy.CANONICAL
@@ -58,7 +58,7 @@ public class FileUtil extends FileUtilRt {
    * @deprecated use {@link com.intellij.util.containers.CollectionFactory#createFilePathSet()}, or other createFilePath*() methods from there
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static final TObjectHashingStrategy<File> FILE_HASHING_STRATEGY =
     new TObjectHashingStrategy<File>() {
       @Override
@@ -813,7 +813,7 @@ public class FileUtil extends FileUtilRt {
    *             If you need to check whether a file has a specified extension use {@link FileUtilRt#extensionEquals(String, String)}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @NotNull
   public static String getExtension(@NotNull String fileName) {
     return Strings.toLowerCase(FileUtilRt.getExtension(fileName));
@@ -1143,7 +1143,7 @@ public class FileUtil extends FileUtilRt {
    * @deprecated use  {@link #fileTraverser(File)}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static boolean processFilesRecursively(@NotNull File root,
                                                 @NotNull Processor<? super File> processor,
                                                 @Nullable Processor<? super File> directoryFilter) {
@@ -1258,14 +1258,14 @@ public class FileUtil extends FileUtilRt {
 
   /** @deprecated ambiguous w.r.t. to normalized UNC paths; consider using {@link OSAgnosticPathUtil} or {@link java.nio.file NIO2} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static boolean isUnixAbsolutePath(@NotNull String path) {
     return path.startsWith("/");
   }
 
   /** @deprecated does not support UNC paths; consider using {@link OSAgnosticPathUtil} or {@link java.nio.file NIO2} instead */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static boolean isWindowsAbsolutePath(@NotNull String path) {
     boolean ok = path.length() >= 2 && Character.isLetter(path.charAt(0)) && path.charAt(1) == ':';
     if (ok && path.length() > 2) {
diff --git a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
index 1f0331ffebd1..5ecac508b5e0 100644
--- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
@@ -125,7 +125,7 @@ public class StringUtil extends StringUtilRt {
    * @deprecated use {@link Object#toString()} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @Contract(pure = true)
   public static @NotNull <T> Function<T, String> createToStringFunction(@NotNull Class<T> cls) {
     return Object::toString;
@@ -151,7 +151,7 @@ public class StringUtil extends StringUtilRt {
    */
   @Contract(pure = true)
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static @NotNull String replaceChar(@NotNull String buffer, char oldChar, char newChar) {
     return buffer.replace(oldChar, newChar);
   }
@@ -1553,7 +1553,7 @@ public class StringUtil extends StringUtilRt {
    * @deprecated use NlsMessages#formatDurationApproximateNarrow for localized output
    */
   @Contract(pure = true)
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static @NotNull @NonNls String formatDuration(long duration, @NotNull String unitSeparator) {
     return Formats.formatDuration(duration, unitSeparator);
diff --git a/platform/util/src/com/intellij/util/Base64Converter.java b/platform/util/src/com/intellij/util/Base64Converter.java
index cef1f611c0af..32a716925c0b 100644
--- a/platform/util/src/com/intellij/util/Base64Converter.java
+++ b/platform/util/src/com/intellij/util/Base64Converter.java
@@ -10,7 +10,7 @@ import java.nio.charset.StandardCharsets;
  * @deprecated Please use {@link java.util.Base64} instead
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 public final class Base64Converter {
   private static final char[] alphabet = {
     'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',   //  0 to  7
diff --git a/platform/util/src/com/intellij/util/StringBuilderSpinAllocator.java b/platform/util/src/com/intellij/util/StringBuilderSpinAllocator.java
index c1996401558b..0712074dd869 100644
--- a/platform/util/src/com/intellij/util/StringBuilderSpinAllocator.java
+++ b/platform/util/src/com/intellij/util/StringBuilderSpinAllocator.java
@@ -5,13 +5,13 @@ import com.intellij.openapi.diagnostic.Logger;
 import org.jetbrains.annotations.ApiStatus;
 
 /** @deprecated use {@link StringBuilder} instead */
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 @Deprecated
 public final class StringBuilderSpinAllocator {
   private StringBuilderSpinAllocator() { }
 
   /** @deprecated use {@code new StringBuilder()} instead */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static StringBuilder alloc() {
     Logger.getInstance(StringBuilderSpinAllocator.class).warn(new Exception("Use 'new StringBuilder()' instead"));
@@ -19,7 +19,7 @@ public final class StringBuilderSpinAllocator {
   }
 
   /** @deprecated just delete the call */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public static void dispose(StringBuilder instance) {
     Logger.getInstance(StringBuilderSpinAllocator.class).warn(new Exception("Do not use"));
diff --git a/platform/util/src/com/intellij/util/concurrency/FixedFuture.java b/platform/util/src/com/intellij/util/concurrency/FixedFuture.java
index cb23fd570786..6def2eafe34c 100644
--- a/platform/util/src/com/intellij/util/concurrency/FixedFuture.java
+++ b/platform/util/src/com/intellij/util/concurrency/FixedFuture.java
@@ -10,7 +10,7 @@ import java.util.concurrent.TimeUnit;
 
 /** @deprecated use {@link java.util.concurrent.CompletableFuture#completedFuture} */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 public class FixedFuture<T> implements Future<T> {
   private final T myValue;
   private final Throwable myThrowable;
diff --git a/platform/util/src/com/intellij/util/containers/ConcurrentMultiMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentMultiMap.java
index 0807e99d68c0..da4fcf5b2b7d 100644
--- a/platform/util/src/com/intellij/util/containers/ConcurrentMultiMap.java
+++ b/platform/util/src/com/intellij/util/containers/ConcurrentMultiMap.java
@@ -11,7 +11,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @deprecated Use {@link MultiMap#createConcurrent()} or {@link MultiMap#createConcurrentSet()}
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 public class ConcurrentMultiMap<K, V> extends MultiMap<K, V> {
   public ConcurrentMultiMap() {
     super(new ConcurrentHashMap<>());
diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java
index 4e4a9afb9ab3..6912615686a6 100644
--- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java
+++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java
@@ -92,7 +92,7 @@ public final class ContainerUtil {
    */
   @Contract(pure = true)
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static @NotNull <T> LinkedList<T> newLinkedList() {
     return new LinkedList<>();
   }
@@ -685,7 +685,7 @@ public final class ContainerUtil {
    * @deprecated Use {@link Collections#emptyList()} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @Contract(pure = true)
   public static @NotNull <T> Iterable<T> emptyIterable() {
     return Collections.emptyList();
@@ -2360,7 +2360,7 @@ public final class ContainerUtil {
    */
   @Contract(value = " -> new", pure = true)
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static @NotNull <T> Stack<T> newStack() {
     return new Stack<>();
   }
@@ -2406,7 +2406,7 @@ public final class ContainerUtil {
   /**
    * @deprecated Use {@link com.intellij.concurrency.ConcurrentCollectionFactory#createConcurrentLongObjectMap()} instead
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   @Contract(value = " -> new", pure = true)
   public static @NotNull <V> ConcurrentLongObjectMap<@NotNull V> createConcurrentLongObjectMap() {
@@ -2416,7 +2416,7 @@ public final class ContainerUtil {
   /**
    * @deprecated Use {@link com.intellij.concurrency.ConcurrentCollectionFactory#createConcurrentIntObjectMap()} instead
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   @Contract(value = " -> new", pure = true)
   public static @NotNull <V> ConcurrentIntObjectMap<@NotNull V> createConcurrentIntObjectMap() {
@@ -2426,7 +2426,7 @@ public final class ContainerUtil {
   /**
    * @deprecated Use {@link com.intellij.concurrency.ConcurrentCollectionFactory#createConcurrentIntObjectWeakValueMap()} instead
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   @Contract(value = " -> new", pure = true)
   public static @NotNull <V> ConcurrentIntObjectMap<@NotNull V> createConcurrentIntObjectWeakValueMap() {
@@ -2576,7 +2576,7 @@ public final class ContainerUtil {
    * @deprecated use {@link List#toArray(Object[])} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @Contract(mutates = "param2")
   public static <T> T @NotNull [] toArray(@NotNull List<T> collection, T @NotNull [] array) {
     return collection.toArray(array);
@@ -2586,7 +2586,7 @@ public final class ContainerUtil {
    * @deprecated use {@link Collection#toArray(Object[])} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   @Contract(mutates = "param2")
   public static <T> T @NotNull [] toArray(@NotNull Collection<? extends T> c, T @NotNull [] sample) {
     return c.toArray(sample);
diff --git a/platform/util/src/com/intellij/util/containers/MultiMap.java b/platform/util/src/com/intellij/util/containers/MultiMap.java
index fbd58f601cd7..d4cc9fa4c012 100644
--- a/platform/util/src/com/intellij/util/containers/MultiMap.java
+++ b/platform/util/src/com/intellij/util/containers/MultiMap.java
@@ -157,7 +157,7 @@ public class MultiMap<K, V> implements Serializable {
    * @deprecated use {@link #remove(Object, Object)} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public final void removeValue(K key, V value) {
     remove(key, value);
   }
@@ -286,7 +286,7 @@ public class MultiMap<K, V> implements Serializable {
    * @deprecated Use {@link #MultiMap()}.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static @NotNull <K, V> MultiMap<K, V> createSmart() {
     return new MultiMap<>();
   }
diff --git a/platform/util/src/com/intellij/util/containers/WeakValueHashMap.java b/platform/util/src/com/intellij/util/containers/WeakValueHashMap.java
index 8a85367d8b9e..90fd3dedc5c6 100644
--- a/platform/util/src/com/intellij/util/containers/WeakValueHashMap.java
+++ b/platform/util/src/com/intellij/util/containers/WeakValueHashMap.java
@@ -11,7 +11,7 @@ import java.lang.ref.WeakReference;
  * @deprecated use {@link ContainerUtil#createWeakValueMap()} instead
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+@ApiStatus.ScheduledForRemoval
 public final class WeakValueHashMap<K,V> extends RefValueHashMap<K,V> {
   private static final class MyWeakReference<K, T> extends WeakReference<T> implements MyReference<K, T> {
     private final K key;
@@ -32,7 +32,7 @@ public final class WeakValueHashMap<K,V> extends RefValueHashMap<K,V> {
    * @deprecated use {@link ContainerUtil#createWeakValueMap()} instead
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.1")
+  @ApiStatus.ScheduledForRemoval
   public WeakValueHashMap() {
   }
 
diff --git a/platform/util/src/com/intellij/util/containers/hash/HashMap.java b/platform/util/src/com/intellij/util/containers/hash/HashMap.java
index 390f4a2c8f6b..2f0ce2999e16 100644
--- a/platform/util/src/com/intellij/util/containers/hash/HashMap.java
+++ b/platform/util/src/com/intellij/util/containers/hash/HashMap.java
@@ -11,7 +11,7 @@ import java.util.*;
  * @deprecated Use {@link java.util.HashMap}
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2020.2")
+@ApiStatus.ScheduledForRemoval
 public class HashMap<K, V> extends AbstractMap<K, V> implements Map<K, V> {
   private Entry<K, V>[] table;
   private int capacity;
diff --git a/platform/util/src/com/intellij/util/containers/hash/HashSet.java b/platform/util/src/com/intellij/util/containers/hash/HashSet.java
index 8772d51010b6..bb3c8cb14725 100644
--- a/platform/util/src/com/intellij/util/containers/hash/HashSet.java
+++ b/platform/util/src/com/intellij/util/containers/hash/HashSet.java
@@ -13,7 +13,7 @@ import java.util.Set;
  * @deprecated Use {@link java.util.HashSet}
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2020.2")
+@ApiStatus.ScheduledForRemoval
 public class HashSet<E> extends AbstractSet<E> implements Set<E> {
   private Entry<E>[] table;
   private int capacity;
diff --git a/platform/util/src/com/intellij/util/enumeration/ArrayListEnumeration.java b/platform/util/src/com/intellij/util/enumeration/ArrayListEnumeration.java
index 2369f7d40a62..1f1c009e9629 100644
--- a/platform/util/src/com/intellij/util/enumeration/ArrayListEnumeration.java
+++ b/platform/util/src/com/intellij/util/enumeration/ArrayListEnumeration.java
@@ -25,7 +25,7 @@ import java.util.NoSuchElementException;
  * @deprecated obsolete
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 public class ArrayListEnumeration implements Enumeration {
   private final ArrayList myArrayList;
   private int myCounter;
diff --git a/platform/util/src/com/intellij/util/io/BaseDataReader.java b/platform/util/src/com/intellij/util/io/BaseDataReader.java
index 2f523ab19a7a..1caca1be72fc 100644
--- a/platform/util/src/com/intellij/util/io/BaseDataReader.java
+++ b/platform/util/src/com/intellij/util/io/BaseDataReader.java
@@ -145,7 +145,7 @@ public abstract class BaseDataReader {
      * @deprecated use {@link #NON_BLOCKING} instead
      */
     @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+    @ApiStatus.ScheduledForRemoval
     SleepingPolicy SIMPLE = NON_BLOCKING;
   }
 
diff --git a/platform/util/src/com/intellij/util/io/PersistentHashMap.java b/platform/util/src/com/intellij/util/io/PersistentHashMap.java
index 1ae9e03ae7a8..7c2bdee1139b 100644
--- a/platform/util/src/com/intellij/util/io/PersistentHashMap.java
+++ b/platform/util/src/com/intellij/util/io/PersistentHashMap.java
@@ -96,7 +96,7 @@ public class PersistentHashMap<Key, Value> implements AppendablePersistentMap<Ke
   /**
    * @deprecated please use {@link AppendablePersistentMap.ValueDataAppender}
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   @SuppressWarnings("DeprecatedIsStillUsed")
   public interface ValueDataAppender extends AppendablePersistentMap.ValueDataAppender {
@@ -105,7 +105,7 @@ public class PersistentHashMap<Key, Value> implements AppendablePersistentMap<Ke
   /**
    * @deprecated please use {@link AppendablePersistentMap.ValueDataAppender} as the second parameter
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   @SuppressWarnings("LambdaUnfriendlyMethodOverload")
   public final void appendData(Key key, @NotNull ValueDataAppender appender) throws IOException {
diff --git a/platform/util/src/com/intellij/util/io/ZipUtil.java b/platform/util/src/com/intellij/util/io/ZipUtil.java
index d89cce715287..b78d05c0f367 100644
--- a/platform/util/src/com/intellij/util/io/ZipUtil.java
+++ b/platform/util/src/com/intellij/util/io/ZipUtil.java
@@ -146,7 +146,7 @@ public final class ZipUtil {
    * @deprecated {@link #extract(Path, Path, FilenameFilter, boolean)}
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @ApiStatus.ScheduledForRemoval
   public static void extract(@NotNull File file, @NotNull File outputDir, @Nullable FilenameFilter filter, boolean overwrite) throws IOException {
     new Decompressor.Zip(file).filter(FileFilterAdapter.wrap(outputDir.toPath(), filter)).overwrite(overwrite).extract(outputDir);
   }
diff --git a/platform/util/src/com/intellij/util/text/CaseInsensitiveStringHashingStrategy.java b/platform/util/src/com/intellij/util/text/CaseInsensitiveStringHashingStrategy.java
index 7330dbeb3e6d..496a34e6c1f0 100644
--- a/platform/util/src/com/intellij/util/text/CaseInsensitiveStringHashingStrategy.java
+++ b/platform/util/src/com/intellij/util/text/CaseInsensitiveStringHashingStrategy.java
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.ApiStatus;
  * or {@link com.intellij.util.containers.CollectionFactory#createCaseInsensitiveStringSet()} instead
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 public final class CaseInsensitiveStringHashingStrategy implements TObjectHashingStrategy<String> {
   public static final CaseInsensitiveStringHashingStrategy INSTANCE = new CaseInsensitiveStringHashingStrategy();
 
diff --git a/platform/util/src/org/apache/log4j/package-info.java b/platform/util/src/org/apache/log4j/package-info.java
index 895bad1cd4a9..1fbd565826d6 100644
--- a/platform/util/src/org/apache/log4j/package-info.java
+++ b/platform/util/src/org/apache/log4j/package-info.java
@@ -5,7 +5,7 @@
  * directly. 
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+@ApiStatus.ScheduledForRemoval
 package org.apache.log4j;
 
 import org.jetbrains.annotations.ApiStatus;
\ No newline at end of file
diff --git a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalDependency.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalDependency.java
index 08332074a3da..35494e353bdd 100644
--- a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalDependency.java
+++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalDependency.java
@@ -90,7 +90,7 @@ public interface ExternalDependency extends Serializable {
    */
   @Nullable
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.2")
+  @ApiStatus.ScheduledForRemoval
   String getSelectionReason();
 
   /**
diff --git a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ProjectImportAction.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ProjectImportAction.java
index b0dd7c492399..b1acfd529aa9 100644
--- a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ProjectImportAction.java
+++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ProjectImportAction.java
@@ -441,7 +441,7 @@ public class ProjectImportAction implements BuildAction<ProjectImportAction.AllM
      */
     @NotNull
     @Deprecated
-    @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+    @ApiStatus.ScheduledForRemoval
     public IdeaProject getIdeaProject() {
       IdeaProject ideaProject = getModel(IdeaProject.class);
       assert ideaProject != null;
diff --git a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/tooling/ErrorMessageBuilder.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/tooling/ErrorMessageBuilder.java
index bbbcdcfe0841..8065708058ec 100644
--- a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/tooling/ErrorMessageBuilder.java
+++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/tooling/ErrorMessageBuilder.java
@@ -45,7 +45,7 @@ public final class ErrorMessageBuilder {
   /**
    * @deprecated use {@link ModelBuilderContext#report} instead
    */
-  @ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
+  @ApiStatus.ScheduledForRemoval
   @Deprecated
   public String build() {
     Message message = buildMessage();
diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/deprecated/ExternalDepsResolutionResult.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/deprecated/ExternalDepsResolutionResult.java
index b76876f38ccc..09718b4a6e9d 100644
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/deprecated/ExternalDepsResolutionResult.java
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/deprecated/ExternalDepsResolutionResult.java
@@ -12,7 +12,7 @@ import java.util.Collections;
  * @deprecated use org.jetbrains.plugins.gradle.tooling.util.resolve.DependencyResolverImpl
  */
 @Deprecated
-@ApiStatus.ScheduledForRemoval(inVersion = "2021.2")
+@ApiStatus.ScheduledForRemoval
 public class ExternalDepsResolutionResult {
   public static final ExternalDepsResolutionResult
     EMPTY = new ExternalDepsResolutionResult(Collections.<ExternalDependency>emptySet(), Collections.<File>emptySet());