diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java
index e5c82f7b597..badf03bbced 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java
@@ -34,6 +34,7 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
 import org.jetbrains.kotlin.resolve.calls.util.CallMaker;
 import org.jetbrains.kotlin.resolve.scopes.JetScope;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver;
+import org.jetbrains.kotlin.resolve.validation.SymbolUsageValidator;
 import org.jetbrains.kotlin.types.DeferredType;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.TypeUtils;
@@ -60,15 +61,15 @@ public class DelegatedPropertyResolver {
     @NotNull private final ExpressionTypingServices expressionTypingServices;
     @NotNull private final CallResolver callResolver;
     @NotNull private final KotlinBuiltIns builtIns;
-    @NotNull private final AdditionalCheckerProvider additionalCheckerProvider;
+    @NotNull private final SymbolUsageValidator symbolUsageValidator;
 
     public DelegatedPropertyResolver(
-            @NotNull AdditionalCheckerProvider additionalCheckerProvider,
+            @NotNull SymbolUsageValidator symbolUsageValidator,
             @NotNull KotlinBuiltIns builtIns,
             @NotNull CallResolver callResolver,
             @NotNull ExpressionTypingServices expressionTypingServices
     ) {
-        this.additionalCheckerProvider = additionalCheckerProvider;
+        this.symbolUsageValidator = symbolUsageValidator;
         this.builtIns = builtIns;
         this.callResolver = callResolver;
         this.expressionTypingServices = expressionTypingServices;
@@ -213,7 +214,7 @@ public class DelegatedPropertyResolver {
             JetPropertyDelegate delegate = property.getDelegate();
             if (delegate != null) {
                 PsiElement byKeyword = delegate.getByKeywordNode().getPsi();
-                additionalCheckerProvider.getSymbolUsageValidator().validateCall(resultingCall.getResultingDescriptor(), trace, byKeyword);
+                symbolUsageValidator.validateCall(resultingCall.getResultingDescriptor(), trace, byKeyword);
             }
         }
         trace.record(DELEGATED_PROPERTY_RESOLVED_CALL, accessor, resultingCall);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptBodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptBodyResolver.java
index 1f20050fd3c..7919ee58535 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptBodyResolver.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptBodyResolver.java
@@ -36,13 +36,10 @@ import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE;
 public class ScriptBodyResolver {
 
     @NotNull private final ExpressionTypingServices expressionTypingServices;
-    @NotNull private final AdditionalCheckerProvider additionalCheckerProvider;
 
     public ScriptBodyResolver(
-            @NotNull AdditionalCheckerProvider additionalCheckerProvider,
             @NotNull ExpressionTypingServices expressionTypingServices
     ) {
-        this.additionalCheckerProvider = additionalCheckerProvider;
         this.expressionTypingServices = expressionTypingServices;
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java
index d19db25ce5f..b46266dc0f3 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java
@@ -39,7 +39,6 @@ public class ExpressionTypingComponents {
     /*package*/ ControlStructureTypingUtils controlStructureTypingUtils;
     /*package*/ ForLoopConventionsChecker forLoopConventionsChecker;
     /*package*/ ReflectionTypes reflectionTypes;
-    /*package*/ AdditionalCheckerProvider additionalCheckerProvider;
     /*package*/ SymbolUsageValidator symbolUsageValidator;
     /*package*/ DynamicTypesSettings dynamicTypesSettings;
     /*package*/ KotlinBuiltIns builtIns;
@@ -91,11 +90,6 @@ public class ExpressionTypingComponents {
         this.reflectionTypes = reflectionTypes;
     }
 
-    @Inject
-    public void setAdditionalCheckerProvider(AdditionalCheckerProvider additionalCheckerProvider) {
-        this.additionalCheckerProvider = additionalCheckerProvider;
-    }
-
     @Inject
     public void setSymbolUsageValidator(SymbolUsageValidator symbolUsageValidator) {
         this.symbolUsageValidator = symbolUsageValidator;
@@ -156,11 +150,6 @@ public class ExpressionTypingComponents {
         return forLoopConventionsChecker;
     }
 
-    @NotNull
-    public AdditionalCheckerProvider getAdditionalCheckerProvider() {
-        return additionalCheckerProvider;
-    }
-
     @Inject
     public void setConstantExpressionEvaluator(@NotNull ConstantExpressionEvaluator constantExpressionEvaluator) {
         this.constantExpressionEvaluator = constantExpressionEvaluator;
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ValueParameterResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ValueParameterResolver.kt
index 54b28311ddb..20553b7e5db 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ValueParameterResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ValueParameterResolver.kt
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.types.expressions
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
 import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.psi.JetParameter
-import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider
 import org.jetbrains.kotlin.resolve.BindingTrace
 import org.jetbrains.kotlin.resolve.DescriptorResolver
 import org.jetbrains.kotlin.resolve.DescriptorUtils
@@ -30,7 +29,6 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope
 import org.jetbrains.kotlin.types.TypeUtils
 
 public class ValueParameterResolver(
-        private val additionalCheckerProvider: AdditionalCheckerProvider,
         private val expressionTypingServices: ExpressionTypingServices,
         private val constantExpressionEvaluator: ConstantExpressionEvaluator
 ) {
diff --git a/compiler/tests/org/jetbrains/kotlin/tests/di/injection.kt b/compiler/tests/org/jetbrains/kotlin/tests/di/injection.kt
index b1e1da7070b..b935237966a 100644
--- a/compiler/tests/org/jetbrains/kotlin/tests/di/injection.kt
+++ b/compiler/tests/org/jetbrains/kotlin/tests/di/injection.kt
@@ -45,5 +45,4 @@ class ContainerForTests(container: StorageComponentContainer) {
     val typeResolver: TypeResolver by container
     val fakeCallResolver: FakeCallResolver by container
     val expressionTypingServices: ExpressionTypingServices by container
-    val additionalCheckerProvider: AdditionalCheckerProvider by container
 }
\ No newline at end of file