diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java
index 2e1667cfa28..7aa80418987 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java
@@ -25,17 +25,17 @@ import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.descriptors.*;
-import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor;
-import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
 import org.jetbrains.kotlin.resolve.scopes.JetScope;
-import org.jetbrains.kotlin.resolve.scopes.WritableScope;
 import org.jetbrains.kotlin.storage.ExceptionTracker;
 import org.jetbrains.kotlin.storage.StorageManager;
 
 import java.io.PrintStream;
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
 
 public class TopDownAnalysisContext implements BodiesResolveContext {
 
@@ -43,9 +43,7 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
 
     private final Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> classes = Maps.newLinkedHashMap();
     private final Map<JetClassInitializer, ClassDescriptorWithResolutionScopes> anonymousInitializers = Maps.newLinkedHashMap();
-    protected final Map<JetFile, MutablePackageFragmentDescriptor> packageFragments = Maps.newHashMap();
-    protected final Set<JetFile> files = new LinkedHashSet<JetFile>();
-    private List<MutableClassDescriptor> classesTopologicalOrder = null;
+    private final Set<JetFile> files = new LinkedHashSet<JetFile>();
 
     private final Map<JetDeclaration, JetScope> declaringScopes = Maps.newHashMap();
     private final Map<JetNamedFunction, SimpleFunctionDescriptor> functions = Maps.newLinkedHashMap();
@@ -53,13 +51,6 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
     private final Map<JetParameter, PropertyDescriptor> primaryConstructorParameterProperties = Maps.newHashMap();
     private Map<JetCallableDeclaration, CallableMemberDescriptor> members = null;
 
-    // File scopes - package scope extended with imports
-    protected final Map<JetFile, WritableScope> fileScopes = Maps.newHashMap();
-
-    public final Map<JetDeclarationContainer, DeclarationDescriptor> forDeferredResolver = Maps.newHashMap();
-
-    public final Map<JetDeclarationContainer, JetScope> normalScope = Maps.newHashMap();
-
     private final Map<JetScript, ScriptDescriptor> scripts = Maps.newLinkedHashMap();
 
     private final TopDownAnalysisParameters topDownAnalysisParameters;
@@ -116,14 +107,6 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
         return anonymousInitializers;
     }
 
-    public Map<JetFile, WritableScope> getFileScopes() {
-        return fileScopes;
-    }
-
-    public Map<JetFile, MutablePackageFragmentDescriptor> getPackageFragments() {
-        return packageFragments;
-    }
-
     @NotNull
     @Override
     public StorageManager getStorageManager() {
@@ -185,15 +168,6 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
         return members;
     }
 
-    @NotNull
-    public List<MutableClassDescriptor> getClassesTopologicalOrder() {
-        return classesTopologicalOrder;
-    }
-
-    public void setClassesTopologicalOrder(@NotNull List<MutableClassDescriptor> classesTopologicalOrder) {
-        this.classesTopologicalOrder = classesTopologicalOrder;
-    }
-
     @Override
     @NotNull
     public DataFlowInfo getOuterDataFlowInfo() {