diff --git a/go.mod b/go.mod
index 786926a0..7022bc16 100644
--- a/go.mod
+++ b/go.mod
@@ -19,119 +19,3 @@ require (
 )
 
 go 1.13
-
-replace github.com/libp2p/go-addr-util => ../go-addr-util
-
-replace github.com/libp2p/go-buffer-pool => ../go-buffer-pool
-
-replace github.com/libp2p/go-conn-security-multistream => ../go-conn-security-multistream
-
-replace github.com/libp2p/go-eventbus => ../go-eventbus
-
-replace github.com/libp2p/go-flow-metrics => ../go-flow-metrics
-
-replace github.com/libp2p/go-libp2p => ../go-libp2p
-
-replace github.com/libp2p/go-libp2p-autonat => ../go-libp2p-autonat
-
-replace github.com/libp2p/go-libp2p-autonat-svc => ../go-libp2p-autonat-svc
-
-replace github.com/libp2p/go-libp2p-blankhost => ../go-libp2p-blankhost
-
-replace github.com/libp2p/go-libp2p-circuit => ../go-libp2p-circuit
-
-replace github.com/libp2p/go-libp2p-connmgr => ../go-libp2p-connmgr
-
-replace github.com/libp2p/go-libp2p-consensus => ../go-libp2p-consensus
-
-replace github.com/libp2p/go-libp2p-daemon => ../go-libp2p-daemon
-
-replace github.com/libp2p/go-libp2p-discovery => ../go-libp2p-discovery
-
-replace github.com/libp2p/go-libp2p-examples => ../go-libp2p-examples
-
-replace github.com/libp2p/go-libp2p-gorpc => ../go-libp2p-gorpc
-
-replace github.com/libp2p/go-libp2p-introspection => ../go-libp2p-introspection
-
-replace github.com/libp2p/go-libp2p-kad-dht => ../go-libp2p-kad-dht
-
-replace github.com/libp2p/go-libp2p-kbucket => ../go-libp2p-kbucket
-
-replace github.com/libp2p/go-libp2p-loggables => ../go-libp2p-loggables
-
-replace github.com/libp2p/go-libp2p-mplex => ../go-libp2p-mplex
-
-replace github.com/libp2p/go-libp2p-nat => ../go-libp2p-nat
-
-replace github.com/libp2p/go-libp2p-netutil => ../go-libp2p-netutil
-
-replace github.com/libp2p/go-libp2p-noise => ../go-libp2p-noise
-
-replace github.com/libp2p/go-libp2p-peerstore => ../go-libp2p-peerstore
-
-replace github.com/libp2p/go-libp2p-pnet => ../go-libp2p-pnet
-
-replace github.com/libp2p/go-libp2p-pubsub => ../go-libp2p-pubsub
-
-replace github.com/libp2p/go-libp2p-pubsub-router => ../go-libp2p-pubsub-router
-
-replace github.com/libp2p/go-libp2p-pubsub-tracer => ../go-libp2p-pubsub-tracer
-
-replace github.com/libp2p/go-libp2p-quic-transport => ../go-libp2p-quic-transport
-
-replace github.com/libp2p/go-libp2p-raft => ../go-libp2p-raft
-
-replace github.com/libp2p/go-libp2p-record => ../go-libp2p-record
-
-replace github.com/libp2p/go-libp2p-routing-helpers => ../go-libp2p-routing-helpers
-
-replace github.com/libp2p/go-libp2p-secio => ../go-libp2p-secio
-
-replace github.com/libp2p/go-libp2p-swarm => ../go-libp2p-swarm
-
-replace github.com/libp2p/go-libp2p-testing => ../go-libp2p-testing
-
-replace github.com/libp2p/go-libp2p-tls => ../go-libp2p-tls
-
-replace github.com/libp2p/go-libp2p-transport-upgrader => ../go-libp2p-transport-upgrader
-
-replace github.com/libp2p/go-libp2p-webrtc-direct => ../go-libp2p-webrtc-direct
-
-replace github.com/libp2p/go-libp2p-yamux => ../go-libp2p-yamux
-
-replace github.com/libp2p/go-maddr-filter => ../go-maddr-filter
-
-replace github.com/libp2p/go-mplex => ../go-mplex
-
-replace github.com/libp2p/go-msgio => ../go-msgio
-
-replace github.com/multiformats/go-multiaddr => ../go-multiaddr
-
-replace github.com/multiformats/go-multiaddr-dns => ../go-multiaddr-dns
-
-replace github.com/multiformats/go-multiaddr-fmt => ../go-multiaddr-fmt
-
-replace github.com/multiformats/go-multiaddr-net => ../go-multiaddr-net
-
-replace github.com/multiformats/go-multistream => ../go-multistream
-
-replace github.com/libp2p/go-nat => ../go-nat
-
-replace github.com/libp2p/go-reuseport => ../go-reuseport
-
-replace github.com/libp2p/go-reuseport-transport => ../go-reuseport-transport
-
-replace github.com/libp2p/go-sockaddr => ../go-sockaddr
-
-replace github.com/libp2p/go-stream-muxer-multistream => ../go-stream-muxer-multistream
-
-replace github.com/libp2p/go-tcp-transport => ../go-tcp-transport
-
-replace github.com/libp2p/go-utp-transport => ../go-utp-transport
-
-replace github.com/Jorropo/go-webrtc-aside-transport => ../go-webrtc-aside-transport
-
-replace github.com/libp2p/go-ws-transport => ../go-ws-transport
-
-replace github.com/libp2p/go-yamux => ../go-yamux
diff --git a/transport/transport.go b/transport/transport.go
index 49773ad6..a5dd1739 100644
--- a/transport/transport.go
+++ b/transport/transport.go
@@ -73,17 +73,11 @@ type CapableConn interface {
 //
 // QCapableConn embed CapableConn but with `Quality() uint32` support.
 type QCapableConn interface {
-	ListenedQCapableConn
+	BaseCapableConn
 
 	// Quality returns the Quality we can expect from the connection to this peer.
 	// That must be deterministic and fast.
 	Quality() uint32
-}
-
-// ListenedQCapableConn is like QCapableConn but is used by listener, quality is
-// managed on client side.
-type ListenedQCapableConn interface {
-	BaseCapableConn
 
 	// Transport returns the transport to which this connection belongs.
 	Transport() QTransport
@@ -181,7 +175,7 @@ type Listener interface {
 type QListener interface {
 	BaseListener
 
-	Accept() (ListenedQCapableConn, error)
+	Accept() (QCapableConn, error)
 }
 
 // BaseListener is used to build `Lister` and `QListener`