diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java
index beadf374114..1ae5760d4a5 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java
@@ -93,9 +93,7 @@ public class GenerationState {
 
         this.typeMapper = new JetTypeMapper(bindingTrace, builtinToJavaTypesMapping == BuiltinToJavaTypesMapping.ENABLED, classBuilderMode);
 
-        InjectorForJvmCodegen injector = new InjectorForJvmCodegen(
-                typeMapper, this.files,
-                builtinToJavaTypesMapping, this, builderFactory, project);
+        InjectorForJvmCodegen injector = new InjectorForJvmCodegen(typeMapper, this, builderFactory, project);
 
         this.scriptCodegen = injector.getScriptCodegen();
         this.intrinsics = injector.getIntrinsics();
diff --git a/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java b/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java
index a7ecfb50ba6..d005142f006 100644
--- a/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java
@@ -17,9 +17,6 @@
 package org.jetbrains.jet.di;
 
 import org.jetbrains.jet.codegen.state.JetTypeMapper;
-import java.util.List;
-import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.codegen.BuiltinToJavaTypesMapping;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.codegen.ClassBuilderFactory;
 import com.intellij.openapi.project.Project;
@@ -36,8 +33,6 @@ import javax.annotation.PreDestroy;
 public class InjectorForJvmCodegen {
     
     private final JetTypeMapper jetTypeMapper;
-    private final List<JetFile> listOfJetFile;
-    private final BuiltinToJavaTypesMapping builtinToJavaTypesMapping;
     private final GenerationState generationState;
     private final ClassBuilderFactory classBuilderFactory;
     private final Project project;
@@ -50,15 +45,11 @@ public class InjectorForJvmCodegen {
     
     public InjectorForJvmCodegen(
         @NotNull JetTypeMapper jetTypeMapper,
-        @NotNull List<JetFile> listOfJetFile,
-        @NotNull BuiltinToJavaTypesMapping builtinToJavaTypesMapping,
         @NotNull GenerationState generationState,
         @NotNull ClassBuilderFactory classBuilderFactory,
         @NotNull Project project
     ) {
         this.jetTypeMapper = jetTypeMapper;
-        this.listOfJetFile = listOfJetFile;
-        this.builtinToJavaTypesMapping = builtinToJavaTypesMapping;
         this.generationState = generationState;
         this.classBuilderFactory = classBuilderFactory;
         this.project = project;
diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java
index 969ec3495f3..52e43b2248f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java
+++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java
@@ -18,7 +18,6 @@ package org.jetbrains.jet.di;
 
 import com.intellij.openapi.project.Project;
 import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
-import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.ModuleConfiguration;
 import org.jetbrains.jet.lang.resolve.DescriptorResolver;
 import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
@@ -39,7 +38,6 @@ public class InjectorForLazyResolve {
     
     private final Project project;
     private final ResolveSession resolveSession;
-    private final BindingTrace bindingTrace;
     private final ModuleConfiguration moduleConfiguration;
     private DescriptorResolver descriptorResolver;
     private ExpressionTypingServices expressionTypingServices;
@@ -56,12 +54,10 @@ public class InjectorForLazyResolve {
     public InjectorForLazyResolve(
         @NotNull Project project,
         @NotNull ResolveSession resolveSession,
-        @NotNull BindingTrace bindingTrace,
         @NotNull ModuleConfiguration moduleConfiguration
     ) {
         this.project = project;
         this.resolveSession = resolveSession;
-        this.bindingTrace = bindingTrace;
         this.moduleConfiguration = moduleConfiguration;
         this.descriptorResolver = new DescriptorResolver();
         this.expressionTypingServices = new ExpressionTypingServices();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
index 502f1ffa21e..d03f9442648 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
@@ -114,7 +114,7 @@ public class ResolveSession implements KotlinCodeAnalyzer {
         this.classifierAliases = classifierAliases;
         this.specialClasses = specialClasses;
         this.trace = storageManager.createSafeTrace(delegationTrace);
-        this.injector = new InjectorForLazyResolve(project, this, trace, moduleConfiguration);
+        this.injector = new InjectorForLazyResolve(project, this, moduleConfiguration);
         this.module = rootDescriptor;
         this.moduleConfiguration = moduleConfiguration;
         PackageMemberDeclarationProvider provider = declarationProviderFactory.getPackageMemberDeclarationProvider(FqName.ROOT);
diff --git a/generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java b/generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java
index 7965427c561..134d05a578b 100644
--- a/generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java
+++ b/generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java
@@ -21,10 +21,12 @@ import org.jetbrains.jet.codegen.*;
 import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethods;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.codegen.state.JetTypeMapper;
-import org.jetbrains.jet.di.*;
+import org.jetbrains.jet.di.DependencyInjectorGenerator;
+import org.jetbrains.jet.di.GivenExpression;
+import org.jetbrains.jet.di.InjectorForTopDownAnalyzer;
+import org.jetbrains.jet.di.InstantiateType;
 import org.jetbrains.jet.lang.ModuleConfiguration;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
-import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetImportsFactory;
 import org.jetbrains.jet.lang.resolve.*;
 import org.jetbrains.jet.lang.resolve.calls.CallResolver;
@@ -64,7 +66,6 @@ public class GenerateInjectors {
         DependencyInjectorGenerator generator = new DependencyInjectorGenerator();
         generator.addParameter(Project.class);
         generator.addParameter(ResolveSession.class);
-        generator.addParameter(BindingTrace.class);
         generator.addParameter(ModuleConfiguration.class);
         generator.addPublicField(DescriptorResolver.class);
         generator.addPublicField(ExpressionTypingServices.class);
@@ -196,8 +197,6 @@ public class GenerateInjectors {
 
         // Parameters
         generator.addPublicParameter(JetTypeMapper.class);
-        generator.addParameter(DiType.listOf(JetFile.class));
-        generator.addParameter(BuiltinToJavaTypesMapping.class);
         generator.addPublicParameter(GenerationState.class);
         generator.addParameter(ClassBuilderFactory.class);
         generator.addPublicParameter(Project.class);