diff --git a/src/client.rs b/src/client.rs
index bc1b2ef..d648831 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -90,7 +90,7 @@ impl<Req, Resp, E> fmt::Debug for Client<Req, Resp, E>
     }
 }
 
-/// Additional options to configure how the client connects.
+/// Additional options to configure how the client connects and operates.
 #[derive(Clone, Default)]
 pub struct Options {
     reactor: Option<Reactor>,
diff --git a/src/server.rs b/src/server.rs
index d0a7975..35f5d05 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -17,7 +17,7 @@ use tokio_core::reactor::{self, Handle};
 use tokio_proto::BindServer;
 use tokio_service::NewService;
 
-/// Additional options to configure how the server starts up.
+/// Additional options to configure how the server operates.
 #[derive(Clone, Default)]
 pub struct Options {
     reactor: Option<Reactor>,
@@ -121,13 +121,6 @@ pub struct ListenFuture {
                           future::FutureResult<io::Result<SocketAddr>, futures::Canceled>>,
 }
 
-impl ListenFuture {
-    #[doc(hidden)]
-    pub fn from_oneshot(rx: futures::Oneshot<io::Result<SocketAddr>>) -> Self {
-        ListenFuture { inner: future::Either::A(rx) }
-    }
-}
-
 impl Future for ListenFuture {
     type Item = SocketAddr;
     type Error = io::Error;