diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/__main__.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/__main__.py
index 2ac63e7..fc2778f 100644
--- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/__main__.py
+++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/__main__.py
@@ -6,10 +6,6 @@ import faulthandler
 import traceback
 from setproctitle import setproctitle
 
-import tracemalloc
-tracemalloc.start()
-
-
 # Lib imports
 import gi
 gi.require_version('Gtk', '3.0')
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/event_system.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/event_system.py
index f8f9a7c..b2d4a71 100644
--- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/event_system.py
+++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/event_system.py
@@ -18,6 +18,12 @@ class EventSystem:
     def subscribe(self, event_type, fn):
         self.subscribers[event_type].append(fn)
 
+    def unsubscribe(self, event_type, fn):
+        self.subscribers[event_type].remove(fn)
+
+    def unsubscribe_all(self, event_type):
+        self.subscribers.pop(event_type, None)
+
     def emit(self, event_type, data = None):
         if event_type in self.subscribers:
             for fn in self.subscribers[event_type]:
@@ -29,8 +35,8 @@ class EventSystem:
                 else:
                     fn()
 
-    # NOTE: Should be used when signal has only one listener and vis-a-vis
     def emit_and_await(self, event_type, data = None):
+        """ NOTE: Should be used when signal has only one listener and vis-a-vis """
         if event_type in self.subscribers:
             for fn in self.subscribers[event_type]:
                 if data: