diff --git a/examples/hosts/main.go b/examples/hosts/main.go
index 9b5984fa87..1edeb4a834 100644
--- a/examples/hosts/main.go
+++ b/examples/hosts/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"io/ioutil"
@@ -17,7 +18,6 @@ import (
 	testutil "github.com/libp2p/go-libp2p/testutil"
 
 	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 // create a 'Host' with a random peer to listen on the given address
diff --git a/p2p/host/basic/basic_host.go b/p2p/host/basic/basic_host.go
index 31681eda93..58b4d5e67d 100644
--- a/p2p/host/basic/basic_host.go
+++ b/p2p/host/basic/basic_host.go
@@ -1,6 +1,7 @@
 package basichost
 
 import (
+	"context"
 	"io"
 	"time"
 
@@ -15,7 +16,6 @@ import (
 	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 	identify "github.com/libp2p/go-libp2p/p2p/protocol/identify"
 	relay "github.com/libp2p/go-libp2p/p2p/protocol/relay"
-	context "golang.org/x/net/context"
 
 	msmux "github.com/whyrusleeping/go-multistream"
 )
diff --git a/p2p/host/basic/basic_host_test.go b/p2p/host/basic/basic_host_test.go
index 8ff677dbfa..549931aeb3 100644
--- a/p2p/host/basic/basic_host_test.go
+++ b/p2p/host/basic/basic_host_test.go
@@ -2,6 +2,7 @@ package basichost_test
 
 import (
 	"bytes"
+	"context"
 	"io"
 	"testing"
 	"time"
@@ -10,8 +11,6 @@ import (
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
-
-	context "golang.org/x/net/context"
 )
 
 func TestHostSimple(t *testing.T) {
diff --git a/p2p/host/basic/natmgr.go b/p2p/host/basic/natmgr.go
index 0351347077..6e8ccb7d29 100644
--- a/p2p/host/basic/natmgr.go
+++ b/p2p/host/basic/natmgr.go
@@ -1,6 +1,7 @@
 package basichost
 
 import (
+	"context"
 	"sync"
 
 	lgbl "github.com/ipfs/go-libp2p-loggables"
@@ -8,7 +9,6 @@ import (
 	goprocess "github.com/jbenet/goprocess"
 	inat "github.com/libp2p/go-libp2p/p2p/nat"
 	inet "github.com/libp2p/go-libp2p/p2p/net"
-	context "golang.org/x/net/context"
 )
 
 // natManager takes care of adding + removing port mappings to the nat.
diff --git a/p2p/host/host.go b/p2p/host/host.go
index c4da4f51b3..20af1e9147 100644
--- a/p2p/host/host.go
+++ b/p2p/host/host.go
@@ -1,6 +1,8 @@
 package host
 
 import (
+	"context"
+
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	logging "github.com/ipfs/go-log"
@@ -9,7 +11,6 @@ import (
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 	msmux "github.com/whyrusleeping/go-multistream"
-	context "golang.org/x/net/context"
 )
 
 var log = logging.Logger("github.com/libp2p/go-libp2p/p2p/host")
diff --git a/p2p/host/routed/routed.go b/p2p/host/routed/routed.go
index 928297df7f..2ae808c5f1 100644
--- a/p2p/host/routed/routed.go
+++ b/p2p/host/routed/routed.go
@@ -1,6 +1,7 @@
 package routedhost
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -13,7 +14,6 @@ import (
 	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
-	context "golang.org/x/net/context"
 
 	msmux "github.com/whyrusleeping/go-multistream"
 )
diff --git a/p2p/net/conn/conn.go b/p2p/net/conn/conn.go
index 396cabb169..8ed7991cd5 100644
--- a/p2p/net/conn/conn.go
+++ b/p2p/net/conn/conn.go
@@ -1,6 +1,7 @@
 package conn
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"net"
@@ -14,7 +15,6 @@ import (
 	mpool "github.com/jbenet/go-msgio/mpool"
 	ma "github.com/jbenet/go-multiaddr"
 	manet "github.com/jbenet/go-multiaddr-net"
-	context "golang.org/x/net/context"
 )
 
 var log = logging.Logger("conn")
diff --git a/p2p/net/conn/conn_test.go b/p2p/net/conn/conn_test.go
index fb1d9afbb3..3d1f9752f5 100644
--- a/p2p/net/conn/conn_test.go
+++ b/p2p/net/conn/conn_test.go
@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	msgio "github.com/jbenet/go-msgio"
 	travis "github.com/libp2p/go-libp2p/testutil/ci/travis"
-	context "golang.org/x/net/context"
 )
 
 func msgioWrap(c Conn) msgio.ReadWriter {
diff --git a/p2p/net/conn/dial.go b/p2p/net/conn/dial.go
index b5fccecf7b..cae9fa216d 100644
--- a/p2p/net/conn/dial.go
+++ b/p2p/net/conn/dial.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	"context"
 	ci "github.com/ipfs/go-libp2p-crypto"
 	lgbl "github.com/ipfs/go-libp2p-loggables"
 	peer "github.com/ipfs/go-libp2p-peer"
@@ -14,7 +15,6 @@ import (
 	transport "github.com/libp2p/go-libp2p-transport"
 	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
 	msmux "github.com/whyrusleeping/go-multistream"
-	context "golang.org/x/net/context"
 )
 
 type WrapFunc func(transport.Conn) transport.Conn
diff --git a/p2p/net/conn/dial_test.go b/p2p/net/conn/dial_test.go
index 4e6187b9d2..970fbc7e07 100644
--- a/p2p/net/conn/dial_test.go
+++ b/p2p/net/conn/dial_test.go
@@ -17,10 +17,10 @@ import (
 	tu "github.com/libp2p/go-libp2p/testutil"
 	tcpt "github.com/libp2p/go-tcp-transport"
 
+	"context"
 	ma "github.com/jbenet/go-multiaddr"
 	msmux "github.com/whyrusleeping/go-multistream"
 	grc "github.com/whyrusleeping/gorocheck"
-	context "golang.org/x/net/context"
 )
 
 func goroFilter(r *grc.Goroutine) bool {
diff --git a/p2p/net/conn/listen.go b/p2p/net/conn/listen.go
index 8b940c76ea..8bacd0e87b 100644
--- a/p2p/net/conn/listen.go
+++ b/p2p/net/conn/listen.go
@@ -1,6 +1,7 @@
 package conn
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"net"
@@ -16,7 +17,6 @@ import (
 	transport "github.com/libp2p/go-libp2p-transport"
 	filter "github.com/libp2p/go-libp2p/p2p/net/filter"
 	msmux "github.com/whyrusleeping/go-multistream"
-	context "golang.org/x/net/context"
 )
 
 const (
diff --git a/p2p/net/conn/secure_conn.go b/p2p/net/conn/secure_conn.go
index 6aa16f9208..f34f471a90 100644
--- a/p2p/net/conn/secure_conn.go
+++ b/p2p/net/conn/secure_conn.go
@@ -1,6 +1,7 @@
 package conn
 
 import (
+	"context"
 	"errors"
 	"net"
 	"time"
@@ -9,7 +10,6 @@ import (
 	peer "github.com/ipfs/go-libp2p-peer"
 	secio "github.com/ipfs/go-libp2p-secio"
 	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 // secureConn wraps another Conn object with an encrypted channel.
diff --git a/p2p/net/conn/secure_conn_test.go b/p2p/net/conn/secure_conn_test.go
index 0b74bc54ea..9c7b220a85 100644
--- a/p2p/net/conn/secure_conn_test.go
+++ b/p2p/net/conn/secure_conn_test.go
@@ -2,6 +2,7 @@ package conn
 
 import (
 	"bytes"
+	"context"
 	"runtime"
 	"sync"
 	"testing"
@@ -9,8 +10,6 @@ import (
 
 	ic "github.com/ipfs/go-libp2p-crypto"
 	travis "github.com/libp2p/go-libp2p/testutil/ci/travis"
-
-	context "golang.org/x/net/context"
 )
 
 func upgradeToSecureConn(t *testing.T, ctx context.Context, sk ic.PrivKey, c Conn) (Conn, error) {
diff --git a/p2p/net/interface.go b/p2p/net/interface.go
index 8ae6078499..56237b7f6f 100644
--- a/p2p/net/interface.go
+++ b/p2p/net/interface.go
@@ -1,6 +1,7 @@
 package net
 
 import (
+	"context"
 	"io"
 
 	peer "github.com/ipfs/go-libp2p-peer"
@@ -9,7 +10,6 @@ import (
 	"github.com/jbenet/goprocess"
 	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
 	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
-	context "golang.org/x/net/context"
 )
 
 // MessageSizeMax is a soft (recommended) maximum for network messages.
diff --git a/p2p/net/mock/mock.go b/p2p/net/mock/mock.go
index 3c526a36e8..8760b4d489 100644
--- a/p2p/net/mock/mock.go
+++ b/p2p/net/mock/mock.go
@@ -1,8 +1,9 @@
 package mocknet
 
 import (
+	"context"
+
 	logging "github.com/ipfs/go-log"
-	context "golang.org/x/net/context"
 )
 
 var log = logging.Logger("mocknet")
diff --git a/p2p/net/mock/mock_net.go b/p2p/net/mock/mock_net.go
index c8acdf82f0..565b5c43ec 100644
--- a/p2p/net/mock/mock_net.go
+++ b/p2p/net/mock/mock_net.go
@@ -11,13 +11,13 @@ import (
 	p2putil "github.com/libp2p/go-libp2p/p2p/test/util"
 	testutil "github.com/libp2p/go-libp2p/testutil"
 
+	"context"
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
 	"github.com/jbenet/goprocess"
 	goprocessctx "github.com/jbenet/goprocess/context"
-	context "golang.org/x/net/context"
 )
 
 // mocknet implements mocknet.Mocknet
diff --git a/p2p/net/mock/mock_notif_test.go b/p2p/net/mock/mock_notif_test.go
index 4c88ef9aeb..a9cb4ea73f 100644
--- a/p2p/net/mock/mock_notif_test.go
+++ b/p2p/net/mock/mock_notif_test.go
@@ -1,13 +1,13 @@
 package mocknet
 
 import (
+	"context"
 	"testing"
 	"time"
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	ma "github.com/jbenet/go-multiaddr"
 	inet "github.com/libp2p/go-libp2p/p2p/net"
-	context "golang.org/x/net/context"
 )
 
 func TestNotifications(t *testing.T) {
diff --git a/p2p/net/mock/mock_peernet.go b/p2p/net/mock/mock_peernet.go
index 048985b9e2..9f0786cf70 100644
--- a/p2p/net/mock/mock_peernet.go
+++ b/p2p/net/mock/mock_peernet.go
@@ -7,12 +7,12 @@ import (
 
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 
+	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
 	"github.com/jbenet/goprocess"
 	goprocessctx "github.com/jbenet/goprocess/context"
-	context "golang.org/x/net/context"
 )
 
 // peernet implements inet.Network
diff --git a/p2p/net/mock/mock_test.go b/p2p/net/mock/mock_test.go
index 973104e255..5fe27425ba 100644
--- a/p2p/net/mock/mock_test.go
+++ b/p2p/net/mock/mock_test.go
@@ -14,8 +14,8 @@ import (
 	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 	testutil "github.com/libp2p/go-libp2p/testutil"
 
+	"context"
 	detectrace "github.com/jbenet/go-detect-race"
-	context "golang.org/x/net/context"
 )
 
 func randPeer(t *testing.T) peer.ID {
diff --git a/p2p/net/swarm/addr/addr.go b/p2p/net/swarm/addr/addr.go
index 08ca90ac46..4a14c43778 100644
--- a/p2p/net/swarm/addr/addr.go
+++ b/p2p/net/swarm/addr/addr.go
@@ -3,10 +3,10 @@ package addrutil
 import (
 	"fmt"
 
+	"context"
 	logging "github.com/ipfs/go-log"
 	ma "github.com/jbenet/go-multiaddr"
 	manet "github.com/jbenet/go-multiaddr-net"
-	context "golang.org/x/net/context"
 
 	_ "github.com/whyrusleeping/ws-transport"
 )
diff --git a/p2p/net/swarm/dial_test.go b/p2p/net/swarm/dial_test.go
index aeeb6ae42d..ab65b8c59f 100644
--- a/p2p/net/swarm/dial_test.go
+++ b/p2p/net/swarm/dial_test.go
@@ -10,11 +10,11 @@ import (
 	testutil "github.com/libp2p/go-libp2p/testutil"
 	ci "github.com/libp2p/go-libp2p/testutil/ci"
 
+	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
 	manet "github.com/jbenet/go-multiaddr-net"
-	context "golang.org/x/net/context"
 )
 
 func closeSwarms(swarms []*Swarm) {
diff --git a/p2p/net/swarm/peers_test.go b/p2p/net/swarm/peers_test.go
index b63e655b11..5eadf4e671 100644
--- a/p2p/net/swarm/peers_test.go
+++ b/p2p/net/swarm/peers_test.go
@@ -3,10 +3,10 @@ package swarm
 import (
 	"testing"
 
+	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func TestPeers(t *testing.T) {
diff --git a/p2p/net/swarm/simul_test.go b/p2p/net/swarm/simul_test.go
index c6ee6cf985..bc9cf3ae0f 100644
--- a/p2p/net/swarm/simul_test.go
+++ b/p2p/net/swarm/simul_test.go
@@ -8,10 +8,10 @@ import (
 
 	ci "github.com/libp2p/go-libp2p/testutil/ci"
 
+	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func TestSimultOpen(t *testing.T) {
diff --git a/p2p/net/swarm/swarm_addr_test.go b/p2p/net/swarm/swarm_addr_test.go
index 772413b286..e221f7bc87 100644
--- a/p2p/net/swarm/swarm_addr_test.go
+++ b/p2p/net/swarm/swarm_addr_test.go
@@ -7,9 +7,9 @@ import (
 	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
 	testutil "github.com/libp2p/go-libp2p/testutil"
 
+	"context"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func TestFilterAddrs(t *testing.T) {
diff --git a/p2p/net/swarm/swarm_conn.go b/p2p/net/swarm/swarm_conn.go
index 762ba6e1d3..40f5bdf0ab 100644
--- a/p2p/net/swarm/swarm_conn.go
+++ b/p2p/net/swarm/swarm_conn.go
@@ -6,11 +6,11 @@ import (
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
 
+	"context"
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
 	ma "github.com/jbenet/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
-	context "golang.org/x/net/context"
 )
 
 // Conn is a simple wrapper around a ps.Conn that also exposes
diff --git a/p2p/net/swarm/swarm_listen.go b/p2p/net/swarm/swarm_listen.go
index 92ccd833af..e1b9a876fb 100644
--- a/p2p/net/swarm/swarm_listen.go
+++ b/p2p/net/swarm/swarm_listen.go
@@ -3,6 +3,7 @@ package swarm
 import (
 	"fmt"
 
+	"context"
 	lgbl "github.com/ipfs/go-libp2p-loggables"
 	ma "github.com/jbenet/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
@@ -10,7 +11,6 @@ import (
 	mconn "github.com/libp2p/go-libp2p/p2p/metrics/conn"
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
-	context "golang.org/x/net/context"
 )
 
 func (s *Swarm) AddListenAddr(a ma.Multiaddr) error {
diff --git a/p2p/net/swarm/swarm_net.go b/p2p/net/swarm/swarm_net.go
index abf2f21ce0..d9e83d5fdc 100644
--- a/p2p/net/swarm/swarm_net.go
+++ b/p2p/net/swarm/swarm_net.go
@@ -8,9 +8,9 @@ import (
 	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 
+	"context"
 	ma "github.com/jbenet/go-multiaddr"
 	"github.com/jbenet/goprocess"
-	context "golang.org/x/net/context"
 )
 
 // Network implements the inet.Network interface.
diff --git a/p2p/net/swarm/swarm_net_test.go b/p2p/net/swarm/swarm_net_test.go
index 4d564e3901..205b841a19 100644
--- a/p2p/net/swarm/swarm_net_test.go
+++ b/p2p/net/swarm/swarm_net_test.go
@@ -7,7 +7,7 @@ import (
 
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
-	context "golang.org/x/net/context"
+	"context"
 )
 
 // TestConnectednessCorrect starts a few networks, connects a few
diff --git a/p2p/net/swarm/swarm_notif_test.go b/p2p/net/swarm/swarm_notif_test.go
index 06777469f5..2bc663e0a5 100644
--- a/p2p/net/swarm/swarm_notif_test.go
+++ b/p2p/net/swarm/swarm_notif_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	ma "github.com/jbenet/go-multiaddr"
 	inet "github.com/libp2p/go-libp2p/p2p/net"
-	context "golang.org/x/net/context"
 )
 
 func streamsSame(a, b inet.Stream) bool {
diff --git a/p2p/net/swarm/swarm_test.go b/p2p/net/swarm/swarm_test.go
index db8a464423..b7520dc757 100644
--- a/p2p/net/swarm/swarm_test.go
+++ b/p2p/net/swarm/swarm_test.go
@@ -13,10 +13,10 @@ import (
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	testutil "github.com/libp2p/go-libp2p/testutil"
 
+	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func EchoStreamHandler(stream inet.Stream) {
diff --git a/p2p/protocol/identify/id.go b/p2p/protocol/identify/id.go
index d947901d4c..161b6a1296 100644
--- a/p2p/protocol/identify/id.go
+++ b/p2p/protocol/identify/id.go
@@ -1,6 +1,7 @@
 package identify
 
 import (
+	"context"
 	"strings"
 	"sync"
 
@@ -15,7 +16,6 @@ import (
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	pb "github.com/libp2p/go-libp2p/p2p/protocol/identify/pb"
 	msmux "github.com/whyrusleeping/go-multistream"
-	context "golang.org/x/net/context"
 
 	lgbl "github.com/ipfs/go-libp2p-loggables"
 	logging "github.com/ipfs/go-log"
diff --git a/p2p/protocol/identify/id_test.go b/p2p/protocol/identify/id_test.go
index cf7f814cb8..e591857414 100644
--- a/p2p/protocol/identify/id_test.go
+++ b/p2p/protocol/identify/id_test.go
@@ -10,8 +10,8 @@ import (
 	identify "github.com/libp2p/go-libp2p/p2p/protocol/identify"
 	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
 
+	"context"
 	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func subtestIDService(t *testing.T, postDialWait time.Duration) {
diff --git a/p2p/protocol/ping/ping.go b/p2p/protocol/ping/ping.go
index e4dc40a967..9ce056d12a 100644
--- a/p2p/protocol/ping/ping.go
+++ b/p2p/protocol/ping/ping.go
@@ -2,6 +2,7 @@ package ping
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"io"
 	"time"
@@ -11,7 +12,6 @@ import (
 	logging "github.com/ipfs/go-log"
 	host "github.com/libp2p/go-libp2p/p2p/host"
 	inet "github.com/libp2p/go-libp2p/p2p/net"
-	context "golang.org/x/net/context"
 )
 
 var log = logging.Logger("ping")
diff --git a/p2p/protocol/ping/ping_test.go b/p2p/protocol/ping/ping_test.go
index f0952d44f0..850e643816 100644
--- a/p2p/protocol/ping/ping_test.go
+++ b/p2p/protocol/ping/ping_test.go
@@ -6,9 +6,9 @@ import (
 
 	netutil "github.com/libp2p/go-libp2p/p2p/test/util"
 
+	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
-	context "golang.org/x/net/context"
 )
 
 func TestPing(t *testing.T) {
diff --git a/p2p/protocol/relay/relay.go b/p2p/protocol/relay/relay.go
index 885018dee6..0b90f99186 100644
--- a/p2p/protocol/relay/relay.go
+++ b/p2p/protocol/relay/relay.go
@@ -5,13 +5,13 @@ import (
 	"io"
 	"time"
 
+	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	logging "github.com/ipfs/go-log"
 	mh "github.com/jbenet/go-multihash"
 	host "github.com/libp2p/go-libp2p/p2p/host"
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
-	context "golang.org/x/net/context"
 )
 
 var log = logging.Logger("github.com/libp2p/go-libp2p/p2p/protocol/relay")
diff --git a/p2p/protocol/relay/relay_test.go b/p2p/protocol/relay/relay_test.go
index e93491f793..598bdc7f8d 100644
--- a/p2p/protocol/relay/relay_test.go
+++ b/p2p/protocol/relay/relay_test.go
@@ -4,13 +4,13 @@ import (
 	"io"
 	"testing"
 
+	"context"
 	logging "github.com/ipfs/go-log"
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 	relay "github.com/libp2p/go-libp2p/p2p/protocol/relay"
 	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
 	msmux "github.com/whyrusleeping/go-multistream"
-	context "golang.org/x/net/context"
 )
 
 var log = logging.Logger("relay_test")
diff --git a/p2p/test/backpressure/backpressure_test.go b/p2p/test/backpressure/backpressure_test.go
index aedc0e3b82..c4873ce100 100644
--- a/p2p/test/backpressure/backpressure_test.go
+++ b/p2p/test/backpressure/backpressure_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	u "github.com/ipfs/go-ipfs-util"
 	peer "github.com/ipfs/go-libp2p-peer"
 	logging "github.com/ipfs/go-log"
@@ -13,7 +14,6 @@ import (
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
-	context "golang.org/x/net/context"
 )
 
 var log = logging.Logger("backpressure")
diff --git a/p2p/test/reconnects/reconnect_test.go b/p2p/test/reconnects/reconnect_test.go
index aea77cd861..d60d6c437f 100644
--- a/p2p/test/reconnects/reconnect_test.go
+++ b/p2p/test/reconnects/reconnect_test.go
@@ -1,6 +1,7 @@
 package reconnect
 
 import (
+	"context"
 	"io"
 	"math/rand"
 	"sync"
@@ -15,7 +16,6 @@ import (
 	swarm "github.com/libp2p/go-libp2p/p2p/net/swarm"
 	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
-	context "golang.org/x/net/context"
 )
 
 func init() {
diff --git a/p2p/test/util/util.go b/p2p/test/util/util.go
index d8f2aa74c9..02da50f371 100644
--- a/p2p/test/util/util.go
+++ b/p2p/test/util/util.go
@@ -10,8 +10,8 @@ import (
 	swarm "github.com/libp2p/go-libp2p/p2p/net/swarm"
 	tu "github.com/libp2p/go-libp2p/testutil"
 
+	"context"
 	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func GenSwarmNetwork(t *testing.T, ctx context.Context) *swarm.Network {
diff --git a/package.json b/package.json
index 261c930a88..7edb1795b8 100644
--- a/package.json
+++ b/package.json
@@ -103,11 +103,6 @@
       "name": "randbo",
       "version": "0.0.0"
     },
-    {
-      "hash": "QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt",
-      "name": "go-net",
-      "version": "0.0.0"
-    },
     {
       "hash": "Qmb1US8uyZeEpMyc56wVZy2cDFdQjNFojAUYVCoo9ieTqp",
       "name": "go-stream-muxer",