diff --git a/Cargo.lock b/Cargo.lock
index 1c526b9..44fc832 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -254,9 +254,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "memchr"
diff --git a/Cargo.toml b/Cargo.toml
index c755839..811f162 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,13 +12,18 @@ default = []
 trace = []
 
 [dependencies]
-tokio = { version = "1", features = [ "io-util", "net", "rt", "sync" ] }
-rustls = { version = "0.23", default-features = false, features = ["logging", "std", "tls12", "ring"] }
+# io-util for stream splitting, net for TcpStream, rt for tasks, 
+tokio = { version = "1", default-features = false, features = ["io-util", "net", "rt"] }
+# std feature is required for error conversion
+rustls = { version = "0.23", default-features = false, features = ["std"] }
+# AtomicWaker and FutureExt
 futures = "0.3"
+# SockRef
 socket2 = "0.5"
 
 [dev-dependencies]
 tokio = { version = "1", features = [ "full" ] }
+rustls = { version = "0.23", default-features = false, features = ["logging", "std", "tls12", "ring"] }
 rustls-pemfile = "2.0.0"
 ntest = "0.9"
 rstest = "0.18"
diff --git a/src/stream.rs b/src/stream.rs
index 2848201..c50a4d2 100644
--- a/src/stream.rs
+++ b/src/stream.rs
@@ -10,12 +10,7 @@ use crate::handshake::handshake_task;
 use crate::handshake::HandshakeResult;
 use crate::trace;
 use crate::TestOptions;
-use futures::future::poll_fn;
 use futures::task::AtomicWaker;
-use futures::task::Context;
-use futures::task::Poll;
-use futures::task::Waker;
-use futures::Future;
 use futures::FutureExt;
 use rustls::server::Acceptor;
 use rustls::server::ClientHello;
@@ -26,6 +21,8 @@ use rustls::ServerConfig;
 use rustls::ServerConnection;
 use std::cell::Cell;
 use std::fmt::Debug;
+use std::future::poll_fn;
+use std::future::Future;
 use std::io;
 use std::io::ErrorKind;
 use std::io::Write;
@@ -35,6 +32,9 @@ use std::rc::Rc;
 use std::sync::Arc;
 use std::sync::Mutex;
 use std::task::ready;
+use std::task::Context;
+use std::task::Poll;
+use std::task::Waker;
 use std::thread::sleep;
 use std::time::Duration;
 use tokio::io::AsyncRead;