diff --git a/include/modules/meta.hpp b/include/modules/meta.hpp
index 4d94f1e7..c6357391 100644
--- a/include/modules/meta.hpp
+++ b/include/modules/meta.hpp
@@ -210,13 +210,16 @@ namespace modules {
     }
 
     void stop() {
-      if (!enabled())
-        return;
-      m_log.trace("%s: Stop", name());
-      enable(false);
-      wakeup();
-      if (!on_stop.empty())
-        on_stop.emit(name());
+      std::lock_guard<threading_util::spin_lock> lck(this->update_lock);
+      {
+        if (!enabled())
+          return;
+        m_log.trace("%s: Stop", name());
+        enable(false);
+        wakeup();
+        if (!on_stop.empty())
+          on_stop.emit(name());
+      }
     }
 
     void refresh() {
diff --git a/include/modules/network.hpp b/include/modules/network.hpp
index b15f363e..0d4fe0b8 100644
--- a/include/modules/network.hpp
+++ b/include/modules/network.hpp
@@ -17,14 +17,6 @@ namespace modules {
    public:
     using timer_module::timer_module;
 
-    ~network_module() {
-      std::lock_guard<threading_util::spin_lock> lck(this->update_lock);
-      {
-        m_wireless.reset();
-        m_wired.reset();
-      }
-    }
-
     void setup() {
       // Load configuration values
       REQ_CONFIG_VALUE(name(), m_interface, "interface");
diff --git a/include/modules/volume.hpp b/include/modules/volume.hpp
index 2f6bf97e..ff978310 100644
--- a/include/modules/volume.hpp
+++ b/include/modules/volume.hpp
@@ -108,19 +108,6 @@ namespace modules {
       // }}}
     }
 
-    void stop() {
-      // Deconstruct all mixers before putting the module in its stopped state {{{
-
-      std::lock_guard<threading_util::spin_lock> lck(this->update_lock);
-      m_mixers[mixer::MASTER].reset();
-      m_mixers[mixer::SPEAKER].reset();
-      m_mixers[mixer::HEADPHONE].reset();
-      m_controls[control::HEADPHONE].reset();
-      event_module::stop();
-
-      // }}}
-    }
-
     bool has_event() {
       // Poll for mixer and control events {{{