diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
index ad6b25648f2..0dc498e70f4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
@@ -91,11 +91,8 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
     @Nullable
     private ClassDescriptor resolveClassOrObjectDescriptor(@NotNull Name name, boolean object) {
         Collection<JetClassOrObject> classOrObjectDeclarations = declarationProvider.getClassOrObjectDeclarations(name);
-        if (classOrObjectDeclarations.isEmpty()) return null;
 
         for (JetClassOrObject classOrObjectDeclaration : classOrObjectDeclarations) {
-
-            // TODO: when enum entries with constructors are dropped, replace with declaresObjectOrEnumConstant()
             if (object != declaresObjectOrEnumConstant(classOrObjectDeclaration)) continue;
 
             ClassDescriptor classDescriptor = new LazyClassDescriptor(resolveSession, thisDescriptor, name,
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LockBasedStorageManager.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LockBasedStorageManager.java
index f6ea17e2c4b..d1242e37f59 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LockBasedStorageManager.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LockBasedStorageManager.java
@@ -43,12 +43,6 @@ public class LockBasedStorageManager implements StorageManager {
         }
     };
 
-    @NotNull
-    @Override
-    public <K, V> ConcurrentMap<K, V> createConcurrentMap() {
-        return new ConcurrentHashMap<K, V>();
-    }
-
     @NotNull
     @Override
     public <K, V> Function<K, V> createMemoizedFunction(@NotNull final Function<K, V> compute, @NotNull final MemoizationMode mode) {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/StorageManager.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/StorageManager.java
index ec8e6f3ab49..ff633ac1994 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/StorageManager.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/StorageManager.java
@@ -22,12 +22,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 
 import java.util.Collection;
-import java.util.concurrent.ConcurrentMap;
 
 public interface StorageManager {
-    @NotNull
-    <K, V> ConcurrentMap<K, V> createConcurrentMap();
-
     /**
      * Given a function compute: K -> V create a memoized version of it that computes a value only once for each key
      * @param compute the function to be memoized