diff --git a/src/socks.rs b/src/socks.rs
index 333db04..c848310 100644
--- a/src/socks.rs
+++ b/src/socks.rs
@@ -100,8 +100,8 @@ pub(crate) struct SocksConnection {
     client_outbuf: VecDeque<u8>,
     server_outbuf: VecDeque<u8>,
     data_buf: VecDeque<u8>,
-    manager: Rc<dyn ConnectionManager>,
     version: SocksVersion,
+    credentials: Option<Credentials>,
 }
 
 impl SocksConnection {
@@ -118,15 +118,15 @@ impl SocksConnection {
             client_outbuf: VecDeque::default(),
             server_outbuf: VecDeque::default(),
             data_buf: VecDeque::default(),
-            manager,
             version,
+            credentials: manager.get_credentials().clone(),
         };
         result.send_client_hello()?;
         Ok(result)
     }
 
     fn send_client_hello(&mut self) -> Result<(), Error> {
-        let credentials = self.manager.get_credentials();
+        let credentials = &self.credentials;
         match self.version {
             SocksVersion::V4 => {
                 self.server_outbuf.extend(&[
@@ -207,15 +207,15 @@ impl SocksConnection {
             return Err("SOCKS5 server replied with an unexpected version.".into());
         }
 
-        if self.server_inbuf[1] != 0 && self.manager.get_credentials().is_none()
-            || self.server_inbuf[1] != 2 && self.manager.get_credentials().is_some()
+        if self.server_inbuf[1] != 0 && self.credentials.is_none()
+            || self.server_inbuf[1] != 2 && self.credentials.is_some()
         {
             return Err("SOCKS5 server requires an unsupported authentication method.".into());
         }
 
         self.server_inbuf.drain(0..2);
 
-        if self.manager.get_credentials().is_some() {
+        if self.credentials.is_some() {
             self.state = SocksState::SendAuthData;
         } else {
             self.state = SocksState::SendRequest;
@@ -232,7 +232,7 @@ impl SocksConnection {
 
     fn send_auth_data(&mut self) -> Result<(), Error> {
         let tmp = Credentials::default();
-        let credentials = self.manager.get_credentials().as_ref().unwrap_or(&tmp);
+        let credentials = self.credentials.as_ref().unwrap_or(&tmp);
         self.server_outbuf
             .extend(&[1u8, credentials.username.len() as u8]);
         self.server_outbuf.extend(&credentials.username);
diff --git a/src/stream.rs b/src/stream.rs
new file mode 100644
index 0000000..6527fdc
--- /dev/null
+++ b/src/stream.rs
@@ -0,0 +1,50 @@
+use std::collections::VecDeque;
+use std::io::{Read, Write};
+use mio::net::TcpStream;
+use crate::error::Error;
+
+struct Stream {
+    write_buf: VecDeque<u8>,
+}
+
+impl Stream {
+    pub fn writable_bytes(&self) -> usize {
+        return self.write_buf.len();
+    }
+
+    pub fn read_data(&mut self, data: &[u8]) {
+
+    }
+
+    pub fn forward(&mut self, tcp_stream: &mut TcpStream) {
+        //tcp_stream.write()
+    }
+
+    /*pub fn read(&mut self, tcp_socket: &mut smoltcp::socket::Socket::Tcp) {
+        //tcp_socket.read()
+    }*/
+}
+
+struct DnsProxy {
+    query: Vec<u8>,
+    response: Option<Vec<u8>>,
+}
+
+impl DnsProxy {
+    pub fn receive_query(payload: &[u8]) -> Result<Self, Error> {
+        if payload.len() > 0xffff {
+            return Err("DNS payload too large".into());
+        }
+        Ok(Self {
+            query: Vec::from(payload),
+            response: None,
+        })
+    }
+
+    pub fn get_response(&self) -> Result<Option<&[u8]>, Error> {
+        Ok(match &self.response {
+            None => None,
+            Some(bytes) => Some(bytes.as_slice())
+        })
+    }
+}
\ No newline at end of file
diff --git a/src/tun2proxy.rs b/src/tun2proxy.rs
index 402759b..ec984b4 100644
--- a/src/tun2proxy.rs
+++ b/src/tun2proxy.rs
@@ -350,6 +350,7 @@ impl<'a> TunToProxy<'a> {
         if let Some(mut conn) = self.connections.remove(connection) {
             let token = &conn.token;
             self.token_to_connection.remove(token);
+            self.sockets.remove(conn.smoltcp_handle);
             _ = self.poll.registry().deregister(&mut conn.mio_stream);
             info!("CLOSE {}", connection);
         }