diff --git a/src/server/handlers.go b/src/server/handlers.go
index 47e6ece..3bd1c3f 100644
--- a/src/server/handlers.go
+++ b/src/server/handlers.go
@@ -11,11 +11,11 @@ func (g *Gossiper) handleStatusPacket(msg common.StatusPacket, relay *net.UDPAdd
 	relayStr := getRelayStr(relay)
 	log.Println("Got status packet from", relayStr)
 
-	g.channelsLock.RLock()
+	/*g.channelsLock.RLock()
 	if ch, ok := g.channels[relayStr]; ok {
 		ch <- true
 	}
-	g.channelsLock.RUnlock()
+	g.channelsLock.RUnlock()*/
 
 	remoteWant := parseWant(msg)
 	g.wantLock.RLock()
diff --git a/src/server/senders.go b/src/server/senders.go
index 28be582..b2c3d6d 100644
--- a/src/server/senders.go
+++ b/src/server/senders.go
@@ -5,7 +5,6 @@ import (
 	"log"
 	"github.com/dedis/protobuf"
 	"github.com/pauarge/decWebRTC/src/common"
-	"time"
 )
 
 func (g *Gossiper) sendStatusPacket(relay *net.UDPAddr) {
@@ -51,24 +50,24 @@ func (g *Gossiper) rumorMongering(address string, msg common.RumorMessage) {
 	if err != nil {
 		log.Println(err)
 	} else {
-		g.channelsLock.RLock()
+		/*g.channelsLock.RLock()
 		ch := g.channels[address]
-		g.channelsLock.RUnlock()
+		g.channelsLock.RUnlock()*/
 
 		addr, err := net.ResolveUDPAddr("udp4", address)
 		_, err = g.gossipConn.WriteToUDP(packetBytes, addr)
 		if err != nil {
 			log.Println(err)
 			g.deletePeer(address)
-			ch <- true
+			//ch <- true
 		}
-		select {
+		/*select {
 		case _ = <-ch:
 			log.Println("Unlocked channel")
 		case <-time.After(time.Second * common.TimeOutSecs):
 			log.Println("Timeout on mongering")
 			g.deletePeer(address)
-		}
+		}*/
 	}
 	log.Println("Finished mongering to", address)
 }
diff --git a/src/server/utils.go b/src/server/utils.go
index 077d9f6..f4e0c0d 100644
--- a/src/server/utils.go
+++ b/src/server/utils.go
@@ -66,9 +66,9 @@ func (g *Gossiper) addPeer(addr string) {
 			g.peersLock.Lock()
 			g.peers[addr] = true
 			g.peersLock.Unlock()
-			g.channelsLock.Lock()
+			/*g.channelsLock.Lock()
 			g.channels[addr] = make(chan bool)
-			g.channelsLock.Unlock()
+			g.channelsLock.Unlock()*/
 			g.sendUserList()
 			log.Println("Added peer", addr)
 		}
@@ -88,9 +88,9 @@ func (g *Gossiper) deletePeer(addr string) {
 	delete(g.want, addr)
 	g.wantLock.Unlock()
 
-	g.channelsLock.Lock()
+	/*g.channelsLock.Lock()
 	delete(g.channels, addr)
-	g.channelsLock.Unlock()
+	g.channelsLock.Unlock()*/
 
 	g.sendUserList()
 	log.Println("Delted peer", addr)