diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index eda43d2b60..c5587c2608 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -2035,9 +2035,6 @@ peer_delete (struct peer *peer)
       peer->domainname = NULL;
     }
   
-  if (CHECK_FLAG(bgp->flags, BGP_FLAG_DELETING))
-    bgp_peer_clear_node_queue_drain_immediate(peer);
-
   peer_unlock (peer); /* initial reference */
 
   return 0;
@@ -3100,15 +3097,6 @@ bgp_delete (struct bgp *bgp)
 
   /* TODO - Other memory may need to be freed - e.g., NHT */
 
-  /*
-   * Free pending deleted routes. Unfortunately, it also has to process
-   * all the pending activity for other instances of struct bgp.
-   *
-   * This call was added to achieve clean memory allocation at exit,
-   * for the sake of valgrind.
-   */
-  bgp_process_queues_drain_immediate();
-
   /* Remove visibility via the master list - there may however still be
    * routes to be processed still referencing the struct bgp.
    */