1 files changed, 1 insertions, 15 deletions
diff --git a/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java b/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java
index 246a433..dbd6e4f 100644
--- a/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java
+++ b/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java
@@ -41,7 +41,6 @@ import com.amazon.carbonado.Trigger;
 import com.amazon.carbonado.capability.IndexInfo;
 import com.amazon.carbonado.capability.IndexInfoCapability;
 
-import com.amazon.carbonado.cursor.ArraySortBuffer;
 import com.amazon.carbonado.cursor.MergeSortBuffer;
 
 import com.amazon.carbonado.filter.Filter;
@@ -81,8 +80,6 @@ class IndexedStorage<S extends Storable> implements Storage<S>, StorageAccess<S>
 
     private final QueryEngine<S> mQueryEngine;
 
-    private Storage<S> mRootStorage;
-
     @SuppressWarnings("unchecked")
     IndexedStorage(IndexedRepository repository, Storage<S> masterStorage)
         throws RepositoryException
@@ -404,18 +401,7 @@ class IndexedStorage<S extends Storable> implements Storage<S>, StorageAccess<S>
     }
 
     public SortBuffer<S> createSortBuffer() {
-        // FIXME: This is messy. If Storables had built-in serialization
-        // support, then MergeSortBuffer would not need a root storage.
-        if (mRootStorage == null) {
-            try {
-                mRootStorage = mRepository.getRootRepository().storageFor(getStorableType());
-            } catch (RepositoryException e) {
-                LogFactory.getLog(IndexedStorage.class).warn(null, e);
-                return new ArraySortBuffer<S>();
-            }
-        }
-
-        return new MergeSortBuffer<S>(mRootStorage);
+        return new MergeSortBuffer<S>();
     }
 
     public long countAll() throws FetchException {