diff --git a/zipline/algorithm.py b/zipline/algorithm.py
index fca53d4e..8780763e 100644
--- a/zipline/algorithm.py
+++ b/zipline/algorithm.py
@@ -68,6 +68,8 @@ class TradingAlgorithm(object):
         self.transforms = []
         self.sources = []
 
+        self.logger = None
+
         # default components for transact
         self.slippage = VolumeShareSlippage()
         self.commission = PerShare()
diff --git a/zipline/gens/tradesimulation.py b/zipline/gens/tradesimulation.py
index 6160c2dc..8a702fbf 100644
--- a/zipline/gens/tradesimulation.py
+++ b/zipline/gens/tradesimulation.py
@@ -137,8 +137,6 @@ class AlgorithmSimulator(object):
         # Monkey patch the user algorithm to place orders in the
         # TransactionSimulator's order book and use our logger.
         self.algo.set_order(self.order)
-        self.algolog = Logger("AlgoLog")
-        self.algo.set_logger(self.algolog)
 
         # ==============
         # Snapshot Setup
diff --git a/zipline/test_algorithms.py b/zipline/test_algorithms.py
index 7255df9c..f855a2c5 100644
--- a/zipline/test_algorithms.py
+++ b/zipline/test_algorithms.py
@@ -115,12 +115,6 @@ class HeavyBuyAlgorithm(TradingAlgorithm):
         self.order(self.sid, self.amount)
         self.incr += 1
 
-    def get_sid_filter(self):
-        return [self.sid]
-
-    def set_transact_setter(self, txn_sim_callable):
-        pass
-
 
 class NoopAlgorithm(TradingAlgorithm):
     """
@@ -190,34 +184,6 @@ class DivByZeroAlgorithm(TradingAlgorithm):
         pass
 
 
-class InitializeTimeoutAlgorithm(TradingAlgorithm):
-
-    def initialize(self, sid):
-        self.sid = sid
-        self.incr = 0
-        import time
-        from zipline.gens.tradesimulation import INIT_TIMEOUT
-        time.sleep(INIT_TIMEOUT + 1000)
-
-    def set_order(self, order_callable):
-        pass
-
-    def set_logger(self, logger):
-        pass
-
-    def set_portfolio(self, portfolio):
-        pass
-
-    def handle_data(self, data):
-        pass
-
-    def get_sid_filter(self):
-        return [self.sid]
-
-    def set_transact_setter(self, txn_sim_callable):
-        pass
-
-
 class TooMuchProcessingAlgorithm(TradingAlgorithm):
 
     def initialize(self, sid):
@@ -242,31 +208,6 @@ class TimeoutAlgorithm(TradingAlgorithm):
             time.sleep(100)
         pass
 
-
-class TestPrintAlgorithm(TradingAlgorithm):
-
-    def initialize(self, sid):
-        self.sid = sid
-        print "Initializing..."
-
-    def handle_data(self, data):
-        print "Handling Data..."
-        pass
-
-
-class TestLoggingAlgorithm(TradingAlgorithm):
-
-    def initialize(self, sid):
-        self.log = None
-        self.sid = sid
-
-    def set_portfolio(self, portfolio):
-        pass
-
-    def handle_data(self, data):
-        self.log.info("Handling Data...")
-
-
 from datetime import timedelta
 from zipline.algorithm import TradingAlgorithm
 from zipline.gens.transform import BatchTransform, batch_transform