diff --git a/platform/core-impl/src/com/intellij/ide/plugins/ClassLoaderConfigurator.kt b/platform/core-impl/src/com/intellij/ide/plugins/ClassLoaderConfigurator.kt
index 66e938ab4a37..fd550216e6f4 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/ClassLoaderConfigurator.kt
+++ b/platform/core-impl/src/com/intellij/ide/plugins/ClassLoaderConfigurator.kt
@@ -267,30 +267,12 @@ class ClassLoaderConfigurator(
     val resolveScopeManager: ResolveScopeManager?
     // main plugin descriptor
     if (module.moduleName == null) {
-      resolveScopeManager = when (module.pluginId.idString) {
-        "com.intellij.diagram" -> {
-          // multiple packages - intellij.diagram and intellij.diagram.impl modules
-          createScopeWithExtraPackage("com.intellij.diagram.")
-        }
-        "com.intellij.properties" -> {
-          // todo ability to customize (cannot move due to backward compatibility)
-          object : ResolveScopeManager {
-            override fun isDefinitelyAlienClass(name: String, packagePrefix: String, force: Boolean): String? {
-              if (force) {
-                return null
-              }
-              else if (!name.startsWith(packagePrefix) &&
-                       !name.startsWith("com.intellij.ultimate.PluginVerifier") &&
-                       name != "com.intellij.codeInspection.unused.ImplicitPropertyUsageProvider") {
-                return ""
-              }
-              else {
-                return null
-              }
-            }
-          }
-        }
-        else -> createPluginDependencyAndContentBasedScope(descriptor = module, pluginSet = pluginSet)
+      resolveScopeManager = if (module.pluginId.idString == "com.intellij.diagram") {
+        // multiple packages - intellij.diagram and intellij.diagram.impl modules
+        createScopeWithExtraPackage("com.intellij.diagram.")
+      }
+      else {
+        createPluginDependencyAndContentBasedScope(descriptor = module, pluginSet = pluginSet)
       }
     }
     else {
diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unused/ImplicitPropertyUsageProvider.java b/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unused/ImplicitPropertyUsageProvider.java
deleted file mode 100644
index ec93dc763eb0..000000000000
--- a/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unused/ImplicitPropertyUsageProvider.java
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.codeInspection.unused;
-
-import com.intellij.lang.properties.psi.Property;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @deprecated Use {@link com.intellij.lang.properties.codeInspection.unused.ImplicitPropertyUsageProvider}
- */
-@Deprecated(forRemoval = true)
-public abstract class ImplicitPropertyUsageProvider implements com.intellij.lang.properties.codeInspection.unused.ImplicitPropertyUsageProvider {
-  @Override
-  public abstract boolean isUsed(@NotNull Property property);
-}