diff --git a/tokio-xmpp/README.md b/tokio-xmpp/README.md
index eccc836f..07102426 100644
--- a/tokio-xmpp/README.md
+++ b/tokio-xmpp/README.md
@@ -1,6 +1,4 @@
 # TODO
 
-- [ ] minidom ns
-- [ ] replace debug output with log crate
-- [ ] customize tls verify?
+- [ ] allow tls verify customization
 - [ ] more tests
diff --git a/tokio-xmpp/src/xmpp_stream.rs b/tokio-xmpp/src/xmpp_stream.rs
index 209b7e00..5f00de11 100644
--- a/tokio-xmpp/src/xmpp_stream.rs
+++ b/tokio-xmpp/src/xmpp_stream.rs
@@ -34,10 +34,6 @@ pub struct XMPPStream<S: AsyncRead + AsyncWrite + Unpin> {
     pub id: String,
 }
 
-// // TODO: fix this hack
-// unsafe impl<S: AsyncRead + AsyncWrite + Unpin> core::marker::Send for XMPPStream<S> {}
-// unsafe impl<S: AsyncRead + AsyncWrite + Unpin> Sync for XMPPStream<S> {}
-
 impl<S: AsyncRead + AsyncWrite + Unpin> XMPPStream<S> {
     /// Constructor
     pub fn new(
@@ -63,7 +59,6 @@ impl<S: AsyncRead + AsyncWrite + Unpin> XMPPStream<S> {
     }
 
     /// Unwraps the inner stream
-    // TODO: use this everywhere
     pub fn into_inner(self) -> S {
         self.stream.into_inner().unwrap().into_inner()
     }