diff --git a/examples/hosts/main.go b/examples/hosts/main.go
index 9b5984fa8750aff0f69b769ee2c3dc8849d80e45..1edeb4a83412a31db03c7c91e58597d891458603 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 31681eda938ae8e47d4c055e88f5895cbb33db0f..58b4d5e67d8e0a1c03a4793e11c5c6b2b61356e3 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 8ff677dbfa32076f8b408f074e7bf6145fca7cea..549931aeb3173c844064e0f744afae57ef285b68 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 035134707739ef5c376d8dd27c0be1f2037cc8dd..6e8ccb7d29884722f8339ce95ab037e627d3377b 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 c4da4f51b376047dec4ea00fcb38d123185bc69e..20af1e9147656969fd29252b4878c3fbd3f32815 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 928297df7f8399b5ab842274c9e676182723179f..2ae808c5f1e8d1ced8ccc48debd7f8bce4c7599a 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 396cabb16935ff892985a2d82e883802f23f1759..8ed7991cd51ffc349fbd953588b373c0cc7856ae 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 fb1d9afbb355689ee65fa7ce27d79d82b7f3c1ff..3d1f9752f59764405f03f6ba8f383a27d9fa2c7e 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 b5fccecf7b0677c59036c8f3fa04296f442c4e48..cae9fa216d65aa9fe1bcf5fe77fe554785b91b44 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 4e6187b9d27ea9db2b752eb886ac9fea0851dc06..970fbc7e07f4cf55538301573059d07e3c13c600 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 8b940c76ea0c7e6fc9a7e22512f5f742faff391a..8bacd0e87b37e75e6bb387defe2c3aeb677a1d36 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 6aa16f92087d935e5a792fe45e4f017d6b77cdf4..f34f471a9050e39b8b12268efc12a8797c555289 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 0b74bc54ea5ad391caeb8d02eb552c8412e56426..9c7b220a8582a5b7fa4263558596391fec8abcf1 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 8ae6078499e0a568f6f4aa39b9d873667608e0b4..56237b7f6f0c4e0666b71f1a31989c25254f6e99 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 3c526a36e8198caa33f4ac2a0b553a253ed9dc74..8760b4d48902b180a9d158b8cca42287c9d7ee83 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 c8acdf82f066e1157394b147f51a027f3ee6df2e..565b5c43ecf5410840c7b26fcda6c7b36ac6128f 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 4c88ef9aebd04bec899b5a0df51172ef5651f2e4..a9cb4ea73f239e9b8aa0eb7502028c8ac87667df 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 048985b9e2b2e01bfe3fa371b937711df02dcec4..9f0786cf70ea78bf998db121ad08a9a7a9b682ff 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 973104e255f2d8f83ac2052c64c7df55fa1cc3b6..5fe27425ba5f38e24fbb8c776dfd0d947bac2f8d 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 08ca90ac46270f81bb315b9cfb78a38139d35336..4a14c437786839e9db6a2ab4b66a8a7f26288902 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 aeeb6ae42d48344b66034a1d6da828008c90d016..ab65b8c59fa0b2b660f009848e4a84fc7d667458 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 b63e655b110137bf95f5a9260cc2ce7548b0fac9..5eadf4e6716dc98cbe1ade518fde04a86236a4b4 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 c6ee6cf985e35939389b78ed1c49f01d337e0e30..bc9cf3ae0f41d1d8c21eb893e1eae9ec4468f1e1 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 772413b286d7f8a1274c0915ada7123cc840f1cc..e221f7bc87a6181fa75e08172c1c7ad42182a789 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 762ba6e1d312758b4f82b1134a78547bbad1c068..40f5bdf0ab75ea7b1d89c4e233f073c43bf1daa7 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 92ccd833af1b26cc1b24974b93f578df407d3496..e1b9a876fbad3ef218c134de55e039d705abd02e 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 abf2f21ce02633d873437f1bcdc919b011a3fe7c..d9e83d5fdc02e3eaae5ae3ad01119c5a4f81562b 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 4d564e3901fc2ee086e8d5fa8f71a856ba5ad99a..205b841a19ddac873e992781a482c369eef50023 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 06777469f5956f4f9347e812f7d0d693a2343179..2bc663e0a55666c6f0ceceee8b240b1d3aa20f18 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 db8a4644237ac40ddbd2e17050cc20ddb43054ba..b7520dc757a318b6a7ad9e5ea644d7314714a45b 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 d947901d4c75a2eaaa17b4105c441fd4fcdec756..161b6a12964f747bbe5c1da4169123dddc25a8a7 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 cf7f814cb83f15505ffd866ff9a898b2c0a5d7d6..e591857414ef1f05d0d3bc8d8275af29bfc52d7c 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 e4dc40a967905342f48882af609907cb6d9527b7..9ce056d12af83a0b5a3463e9deec11b7f7987d90 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 f0952d44f0f1cd7fc2433429b09a0d73340a3497..850e64381632356b14817b07dee978f7711ce7ec 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 885018dee6fefb1a213f95ed855ee8a165a0d40f..0b90f9918693b2048cf37f8e9159895eaed6398c 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 e93491f793bf82ea94a9773bb02e54d676a98021..598bdc7f8d08d550bd68d4ca20ae4283fbedddb6 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 aedc0e3b82928dfae9f33c667b82be68d023e1e8..c4873ce100fc3ce8317bfe26848be1043fa0799a 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 aea77cd861b099e3f99f8d101b01f757dff35cce..d60d6c437f30008ce19e5307d173e58f69e0f74d 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 d8f2aa74c94e9d6192f40671e31658bde71a3cc1..02da50f371152188eff8d553ae987dd2d55b4bba 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 261c930a88af90fc3048b142aa7ca5e940e9854d..7edb1795b8703060a32f45c3a50fef0c1f1935aa 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",