diff --git a/gnuradio-runtime/include/gnuradio/flowgraph.h b/gnuradio-runtime/include/gnuradio/flowgraph.h
index b6f1ff9236..34df6082f4 100644
--- a/gnuradio-runtime/include/gnuradio/flowgraph.h
+++ b/gnuradio-runtime/include/gnuradio/flowgraph.h
@@ -212,11 +212,6 @@ class GR_RUNTIME_API flowgraph
      */
     void clear();
 
-    /*!
-     * \brief Clear existing flowgraph msg edges
-     */
-    void clear_msg();
-
     /*!
      * \brief Get vector of edges
      */
diff --git a/gnuradio-runtime/lib/flowgraph.cc b/gnuradio-runtime/lib/flowgraph.cc
index 21eb332c19..e688a7dc2b 100644
--- a/gnuradio-runtime/lib/flowgraph.cc
+++ b/gnuradio-runtime/lib/flowgraph.cc
@@ -100,13 +100,8 @@ void flowgraph::clear()
 {
     // Boost shared pointers will deallocate as needed
     d_blocks.clear();
-    d_edges.clear();
-}
-
-void flowgraph::clear_msg()
-{
-    // Boost shared pointers will deallocate as needed
     d_msg_edges.clear();
+    d_edges.clear();
 }
 
 void flowgraph::check_valid_port(gr::io_signature::sptr sig, int port)
diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc
index 615f92e6e8..427eccbf01 100644
--- a/gnuradio-runtime/lib/hier_block2_detail.cc
+++ b/gnuradio-runtime/lib/hier_block2_detail.cc
@@ -502,7 +502,7 @@ void hier_block2_detail::recursive_disconnect_all(hier_block2* caller)
         d_debug_logger->debug("Disconnect hier_block2 recursive...");
         for (auto& path : d_fg->partition()) {
             for (auto block_pointer : path) {
-                auto hier_ptr = std::dynamic_pointer_cast<hier_block2>((*block_pointer));
+                auto hier_ptr = std::dynamic_pointer_cast<hier_block2>((block_pointer));
                 if(hier_ptr) hier_ptr->disconnect_all();
             }
         }
@@ -516,7 +516,6 @@ void hier_block2_detail::disconnect_all()
     recursive_disconnect_all(this->d_owner);
     reset_hier_blocks_parent();
     d_fg->clear();
-    d_fg->clear_msg();
     d_blocks.clear();
 
     int max_inputs = d_owner->input_signature()->max_streams();