diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21ff22088bcfd9a742f419986df0d0e0cdd5a511..af09319827bfc0f675634faef2416edc1ed7ae88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,11 +25,11 @@ include( PrintBuildInfo )
 
 # Project's dependencies.
 find_package( GeoModelCore 3.2.0 REQUIRED )
-find_package( Qt5 COMPONENTS Core Sql REQUIRED )
+# find_package( Qt5 COMPONENTS Core Sql REQUIRED )
 find_package( SQLite3 REQUIRED )
 
 # Set sub-packages to build.
-add_subdirectory( GeoModelErrorHandler )
+# add_subdirectory( GeoModelErrorHandler ) // unused at the moment.
 add_subdirectory( GeoModelDBManager )
 add_subdirectory( TFPersistification )
 add_subdirectory( GeoModelRead )
diff --git a/GeoModelDBManager/src/GMDBManager.cpp b/GeoModelDBManager/src/GMDBManager.cpp
index b3d798c78d1ca918f1cb6700e62dad03e6659e39..5189dff460f23ac05ba81e61f956a9ca75b8f609 100644
--- a/GeoModelDBManager/src/GMDBManager.cpp
+++ b/GeoModelDBManager/src/GMDBManager.cpp
@@ -8,18 +8,11 @@
 
 #include <GeoModelDBManager/GMDBManager.h>
 
-// fmt library
-#define FMT_HEADER_ONLY 1
+// include the 'fmt' library, which is hosted locally as header-only
+#define FMT_HEADER_ONLY 1 // to use 'fmt' header-only
 #include "fmt/format.h"
 
-
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QSqlRecord>
-#include <QSqlDriver>
-#include <QDebug>
-
-
+// C++ includes
 #include <stdlib.h> /* exit, EXIT_FAILURE */
 #include <sstream>
 
diff --git a/GeoModelWrite/src/WriteGeoModel.cpp b/GeoModelWrite/src/WriteGeoModel.cpp
index cda91242f44be35b723a7c9e0a3811006e146b99..2454c0fd7eadefc47a860d58678261a8c60ba4da 100644
--- a/GeoModelWrite/src/WriteGeoModel.cpp
+++ b/GeoModelWrite/src/WriteGeoModel.cpp
@@ -1446,7 +1446,7 @@ unsigned int WriteGeoModel::addFullPhysVol(const unsigned int &logVolId, const u
 {
 	std::vector<std::vector<std::string>>* container = &m_fullPhysVols;
 	std::vector<std::string> values;
-  values.push_back( std::to_string(logVolId) ); 
+  values.push_back( std::to_string(logVolId) );
 	unsigned int idx = addRecord(container, values);
 	if (isRootVolume) {
 		std::vector<std::string> rootValues;