diff --git a/.gitignore b/.gitignore
index 160d993..f74e2b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@
 coverage/
 *.test
 cmake-build-debug/
+cmake-build-release/
 .idea/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f673bea..ab7cb37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,8 @@ project(LIBMQTT)
 set (LIBMQTT_VERSION_MAJOR 0)
 set (LIBMQTT_VERSION_MINOR 1)
 
-set(CMAKE_CFLAGS "-g -Wall -Os -pthread")
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -fprofile-arcs -ftest-coverage -O0 -pthread -DDEBUG=1")
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wall -Os -pthread")
 
 if (UNIX)
     set(PLATFORM_CODE platform/linux.c)
@@ -20,13 +21,10 @@ include_directories("${PROJECT_BINARY_DIR}")
 include_directories("${PROJECT_SOURCE_DIR}/platform")
 
 
-set(mqtt-source src/debug.c src/mqtt.c src/packet.c src/protocol.c src/state_queue.c src/subscriptions.c ${PLATFORM_CODE})
+set(mqtt-source src/mqtt.c src/packet.c src/protocol.c src/state_queue.c src/subscriptions.c ${PLATFORM_CODE})
 
 add_library(mqtt-full STATIC ${mqtt-source})
-    target_compile_definitions(mqtt-full PRIVATE DEBUG=1 MQTT_SERVER=1 MQTT_CLIENT=1)
-
-add_library(mqtt-debug STATIC ${mqtt-source})
-    target_compile_definitions(mqtt-full PRIVATE DEBUG=1 MQTT_SERVER=1 MQTT_CLIENT=1)
+    target_compile_definitions(mqtt-full PRIVATE MQTT_SERVER=1 MQTT_CLIENT=1)
 
 add_library(mqtt_static STATIC ${mqtt-source})
 add_library(mqtt SHARED ${mqtt-source})
@@ -35,10 +33,10 @@ add_library(mqtt SHARED ${mqtt-source})
 include_directories ("${PROJECT_SOURCE_DIR}/src")
 
 add_executable (connect_publish.test tests/connect_publish.c)
-    target_link_libraries (connect_publish.test mqtt-debug ${PLATFORM_LIBS})
+    target_link_libraries (connect_publish.test mqtt-full ${PLATFORM_LIBS})
 
 add_executable (connect_subscribe.test tests/connect_subscribe.c)
-    target_link_libraries (connect_subscribe.test mqtt-debug ${PLATFORM_LIBS})
+    target_link_libraries (connect_subscribe.test mqtt-full ${PLATFORM_LIBS})
 
 add_executable (decode_packet.test tests/decode_packet.c)
     target_link_libraries (decode_packet.test mqtt-full ${PLATFORM_LIBS})
diff --git a/Makefile.linux b/Makefile.linux
index ad7acbc..c8aba7d 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -1,4 +1,4 @@
-SRCS=src/mqtt.c src/packet.c src/protocol.c src/state_queue.c src/subscriptions.c src/debug.c platform/linux.c
+SRCS=src/mqtt.c src/packet.c src/protocol.c src/state_queue.c src/subscriptions.c platform/linux.c
 OBJS=$(SRCS:%.c=%.o)
 DEBUG_OBJS=$(SRCS:%.c=%.do)
 COVERAGE_FILES=$(SRCS:%.c=%.gcno) $(SRCS:%.c=%.gcda)
diff --git a/src/debug.c b/src/debug.c
deleted file mode 100644
index ac7a1f8..0000000
--- a/src/debug.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#if DEBUG
-
-#include "stdio.h"
-
-#include "debug.h"
-
-#endif /* DEBUG */