diff --git a/src/yggdrasil/router.go b/src/yggdrasil/router.go
index c25d64a7..267f0766 100644
--- a/src/yggdrasil/router.go
+++ b/src/yggdrasil/router.go
@@ -170,11 +170,7 @@ func (r *router) sendPacket(bs []byte) {
 			// Don't continue - drop the packet
 			return
 		}
-		select {
-		case sinfo.send <- bs:
-		default:
-			util_putBytes(bs)
-		}
+		sinfo.send <- bs
 	}
 }
 
@@ -225,11 +221,7 @@ func (r *router) handleTraffic(packet []byte) {
 		return
 	}
 	//go func () { sinfo.recv<-&p }()
-	select {
-	case sinfo.recv <- &p:
-	default:
-		util_putBytes(p.payload)
-	}
+	sinfo.recv <- &p
 }
 
 func (r *router) handleProto(packet []byte) {
diff --git a/yggdrasil.go b/yggdrasil.go
index 0184dede..68f23965 100644
--- a/yggdrasil.go
+++ b/yggdrasil.go
@@ -173,7 +173,7 @@ func (n *node) listen() {
 		saddr := addr.String()
 		//if _, isIn := n.peers[saddr]; isIn { continue }
 		//n.peers[saddr] = struct{}{}
-		n.core.DEBUG_addTCPConn(saddr) // FIXME? can result in 2 connections per peer
+		n.core.DEBUG_addTCPConn(saddr)
 		//fmt.Println("DEBUG:", "added multicast peer:", saddr)
 	}
 }