1 files changed, 0 insertions, 4 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index e7027bfc90..8b6cb5e049 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -334,10 +334,6 @@ void Broker::shutdown() {
 Broker::~Broker() {
     shutdown();
     queueEvents.shutdown();
-    //TODO: timer clients should really remove any registered tasks
-    //before the are destroyed; until that is the case, this prevents
-    //their failure to do from crashing the broker
-    timer.stop();
     finalize();                 // Finalize any plugins.
     if (config.auth)
         SaslAuthenticator::fini();