diff --git a/src/cpm_application.cpp b/src/cpm_application.cpp
index f832387..0a89efe 100644
--- a/src/cpm_application.cpp
+++ b/src/cpm_application.cpp
@@ -11,7 +11,6 @@
 #include <vanetza/btp/ports.hpp>
 #include <vanetza/asn1/cpm.hpp>
 #include <vanetza/asn1/packet_visitor.hpp>
-#include <vanetza/facilities/cpm_functions.hpp>
 #include <chrono>
 #include <functional>
 #include <iostream>
@@ -30,7 +29,6 @@
 #include <math.h>
 
 using namespace vanetza;
-using namespace vanetza::facilities;
 using namespace std::chrono;
 
 namespace v2x {
@@ -612,7 +610,7 @@ namespace v2x {
     sqlite3 *db = NULL;
     char* err = NULL;
 
-    int ret = sqlite3_open("./src/autoware_v2x/db/autoware_v2x.db", &db);
+    int ret = sqlite3_open("autoware_v2x.db", &db);
     if (ret != SQLITE_OK) {
       RCLCPP_INFO(node_->get_logger(), "DB File Open Error");
       return;
@@ -648,7 +646,7 @@ namespace v2x {
     sqlite3 *db = NULL;
     char* err = NULL;
 
-    int ret = sqlite3_open("./src/autoware_v2x/db/autoware_v2x.db", &db);
+    int ret = sqlite3_open("autoware_v2x.db", &db);
     if (ret != SQLITE_OK) {
       RCLCPP_INFO(node_->get_logger(), "DB File Open Error");
       return;
diff --git a/src/v2x_app.cpp b/src/v2x_app.cpp
index b6498b3..0eaf010 100644
--- a/src/v2x_app.cpp
+++ b/src/v2x_app.cpp
@@ -14,7 +14,6 @@
 #include "tf2/LinearMath/Matrix3x3.h"
 
 #include <vanetza/asn1/cpm.hpp>
-#include <vanetza/facilities/cpm_functions.hpp>
 #include <sstream>
 #include <memory>
 #include <GeographicLib/UTMUPS.hpp>
@@ -25,7 +24,6 @@
 namespace gn = vanetza::geonet;
 
 using namespace vanetza;
-using namespace vanetza::facilities;
 using namespace std::chrono;
 
 namespace v2x
diff --git a/src/v2x_node.cpp b/src/v2x_node.cpp
index a951625..f83fa54 100644
--- a/src/v2x_node.cpp
+++ b/src/v2x_node.cpp
@@ -11,7 +11,6 @@
 #include "std_msgs/msg/string.hpp"
 
 #include <vanetza/asn1/cpm.hpp>
-#include <vanetza/facilities/cpm_functions.hpp>
 #include <sstream>
 #include <memory>
 #include <boost/thread.hpp>
@@ -25,7 +24,6 @@
 namespace gn = vanetza::geonet;
 
 using namespace vanetza;
-using namespace vanetza::facilities;
 using namespace std::chrono;
 
 namespace v2x