diff --git a/packages/desktop/src/components/lines/lineRow.tsx/index.tsx b/packages/desktop/src/components/lines/lineRow.tsx/index.tsx
index a73d2a3..908959b 100644
--- a/packages/desktop/src/components/lines/lineRow.tsx/index.tsx
+++ b/packages/desktop/src/components/lines/lineRow.tsx/index.tsx
@@ -328,7 +328,15 @@ function StreamRoom({
     }
 
     // TODO: p1 : destroy peers on load
-    return () => {};
+    // ! remove ws handlers so that the same channels don't get triggered twice when I retune into this line
+    return () => {
+      $ws.removeListener(
+        `${ServerResponseChannels.RTC_RECEIVING_ANSWER_RESPONSE_PREFIX}:${lineId}`
+      );
+      $ws.removeListener(
+        `${ServerResponseChannels.RTC_NEW_USER_JOINED_RESPONSE_PREFIX}:${lineId}`
+      );
+    };
   }, [userDetails, setUserPeers]);
 
   // calculate diff to clean our userPeerMap to unmount and detroy certain peer connections
diff --git a/packages/desktop/src/controller/lineDataProvider.tsx b/packages/desktop/src/controller/lineDataProvider.tsx
index 47726d3..31ce2f1 100644
--- a/packages/desktop/src/controller/lineDataProvider.tsx
+++ b/packages/desktop/src/controller/lineDataProvider.tsx
@@ -113,11 +113,6 @@ function useSocketHandler(linesData: MasterLineData[]) {
               newMap[res.lineId].currentUserMember?.userId.toString() ===
               res.userId
             ) {
-              console.log(
-                "updated my line member state for this line | is toggle tuned in: ",
-                res.toggledIn
-              );
-
               newMap[res.lineId].currentUserMember.lastVisitDate = new Date();
               newMap[res.lineId].currentUserMember.state = res.toggledIn
                 ? LineMemberState.TUNED
@@ -202,9 +197,6 @@ function useSocketHandler(linesData: MasterLineData[]) {
    */
   useEffect(() => {
     if (linesData?.length > 0) {
-      console.log("going to make initial connections and create lines map");
-      console.log(linesData);
-
       setLinesMap((prevMappings) => {
         // go through the lines from the persistent store
 
diff --git a/packages/desktop/src/pages/terminal/index.tsx b/packages/desktop/src/pages/terminal/index.tsx
index 92ed118..9203c02 100644
--- a/packages/desktop/src/pages/terminal/index.tsx
+++ b/packages/desktop/src/pages/terminal/index.tsx
@@ -29,8 +29,7 @@ export default function NirvanaTerminal() {
     useLineDataProvider();
 
   useEffect(() => {
-    console.log("change/update in lines map");
-
+    // console.log("change/update in lines map");
     // console.log(linesMap);
   }, [linesMap]);
 
@@ -59,7 +58,7 @@ export default function NirvanaTerminal() {
 
     // find the line from the data provider
     if (linesMap[selectedLineId]) {
-      console.log("looking for selected Line in map for details section");
+      // console.log("looking for selected Line in map for details section");
 
       const foundSelectedLine = linesMap[selectedLineId];