diff --git a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h
--- a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h
+++ b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "DatabaseQueryExecutor.h"
-// TODO: includes may be conditional if we base on the preprocessor
 #include "SQLiteQueryExecutor.h"
 
 #include <mutex>
diff --git a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp
--- a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp
+++ b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp
@@ -21,8 +21,6 @@
 const std::string DATABASE_MANAGER_STATUS_KEY = "DATABASE_MANAGER_STATUS";
 
 const DatabaseQueryExecutor &DatabaseManager::getQueryExecutor() {
-  //  TODO: conditionally create desired type of db manager
-  //  maybe basing on some preprocessor flag
   thread_local SQLiteQueryExecutor instance;
 
   // creating an instance means that migration code was executed