diff --git a/CMakeLists.txt b/CMakeLists.txt
index f803bc0..06d700e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,9 +12,16 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 
-option(ENDO_TRACE "Enables debug output" ON)
-option(ENDO_TRACE_PARSER "Enables debug output for Parser" ON)
-option(ENDO_TRACE_LEXER "Enables debug output for Lexer" ON)
+option(ENDO_TRACE "Enables debug output" OFF)
+option(ENDO_TRACE_PARSER "Enables debug output for Parser" OFF)
+option(ENDO_TRACE_LEXER "Enables debug output for Lexer" OFF)
+
+if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+    set(ENDO_TRACE ON)
+    set(ENDO_TRACE_PARSER ON)
+    set(ENDO_TRACE_LEXER ON)
+endif()
+
 
 include(EnableCcache)
 include(EndoThirdParties)
@@ -38,7 +45,10 @@ enable_testing()
 
 add_subdirectory(src)
 EndoThirdPartiesSummary2()
-message(" flags ")
-message(" ENDO_TRACE :  ${ENDO_TRACE}")
-message(" ENDO_TRACE_PARSER :  ${ENDO_TRACE_PARSER}")
-message(" ENDO_TRACE_LEXER :  ${ENDO_TRACE_LEXER}")
+message(STATUS "--------------------------------")
+message(STATUS "          output flags          ")
+message(STATUS "--------------------------------")
+message(STATUS "endo trace          ${ENDO_TRACE}")
+message(STATUS "endo trace parser   ${ENDO_TRACE_PARSER}")
+message(STATUS "endo trace lexer    ${ENDO_TRACE_LEXER}")
+message(STATUS "--------------------------------")
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index f95554c..3107b75 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -27,7 +27,6 @@ target_link_libraries(Shell PUBLIC fmt::fmt-header-only vtparser crispy::core Co
 
 
 if(ENDO_TRACE)
-  message("HERE")
   target_compile_definitions(Shell PUBLIC ENDO_TRACE)
 endif()
 if(ENDO_TRACE_PARSER)