diff --git a/include/libtorrent/torrent.hpp b/include/libtorrent/torrent.hpp
index e6acbbef6..8943b0db9 100755
--- a/include/libtorrent/torrent.hpp
+++ b/include/libtorrent/torrent.hpp
@@ -730,16 +730,6 @@ namespace libtorrent
 		// total_done - m_initial_done <= total_payload_download
 		size_type m_initial_done;
 #endif
-
-#ifdef TORRENT_LOGGING
-		boost::shared_ptr<logger> m_log;
-		boost::shared_ptr<logger> m_peer_log;
-		int m_second_count;
-		
-		enum { debug_bw_history_size = 10 };
-		int m_ul_history[debug_bw_history_size];
-		int m_dl_history[debug_bw_history_size];
-#endif
 	};
 
 	inline ptime torrent::next_announce() const
diff --git a/src/torrent.cpp b/src/torrent.cpp
index b3df478fd..6678a756e 100755
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -143,33 +143,6 @@ namespace
 
 		peer_id const& pid;
 	};
-	
-#ifdef TORRENT_LOGGING
-	void print_legend(boost::shared_ptr<logger> l)
-	{
-		(*l) << "1. time, seconds\n"
-			<< "2. hard send quota, bytes\n"
-			<< "3. soft send quota, bytes\n"
-			<< "4. excess bytes sent\n"
-			<< "5. excess bytes sent last time slice\n"
-			<< "6. hard receive quota, bytes\n"
-			<< "7. soft receive quota, bytes\n"
-			<< "8. excess bytes received\n"
-			<< "9. excess bytes received last time slice\n"
-			<< "10. num peers\n"
-			<< "11. max ul quota limit\n"
-			<< "12. max dl quota limit\n"
-			<< "13. bytes sent\n"
-			<< "14. bytes sent 10 seconds mean\n"
-			<< "15. bytes received\n"
-			<< "16. bytes received 10 seconds mean\n"
-			<< "17. total payload download\n"
-			<< "18. total web seed payload download\n"
-			<< "19. total redundant bytes downloaded\n"
-			<< "\n";
-	}
-#endif
-
 }
 
 namespace libtorrent
@@ -228,20 +201,7 @@ namespace libtorrent
 #ifndef NDEBUG
 		m_initial_done = 0;
 #endif
-#ifdef TORRENT_LOGGING
-		m_log = ses.create_log("torrent_"
-			+ boost::lexical_cast<std::string>(tf.info_hash())
-			, m_ses.listen_port(), false);
-		print_legend(m_log);
-		m_second_count = 0;
-		std::fill_n(m_ul_history, 10, 0);
-		std::fill_n(m_dl_history, 10, 0);
 
-		m_peer_log = ses.create_log("torrent_peers_"
-			+ boost::lexical_cast<std::string>(tf.info_hash())
-			, m_ses.listen_port(), false);
-
-#endif
 		INVARIANT_CHECK;
 
 		m_uploads_quota.min = 2;
@@ -312,16 +272,6 @@ namespace libtorrent
 		m_initial_done = 0;
 #endif
 
-#ifdef TORRENT_LOGGING
-		m_log = ses.create_log("torrent_"
-			+ boost::lexical_cast<std::string>(info_hash)
-			, m_ses.listen_port(), true);
-		print_legend(m_log);
-		m_second_count = 0;
-		std::fill_n(m_ul_history, 10, 0);
-		std::fill_n(m_dl_history, 10, 0);
-#endif
-
 		INVARIANT_CHECK;
 
 		if (name) m_name.reset(new std::string(name));