diff --git a/apps/rtmp/RtmpServer.cpp b/apps/rtmp/RtmpServer.cpp
index ec8417c7..66a18832 100644
--- a/apps/rtmp/RtmpServer.cpp
+++ b/apps/rtmp/RtmpServer.cpp
@@ -165,8 +165,3 @@ void _RtmpServer::on_stop()
 {
   ERROR("not yet supported!\n");
 }
-
-void _RtmpServer::dispose()
-{
-  ERROR("not yet supported!\n");
-}
diff --git a/core/AmRtpReceiver.cpp b/core/AmRtpReceiver.cpp
index ddb27157..0abab3de 100644
--- a/core/AmRtpReceiver.cpp
+++ b/core/AmRtpReceiver.cpp
@@ -46,6 +46,10 @@ _AmRtpReceiver::_AmRtpReceiver()
 
 _AmRtpReceiver::~_AmRtpReceiver()
 {
+  for(unsigned int i=0; i<n_receivers; i++){
+    receivers[i].stop();
+    receivers[i].join();
+  }
   delete [] receivers;
 }
 
@@ -67,14 +71,6 @@ void AmRtpReceiverThread::on_stop()
   event_base_loopbreak(ev_base);
 }
 
-void _AmRtpReceiver::dispose() 
-{
-  for(unsigned int i=0; i<n_receivers; i++){
-    receivers[i].stop();
-    receivers[i].join();
-  }
-}
-
 void AmRtpReceiverThread::run()
 {
   // fake event to prevent the event loop from exiting
diff --git a/core/AmRtpReceiver.h b/core/AmRtpReceiver.h
index 5b203e73..980ee157 100644
--- a/core/AmRtpReceiver.h
+++ b/core/AmRtpReceiver.h
@@ -95,8 +95,6 @@ protected:
   _AmRtpReceiver();
   ~_AmRtpReceiver();
 
-  void dispose();
-
 public:
   void start();
 
diff --git a/core/singleton.h b/core/singleton.h
index e46d13bc..d2735ebe 100644
--- a/core/singleton.h
+++ b/core/singleton.h
@@ -35,7 +35,6 @@ public:
   {
     _inst_m.lock();
     if(_instance != NULL){
-      _instance->T::dispose();
       delete _instance;
       _instance = NULL;
     }