diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdc2322b079634d4584e2b764d23cc023db3b99e..67e5e06cc3c854c3284714e0080f85fd3ec5daf4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,4 +3,3 @@ cmake_minimum_required(VERSION 2.8)
 
 add_subdirectory(session)
 add_subdirectory(stream)
-
diff --git a/session/CMakeLists.txt b/session/CMakeLists.txt
index a0da53fa2e99f4c16916ca1703b5c3db9893bccb..5da3fad2954ce4718d65b1eb3ad7758bdfb4f15f 100644
--- a/session/CMakeLists.txt
+++ b/session/CMakeLists.txt
@@ -8,6 +8,3 @@ add_library(${PROJECT_NAME} STATIC ${SESSION_SRCS})
 target_link_libraries(dap_session dap_core dap_crypto)
 
 target_include_directories(dap_session INTERFACE .)
-set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)
-
-set(${PROJECT_NAME}_INCLUDE_DIRS ${PROJECT_SOURCE_DIR} CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE)
diff --git a/stream/dap_stream.c b/stream/dap_stream.c
index a1380480aa42b6e9d1436e499ca2a2cb541342e5..da8c29470a4ef576d88c96986aaec93bde60cbd5 100644
--- a/stream/dap_stream.c
+++ b/stream/dap_stream.c
@@ -111,7 +111,7 @@ void dap_stream_add_proc_http(struct dap_http * sh, const char * url)
  */
 void dap_stream_add_proc_udp(dap_udp_server_t * sh)
 {
-    dap_server_t* server = sh->dap_server;
+    dap_server_t* server =  sh->dap_server;
     server->client_read_callback = s_data_read;
     server->client_write_callback = stream_dap_data_write;
     server->client_delete_callback = stream_dap_delete;
@@ -277,6 +277,17 @@ dap_stream_t * stream_new(dap_http_client_t * sh)
     return ret;
 }
 
+void dap_stream_delete(dap_stream_t * a_stream)
+{
+    if(a_stream == NULL)
+        return;
+    size_t i;
+    for(i = 0; i < a_stream->channel_count; i++)
+        dap_stream_ch_delete(a_stream->channel[i]);
+    if(a_stream->session)
+        dap_stream_session_close(a_stream->session->id);
+    free(a_stream);
+}
 
 /**
  * @brief dap_stream_new_es
@@ -571,8 +582,6 @@ static bool _detect_loose_packet(dap_stream_t * sid)
     int count_loosed_packets = ch_pkt->hdr.seq_id - (sid->last_seq_id_packet + 1);
     if(count_loosed_packets > 0)
     {
-        int count_loosed = sid->last_seq_id_packet + 1;
-
         log_it(L_WARNING, "Detected loosed %d packets. "
                           "Last read seq_id packet: %d Current: %d", count_loosed_packets,
                sid->last_seq_id_packet, ch_pkt->hdr.seq_id);
diff --git a/stream/dap_stream.h b/stream/dap_stream.h
index 2933cea9718e72f0b1186ae4d2366f8c40e7caa4..1f4759ec2893cd6117deb13fdaf6e8dd4dd19374 100644
--- a/stream/dap_stream.h
+++ b/stream/dap_stream.h
@@ -29,6 +29,8 @@
 
 #include "dap_stream_session.h"
 #include "dap_stream_ch.h"
+//#include "dap_udp_server.h"
+//#include "dap_udp_client.h"
 #include "dap_events_socket.h"
 #include "dap_udp_server.h"
 #include "dap_udp_client.h"