diff --git a/zipline/gens/merge.py b/zipline/gens/merge.py
deleted file mode 100644
index 570341da..00000000
--- a/zipline/gens/merge.py
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# Copyright 2012 Quantopian, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""
-Generator version of Merge.
-"""
-
-from collections import deque
-
-from zipline import ndict
-
-
-def merge(stream_in, tnfm_ids):
-    """
-    A generator that takes a generator and a list of transform ids. We
-    maintain an internal queue for each id in tnfm_ids. Once we
-    have a message from every queue, we pop an event from each queue
-    and merge them together into an event.  We raise an error if we
-    do not receive the same number of events from all sources.
-    """
-
-    assert isinstance(tnfm_ids, list)
-
-    # Set up an internal queue for each expected source.
-    tnfms = {}
-    for id in tnfm_ids:
-        assert isinstance(id, basestring), "Bad source_id %s" % id
-        tnfms[id] = deque()
-
-    # Process incoming streams.
-    for message in stream_in:
-        assert isinstance(message, ndict)
-        assert 'tnmf_id' in message
-        assert 'tnfm_value' in message
-        assert 'dt' in message
-
-        id = message.tnfm_id
-        assert id in tnfm_ids, \
-            "Message from unexpected tnfm: %s, %s" % (id, tnfm_ids)
-
-        tnfms[id].append(message)
-
-        # Only pop messages when we have a pending message from
-        # all datasources. Stop if all sources have signalled done.
-
-        while ready(tnfms) and not done(tnfms):
-            message = merge_one(tnfms)
-            yield message
-
-    # We should have only a done message left in each queue.
-    for queue in tnfms.itervalues():
-        assert len(queue) == 1, "Bad queue in merge on exit: %s" % queue
-        assert queue[0].dt == "DONE", \
-            "Bad last message in merge on exit: %s" % queue
-
-
-def merge_one(sources):
-
-    event_fields = ndict()
-    for key, queue in sources.iteritems():
-
-        # Add transform value to the transforms dict.
-        message = queue.popleft()
-        event_fields[message.tnfm_id] = message.tnfm_value
-        del message['tnfm_id']
-        del message['tnfm_value']
-
-        # Merge any remaining fields into the event dict.
-        event_fields.merge(message)
-
-    # alias dt with datetime, per algoscript api
-    event_fields['datetime'] = event_fields['dt']
-
-    return event_fields
-
-
-#TODO: This is replicated in sort.  Probably should be one source file.
-def ready(sources):
-    """
-    Feed is ready when every internal queue has at least one message. Note that
-    this include DONE messages, so done(sources) is True,
-    only if ready(sources).
-    """
-    assert isinstance(sources, dict)
-    return all((queue_is_ready(source) for source in sources.itervalues()))
-
-
-def queue_is_ready(queue):
-    assert isinstance(queue, deque)
-    return len(queue) > 0
-
-
-def done(sources):
-    """Feed is done when all internal queues have only a "DONE" message."""
-    assert isinstance(sources, dict)
-    return all((queue_is_done(source) for source in sources.itervalues()))
-
-
-def queue_is_done(queue):
-    assert isinstance(queue, deque)
-    if len(queue) == 0:
-        return False
-    if queue[0].dt == "DONE":
-        assert len(queue) == 1, "Message after DONE in date_sort: %s" % queue
-        return True
-    else:
-        return False