diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5663ac49c8d8ba3115cb392e37abc44059eb2277..eb566f0d90c7e6d3819b5130356117a5815d56cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,9 +55,8 @@ ENDIF()
 ### DEPENDENCY MANAGEMENT with CONAN
 ###########################################
 message(STATUS "Build directory ${CMAKE_BINARY_DIR}")
-# include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-# conan_basic_setup()
 
+# TODO: Is this still necessary?
 # # fix grpc - remove unsecure (no-op ssl implementations)
 # string(REGEX REPLACE "grpc\\+?\\+?_unsecure" "" CONAN_LIBS_GRPC
 #     "${CONAN_LIBS_GRPC}")
@@ -82,6 +81,8 @@ add_subdirectory(doc)
 ### CODE GENERATION (WITH GRPC)
 ####################################################################
 
+# TODO: Replace this with the protobuf_generate_cpp function
+
 # Protobuf/Grpc source files
 set(PROTO_FILES
     ${PROJECT_SOURCE_DIR}/proto/proto/caosdb/info/v1/main.proto
@@ -231,6 +232,7 @@ target_include_directories(ccaosdb PUBLIC
 
 
 # ccaosdbcli
+# ----------
 add_executable(ccaosdbcli EXCLUDE_FROM_ALL src/ccaosdbcli.c)
 target_include_directories(ccaosdbcli PUBLIC
     $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
@@ -311,7 +313,7 @@ if(_LINTING)
     add_compiler_flag("-Wall")
     add_compiler_flag("-Wextra")
     add_compiler_flag("-pedantic")
-    add_compiler_flag("-Werror")
+    # add_compiler_flag("-Werror") # removed until issue #71 is resolved
 
     message(STATUS "PEDANTIC_CMAKE_CXX_FLAGS: [${PEDANTIC_CMAKE_CXX_FLAGS}]")
     set(TARGET_CAOSDB_COMPILE_FLAGS "${TARGET_CAOSDB_COMPILE_FLAGS} ${PEDANTIC_CMAKE_CXX_FLAGS}")
@@ -355,11 +357,11 @@ if(_LINTING)
     else()
         message(STATUS "clang-tidy: ${clang_tidy}")
         set(_CMAKE_CXX_CLANG_TIDY_CHECKS
-            "--checks=*,-fuchsia-*,-llvmlibc-*,-readability-convert-member-functions-to-static,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay,-llvm-else-after-return,-readability-else-after-return,-modernize-use-trailing-return-type,-bugprone-branch-clone,-altera-*")
+            "--checks=*,-fuchsia-*,-llvmlibc-*,-readability-convert-member-functions-to-static,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay,-llvm-else-after-return,-readability-else-after-return,-modernize-use-trailing-return-type,-bugprone-branch-clone,-altera-*,-misc-include-cleaner,-readability-identifier-*,-llvm-include-order,-misc-const-correctness")
         set(_CMAKE_C_CLANG_TIDY_CHECKS "${_CMAKE_CXX_CLANG_TIDY_CHECKS}")
         set(_CMAKE_CXX_CLANG_TIDY "${clang_tidy}"
-            "--header-filter=caosdb/.*[^\(\.pb\.h\)]$"
-            "--warnings-as-errors=*")
+            "--header-filter=caosdb/.*[^\(\.pb\.h\)]$")
+            # "--warnings-as-errors=*")
         set(_CMAKE_C_CLANG_TIDY "${_CMAKE_CXX_CLANG_TIDY}")
         option(AUTO_FIX_LINTING "Append --fix option to clang-tidy" OFF)
         if(AUTO_FIX_LINTING)