diff --git a/protocol/sacn/source.cpp b/protocol/sacn/source.cpp
index 7b65135..99f906b 100644
--- a/protocol/sacn/source.cpp
+++ b/protocol/sacn/source.cpp
@@ -82,21 +82,8 @@ void Source::terminate(const uint16_t num)
   universes_mutext_.lock();
   auto metadata = universes_[num]->provenance();
   metadata->options.stream_terminated = true;
-  universes_[num]->setProvenance(metadata);
-  universes_mutext_.unlock();
-}
-
-
-/**
- * @brief Source::end
- * @param num
- */
-void Source::end(const uint16_t num)
-{
-  if (!universes_.count(num))
-    return;
-
-  universes_mutext_.lock();
+  universes_.at(num)->setProvenance(metadata);
+  delete universes_.at(num);
   universes_.erase(num);
   universes_mutext_.unlock();
 }
diff --git a/protocol/sacn/source.h b/protocol/sacn/source.h
index 89c8f55..d95e70f 100644
--- a/protocol/sacn/source.h
+++ b/protocol/sacn/source.h
@@ -56,7 +56,6 @@ public:
     Universe * universe(const uint16_t);
 
 protected:
-    virtual void end(const uint16_t);
     virtual void discoveryAnnounce();
 
     void sendExtendedFrame(const uint16_t vector,