diff --git a/src/class_diagram/generators/plantuml/class_diagram_generator.h b/src/class_diagram/generators/plantuml/class_diagram_generator.h
index 9b8ec30d..4aabbaee 100644
--- a/src/class_diagram/generators/plantuml/class_diagram_generator.h
+++ b/src/class_diagram/generators/plantuml/class_diagram_generator.h
@@ -24,7 +24,6 @@
 #include "common/generators/plantuml/generator.h"
 #include "common/model/relationship.h"
 #include "config/config.h"
-#include "cx/compilation_database.h"
 #include "util/util.h"
 
 #include <cppast/cpp_entity_index.hpp>
diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index 83c8f9c1..bba81ad8 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -18,6 +18,8 @@
 
 #include "translation_unit_visitor.h"
 
+#include "cx/util.h"
+
 #include <cppast/cpp_alias_template.hpp>
 #include <cppast/cpp_array_type.hpp>
 #include <cppast/cpp_class_template.hpp>
@@ -789,7 +791,7 @@ void translation_unit_visitor::process_field(
     auto tr_declaration = cppast::to_string(tr);
 
     LOG_DBG("Processing field {} with unreferenced type of kind {}", mv.name(),
-        cx::to_string(tr.kind()));
+        cppast::to_string(tr.kind()));
 
     if (tr.kind() == cppast::cpp_type_kind::builtin_t) {
         LOG_DBG("Builtin type found for field: {}", m.name());
@@ -1323,7 +1325,7 @@ bool translation_unit_visitor::find_relationships(const cppast::cpp_type &t_,
         cx::util::full_name(cppast::remove_cv(t_), ctx.entity_index(), false);
 
     LOG_DBG("Finding relationships for type {}, {}, {}", cppast::to_string(t_),
-        cx::to_string(t_.kind()), fn);
+        cppast::to_string(t_.kind()), fn);
 
     relationship_t relationship_type = relationship_hint;
     const auto &t = cppast::remove_cv(cx::util::unreferenced(t_));
diff --git a/src/class_diagram/visitor/translation_unit_visitor.h b/src/class_diagram/visitor/translation_unit_visitor.h
index 0a611b5b..1a7fcf6d 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.h
+++ b/src/class_diagram/visitor/translation_unit_visitor.h
@@ -20,7 +20,6 @@
 #include "class_diagram/model/diagram.h"
 #include "class_diagram/visitor/translation_unit_context.h"
 #include "config/config.h"
-#include "cx/cursor.h"
 
 #include <clang-c/CXCompilationDatabase.h>
 #include <clang-c/Index.h>
diff --git a/src/cx/util.cc b/src/cx/util.cc
index 77520069..40f0ad71 100644
--- a/src/cx/util.cc
+++ b/src/cx/util.cc
@@ -32,54 +32,6 @@ namespace clanguml {
 namespace cx {
 namespace util {
 
-std::string to_string(CXString &&cxs)
-{
-    std::string r{clang_getCString(cxs)};
-    clang_disposeString(cxs);
-    return r;
-}
-
-std::string to_string(cppast::cpp_type_kind t)
-{
-    using namespace cppast;
-    switch (t) {
-    case cpp_type_kind::builtin_t:
-        return "builtin";
-    case cpp_type_kind::user_defined_t:
-        return "user_defined";
-    case cpp_type_kind::auto_t:
-        return "auto";
-    case cpp_type_kind::decltype_t:
-        return "decltype";
-    case cpp_type_kind::decltype_auto_t:
-        return "decltype_auto";
-    case cpp_type_kind::cv_qualified_t:
-        return "cv_qualified";
-    case cpp_type_kind::pointer_t:
-        return "pointer";
-    case cpp_type_kind::reference_t:
-        return "reference";
-    case cpp_type_kind::array_t:
-        return "array";
-    case cpp_type_kind::function_t:
-        return "function";
-    case cpp_type_kind::member_function_t:
-        return "member_function";
-    case cpp_type_kind::member_object_t:
-        return "member_object";
-    case cpp_type_kind::template_parameter_t:
-        return "template_parameter";
-    case cpp_type_kind::template_instantiation_t:
-        return "template_instantiation";
-    case cpp_type_kind::dependent_t:
-        return "dependent";
-    case cpp_type_kind::unexposed_t:
-        return "unexposed";
-    default:
-        return "invalid";
-    }
-}
-
 std::string full_name(
     const common::model::namespace_ &current_ns, const cppast::cpp_entity &e)
 {
diff --git a/src/cx/util.h b/src/cx/util.h
index 65118171..cd8e1564 100644
--- a/src/cx/util.h
+++ b/src/cx/util.h
@@ -31,20 +31,6 @@ namespace clanguml {
 namespace cx {
 namespace util {
 
-/**
- * @brief Convert CXString to std::string
- *
- * This function creates a new std::string from a CXString
- * and releases the CXString.
- *
- * @param cxs libclang string instance
- *
- * @return std::string instance
- */
-std::string to_string(CXString &&cxs);
-
-std::string to_string(cppast::cpp_type_kind t);
-
 std::string full_name(
     const common::model::namespace_ &current_ns, const cppast::cpp_entity &e);
 
diff --git a/src/include_diagram/generators/plantuml/include_diagram_generator.h b/src/include_diagram/generators/plantuml/include_diagram_generator.h
index 314bde18..3c1f1d7b 100644
--- a/src/include_diagram/generators/plantuml/include_diagram_generator.h
+++ b/src/include_diagram/generators/plantuml/include_diagram_generator.h
@@ -22,7 +22,6 @@
 #include "common/model/relationship.h"
 #include "common/model/source_file.h"
 #include "config/config.h"
-#include "cx/compilation_database.h"
 #include "include_diagram/model/diagram.h"
 #include "include_diagram/visitor/translation_unit_visitor.h"
 #include "util/util.h"
diff --git a/src/include_diagram/visitor/translation_unit_visitor.h b/src/include_diagram/visitor/translation_unit_visitor.h
index e4a44bca..e5a7cfb1 100644
--- a/src/include_diagram/visitor/translation_unit_visitor.h
+++ b/src/include_diagram/visitor/translation_unit_visitor.h
@@ -20,7 +20,6 @@
 #include "common/model/enums.h"
 #include "common/model/package.h"
 #include "config/config.h"
-#include "cx/cursor.h"
 #include "include_diagram/model/diagram.h"
 #include "include_diagram/visitor/translation_unit_context.h"
 
diff --git a/src/main.cc b/src/main.cc
index a4238119..547f317c 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -18,7 +18,6 @@
 
 #include "class_diagram/generators/plantuml/class_diagram_generator.h"
 #include "config/config.h"
-#include "cx/compilation_database.h"
 #include "include_diagram/generators/plantuml/include_diagram_generator.h"
 #include "package_diagram/generators/plantuml/package_diagram_generator.h"
 #include "sequence_diagram/generators/plantuml/sequence_diagram_generator.h"
@@ -38,7 +37,6 @@
 
 using namespace clanguml;
 using config::config;
-using cx::compilation_database;
 
 void print_diagrams_list(const clanguml::config::config &cfg);
 
diff --git a/src/package_diagram/generators/plantuml/package_diagram_generator.h b/src/package_diagram/generators/plantuml/package_diagram_generator.h
index bc416afa..f4eaeec5 100644
--- a/src/package_diagram/generators/plantuml/package_diagram_generator.h
+++ b/src/package_diagram/generators/plantuml/package_diagram_generator.h
@@ -21,7 +21,6 @@
 #include "common/model/package.h"
 #include "common/model/relationship.h"
 #include "config/config.h"
-#include "cx/compilation_database.h"
 #include "package_diagram/model/diagram.h"
 #include "package_diagram/visitor/translation_unit_visitor.h"
 #include "util/util.h"
diff --git a/src/package_diagram/visitor/translation_unit_visitor.cc b/src/package_diagram/visitor/translation_unit_visitor.cc
index 9019c9c9..e80fd008 100644
--- a/src/package_diagram/visitor/translation_unit_visitor.cc
+++ b/src/package_diagram/visitor/translation_unit_visitor.cc
@@ -19,6 +19,7 @@
 #include "translation_unit_visitor.h"
 
 #include "common/model/namespace.h"
+#include "cx/util.h"
 
 #include <cppast/cpp_alias_template.hpp>
 #include <cppast/cpp_array_type.hpp>
@@ -412,7 +413,7 @@ bool translation_unit_visitor::find_relationships(const cppast::cpp_type &t_,
     const auto fn_ns = cx::util::ns(cppast::remove_cv(t_), ctx.entity_index());
 
     LOG_DBG("Finding relationships for type {}, {}, {}", cppast::to_string(t_),
-        cx::to_string(t_.kind()), fn);
+        cppast::to_string(t_.kind()), fn);
 
     relationship_t relationship_type = relationship_hint;
     const auto &t = cppast::remove_cv(cx::util::unreferenced(t_));
diff --git a/src/package_diagram/visitor/translation_unit_visitor.h b/src/package_diagram/visitor/translation_unit_visitor.h
index 051f6cd8..623d75fc 100644
--- a/src/package_diagram/visitor/translation_unit_visitor.h
+++ b/src/package_diagram/visitor/translation_unit_visitor.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include "config/config.h"
-#include "cx/cursor.h"
 #include "package_diagram/model/diagram.h"
 #include "package_diagram/visitor/translation_unit_context.h"
 
diff --git a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.h b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.h
index efcf1c0c..9b36eede 100644
--- a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.h
+++ b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.h
@@ -19,7 +19,6 @@
 
 #include "common/generators/plantuml/generator.h"
 #include "config/config.h"
-#include "cx/compilation_database.h"
 #include "sequence_diagram/model/diagram.h"
 #include "sequence_diagram/visitor/translation_unit_visitor.h"
 #include "util/util.h"
diff --git a/src/sequence_diagram/visitor/translation_unit_context.cc b/src/sequence_diagram/visitor/translation_unit_context.cc
index b8d6fcec..b2b08ba6 100644
--- a/src/sequence_diagram/visitor/translation_unit_context.cc
+++ b/src/sequence_diagram/visitor/translation_unit_context.cc
@@ -62,14 +62,4 @@ const cppast::cpp_entity_index &translation_unit_context::entity_index() const
     return entity_index_;
 }
 
-void translation_unit_context::set_current_method(cx::cursor method)
-{
-    current_method_ = method;
-}
-
-cx::cursor &translation_unit_context::current_method()
-{
-    return current_method_;
-}
-
 }
diff --git a/src/sequence_diagram/visitor/translation_unit_context.h b/src/sequence_diagram/visitor/translation_unit_context.h
index 739bf5d7..6a71ab3d 100644
--- a/src/sequence_diagram/visitor/translation_unit_context.h
+++ b/src/sequence_diagram/visitor/translation_unit_context.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include "config/config.h"
-#include "cx/cursor.h"
 #include "sequence_diagram/model/diagram.h"
 
 #include <cppast/cpp_entity_index.hpp>
@@ -47,10 +46,6 @@ public:
 
     clanguml::sequence_diagram::model::diagram &diagram();
 
-    void set_current_method(cx::cursor method);
-
-    cx::cursor &current_method();
-
 private:
     // Reference to the cppast entity index
     cppast::cpp_entity_index &entity_index_;
@@ -58,7 +53,6 @@ private:
     const clanguml::config::sequence_diagram &config_;
 
     std::vector<std::string> namespace_;
-    cx::cursor current_method_;
 };
 
 }
diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.cc b/src/sequence_diagram/visitor/translation_unit_visitor.cc
index 001de746..8923b844 100644
--- a/src/sequence_diagram/visitor/translation_unit_visitor.cc
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.cc
@@ -19,6 +19,7 @@
 #include "translation_unit_visitor.h"
 
 #include "common/model/namespace.h"
+#include "cx/util.h"
 #include "translation_unit_context.h"
 
 #include <cppast/cpp_function.hpp>
diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.h b/src/sequence_diagram/visitor/translation_unit_visitor.h
index 064ac399..d732b061 100644
--- a/src/sequence_diagram/visitor/translation_unit_visitor.h
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include "config/config.h"
-#include "cx/cursor.h"
 #include "sequence_diagram/model/diagram.h"
 #include "sequence_diagram/visitor/translation_unit_context.h"
 
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index 2a88894e..99d7ff38 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -40,17 +40,6 @@ load_config(const std::string &test_name)
     return std::make_pair(std::move(config), std::move(db));
 }
 
-std::pair<clanguml::config::config, compilation_database> load_config2(
-    const std::string &test_name)
-{
-    auto config = clanguml::config::load(test_name + "/.clang-uml");
-
-    auto db = clanguml::cx::compilation_database::from_directory(
-        config.compilation_database_dir());
-
-    return std::make_pair(std::move(config), std::move(db));
-}
-
 std::unique_ptr<clanguml::sequence_diagram::model::diagram>
 generate_sequence_diagram(cppast::libclang_compilation_database &db,
     std::shared_ptr<clanguml::config::diagram> diagram)
diff --git a/tests/test_cases.h b/tests/test_cases.h
index 898ac8f9..e8400782 100644
--- a/tests/test_cases.h
+++ b/tests/test_cases.h
@@ -23,7 +23,7 @@
 #include "class_diagram/model/diagram.h"
 #include "class_diagram/visitor/translation_unit_visitor.h"
 #include "config/config.h"
-#include "cx/compilation_database.h"
+#include "cx/util.h"
 #include "include_diagram/generators/plantuml/include_diagram_generator.h"
 #include "include_diagram/visitor/translation_unit_visitor.h"
 #include "package_diagram/generators/plantuml/package_diagram_generator.h"
@@ -47,21 +47,10 @@ using Catch::Matchers::EndsWith;
 using Catch::Matchers::Equals;
 using Catch::Matchers::StartsWith;
 using Catch::Matchers::VectorContains;
-using clanguml::cx::compilation_database;
 using namespace clanguml::util;
 
 std::pair<clanguml::config::config, cppast::libclang_compilation_database>
 load_config(const std::string &test_name);
-std::pair<clanguml::config::config, compilation_database> load_config2(
-    const std::string &test_name);
-
-clanguml::sequence_diagram::model::diagram generate_sequence_diagram(
-    compilation_database &db,
-    std::shared_ptr<clanguml::config::diagram> diagram);
-
-clanguml::class_diagram::model::diagram generate_class_diagram(
-    compilation_database &db,
-    std::shared_ptr<clanguml::config::diagram> diagram);
 
 std::string generate_sequence_puml(
     std::shared_ptr<clanguml::config::diagram> config,