diff --git a/floodsub/Cargo.toml b/floodsub/Cargo.toml
index 77b88440..2429a0c4 100644
--- a/floodsub/Cargo.toml
+++ b/floodsub/Cargo.toml
@@ -9,7 +9,6 @@ byteorder = "1.2.1"
 bytes = "0.4"
 fnv = "1.0"
 futures = "0.1"
-libp2p-peerstore = { path = "../peerstore" }
 libp2p-core = { path = "../core" }
 log = "0.4.1"
 multiaddr = "0.3"
diff --git a/floodsub/src/lib.rs b/floodsub/src/lib.rs
index 6802fa74..49d6d4e0 100644
--- a/floodsub/src/lib.rs
+++ b/floodsub/src/lib.rs
@@ -23,7 +23,6 @@ extern crate byteorder;
 extern crate bytes;
 extern crate fnv;
 extern crate futures;
-extern crate libp2p_peerstore;
 extern crate libp2p_core;
 #[macro_use]
 extern crate log;
@@ -44,8 +43,7 @@ use bytes::{Bytes, BytesMut};
 use fnv::{FnvHashMap, FnvHashSet, FnvHasher};
 use futures::sync::mpsc;
 use futures::{future, Future, Poll, Sink, Stream};
-use libp2p_peerstore::PeerId;
-use libp2p_core::{ConnectionUpgrade, Endpoint};
+use libp2p_core::{ConnectionUpgrade, Endpoint, PeerId};
 use log::Level;
 use multiaddr::{AddrComponent, Multiaddr};
 use parking_lot::{Mutex, RwLock};
diff --git a/libp2p/examples/random_peerid.rs b/libp2p/examples/random_peerid.rs
index 3b53f5db..11e24cb6 100644
--- a/libp2p/examples/random_peerid.rs
+++ b/libp2p/examples/random_peerid.rs
@@ -21,7 +21,7 @@
 extern crate libp2p;
 extern crate rand;
 
-use libp2p::peerstore::PeerId;
+use libp2p::PeerId;
 
 fn main() {
     let pid = {
diff --git a/libp2p/src/lib.rs b/libp2p/src/lib.rs
index fdbcdd1b..7df9c637 100644
--- a/libp2p/src/lib.rs
+++ b/libp2p/src/lib.rs
@@ -44,9 +44,8 @@ pub extern crate libp2p_websocket as websocket;
 
 pub mod simple;
 
-pub use self::core::{Transport, ConnectionUpgrade, swarm};
+pub use self::core::{Transport, ConnectionUpgrade, PeerId, swarm};
 pub use self::multiaddr::Multiaddr;
-pub use self::peerstore::PeerId;
 pub use self::simple::SimpleProtocol;
 
 /// Implementation of `Transport` that supports the most common protocols.
diff --git a/peerstore/src/lib.rs b/peerstore/src/lib.rs
index d033806b..5f0ccbb0 100644
--- a/peerstore/src/lib.rs
+++ b/peerstore/src/lib.rs
@@ -77,6 +77,7 @@ extern crate serde;
 #[macro_use]
 extern crate serde_derive;
 
+// TODO: remove
 pub use self::libp2p_core::PeerId;
 pub use self::peerstore::{PeerAccess, Peerstore};