diff --git a/core/.scripts/update-libp2p.sh b/core/.scripts/update-libp2p.sh
deleted file mode 100755
index 9f6e0a74af..0000000000
--- a/core/.scripts/update-libp2p.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-GO111MODULE=on
-
-repos="
-github.com/libp2p/go-addr-util
-github.com/libp2p/go-buffer-pool
-github.com/libp2p/go-conn-security
-github.com/libp2p/go-conn-security-multistream
-github.com/libp2p/go-flow-metrics
-github.com/libp2p/go-libp2p
-github.com/libp2p/go-libp2p-blankhost
-github.com/libp2p/go-libp2p-circuit
-github.com/libp2p/go-libp2p-connmgr
-github.com/libp2p/go-libp2p-crypto
-github.com/libp2p/go-libp2p-host
-github.com/libp2p/go-libp2p-interface-connmgr
-github.com/libp2p/go-libp2p-interface-pnet
-github.com/libp2p/go-libp2p-kad-dht
-github.com/libp2p/go-libp2p-kbucket
-github.com/libp2p/go-libp2p-loggables
-github.com/libp2p/go-libp2p-metrics
-github.com/libp2p/go-libp2p-nat
-github.com/libp2p/go-libp2p-net
-github.com/libp2p/go-libp2p-netutil
-github.com/libp2p/go-libp2p-peer
-github.com/libp2p/go-libp2p-peerstore
-github.com/libp2p/go-libp2p-pnet
-github.com/libp2p/go-libp2p-protocol
-github.com/libp2p/go-libp2p-pubsub
-github.com/libp2p/go-libp2p-quic-transport
-github.com/libp2p/go-libp2p-record
-github.com/libp2p/go-libp2p-routing
-github.com/libp2p/go-libp2p-secio
-github.com/libp2p/go-libp2p-swarm
-github.com/libp2p/go-libp2p-transport
-github.com/libp2p/go-libp2p-transport-upgrader
-github.com/libp2p/go-maddr-filter
-github.com/libp2p/go-mplex
-github.com/libp2p/go-msgio
-github.com/libp2p/go-reuseport
-github.com/libp2p/go-reuseport-transport
-github.com/libp2p/go-sockaddr
-github.com/libp2p/go-stream-muxer
-github.com/libp2p/go-tcp-transport
-github.com/libp2p/go-testutil
-github.com/libp2p/go-ws-transport
-github.com/multiformats/go-multiaddr
-github.com/multiformats/go-multiaddr-dns
-github.com/multiformats/go-multiaddr-net
-github.com/multiformats/go-multibase
-github.com/multiformats/go-multicodec
-github.com/multiformats/go-multihash
-github.com/multiformats/go-multistream
-github.com/ipfs/go-cid
-github.com/ipfs/go-datastore
-github.com/ipfs/go-ipfs-addr
-github.com/ipfs/go-ipfs-util
-github.com/ipfs/go-log
-"
-
-# clean up
-[ "clean" = "$1" ] && echo "cleaning..." && (rm -rf vendor || true) && go clean -modcache > /dev/null 2>&1
-
-echo "upgrading..."
-
-# update them all
-for repo in $repos; do
-    version=$(git ls-remote --tags "git://$repo" | sed -E 's`refs/tags/(v[0-9]+\.[0-9]+\.[0-9]+).*`\1`g' | sort -V -k 2 | tail -1 | cut -f2)
-    if [ ! -z "$version" ]; then
-        echo "$repo -> $version"
-        go mod edit -require "$repo@$version"
-    fi
-done
-
-go mod vendor -v
-go mod tidy
-go mod verify
diff --git a/core/go.mod b/core/go.mod
index 39427a9038..37093200b2 100644
--- a/core/go.mod
+++ b/core/go.mod
@@ -27,15 +27,20 @@ require (
 	github.com/ipfs/go-cid v0.0.1
 	github.com/ipfs/go-datastore v0.0.1
 	github.com/ipfs/go-ipfs-addr v0.0.1
+	github.com/ipfs/go-ipfs-routing v0.0.1
+	github.com/ipfs/go-ipfs-util v0.0.1
 	github.com/ipfs/go-log v0.0.1
 	github.com/jinzhu/gorm v1.9.2
 	github.com/jinzhu/now v1.0.0 // indirect
 	github.com/jtolds/gls v4.2.2-0.20181110203027-b4936e06046b+incompatible // indirect
 	github.com/karrick/godirwalk v1.8.0 // indirect
+	github.com/libp2p/go-conn-security v0.0.1
+	github.com/libp2p/go-conn-security-multistream v0.0.1
 	github.com/libp2p/go-libp2p v0.0.2
 	github.com/libp2p/go-libp2p-circuit v0.0.1
 	github.com/libp2p/go-libp2p-connmgr v0.0.1
 	github.com/libp2p/go-libp2p-crypto v0.0.1
+	github.com/libp2p/go-libp2p-discovery v0.0.1
 	github.com/libp2p/go-libp2p-host v0.0.1
 	github.com/libp2p/go-libp2p-interface-connmgr v0.0.1
 	github.com/libp2p/go-libp2p-interface-pnet v0.0.1
@@ -47,9 +52,13 @@ require (
 	github.com/libp2p/go-libp2p-peerstore v0.0.1
 	github.com/libp2p/go-libp2p-pnet v0.0.1
 	github.com/libp2p/go-libp2p-protocol v0.0.1
-	github.com/libp2p/go-libp2p-pubsub v0.0.1
+	github.com/libp2p/go-libp2p-pubsub v0.0.1 // indirect
 	github.com/libp2p/go-libp2p-quic-transport v0.0.1
+	github.com/libp2p/go-libp2p-routing v0.0.1
+	github.com/libp2p/go-libp2p-swarm v0.0.1
 	github.com/libp2p/go-libp2p-transport v0.0.4
+	github.com/libp2p/go-libp2p-transport-upgrader v0.0.1
+	github.com/libp2p/go-maddr-filter v0.0.1
 	github.com/libp2p/go-reuseport v0.0.1
 	github.com/libp2p/go-reuseport-transport v0.0.1
 	github.com/libp2p/go-stream-muxer v0.0.1
@@ -58,6 +67,7 @@ require (
 	github.com/multiformats/go-multiaddr v0.0.1
 	github.com/multiformats/go-multiaddr-net v0.0.1
 	github.com/multiformats/go-multihash v0.0.1
+	github.com/multiformats/go-multistream v0.0.1
 	github.com/nicksnyder/go-i18n/v2 v2.0.0-beta.6
 	github.com/opentracing/opentracing-go v1.0.2
 	github.com/pkg/errors v0.8.1
@@ -76,6 +86,7 @@ require (
 	github.com/uber/jaeger-lib v1.5.0 // indirect
 	github.com/vektah/gqlparser v1.1.1
 	github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc
+	github.com/whyrusleeping/go-smux-multistream v2.0.2+incompatible
 	github.com/whyrusleeping/mafmt v1.2.8
 	github.com/whyrusleeping/yamux v1.1.5
 	github.com/xeodou/go-sqlcipher v0.0.0-20180523161204-7f9cd319987f
diff --git a/core/go.sum b/core/go.sum
index 6eafbb7eaf..c1a85b1d0d 100644
--- a/core/go.sum
+++ b/core/go.sum
@@ -314,6 +314,10 @@ github.com/ipfs/go-ds-leveldb v0.0.1/go.mod h1:feO8V3kubwsEF22n0YRQCffeb79OOYIyk
 github.com/ipfs/go-ipfs-addr v0.0.1 h1:DpDFybnho9v3/a1dzJ5KnWdThWD1HrFLpQ+tWIyBaFI=
 github.com/ipfs/go-ipfs-addr v0.0.1/go.mod h1:uKTDljHT3Q3SUWzDLp3aYUi8MrY32fgNgogsIa0npjg=
 github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
+github.com/ipfs/go-ipfs-delay v0.0.1/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
+github.com/ipfs/go-ipfs-ds-help v0.0.1/go.mod h1:gtP9xRaZXqIQRh1HRpp595KbBEdgqWFxefeVKOV8sxo=
+github.com/ipfs/go-ipfs-routing v0.0.1 h1:394mZeTLcbM/LDO12PneBYvkZAUA+nRnmC0lAzDXKOY=
+github.com/ipfs/go-ipfs-routing v0.0.1/go.mod h1:k76lf20iKFxQTjcJokbPM9iBXVXVZhcOwc360N4nuKs=
 github.com/ipfs/go-ipfs-util v0.0.1 h1:Wz9bL2wB2YBJqggkA4dD7oSmqB4cAnpNbGrlHJulv50=
 github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc=
 github.com/ipfs/go-log v0.0.1 h1:9XTUN/rW64BCG1YhPK9Hoy3q8nr4gOmHHBpgFdfw6Lc=
diff --git a/core/network/protocol/ble/os_other.go b/core/network/protocol/ble/os_other.go
index fd9cf00725..c370531cd4 100644
--- a/core/network/protocol/ble/os_other.go
+++ b/core/network/protocol/ble/os_other.go
@@ -27,7 +27,7 @@ type Transport struct {
 	reuse          rtpt.Transport
 }
 
-func NewBLETransport(ID string, lAddr ma.Multiaddr) (func(me host.Host) *Transport, error) {
+func NewTransport(me host.Host) (*Transport, error) {
 	return nil, errorcodes.ErrUnimplemented.New()
 }