diff --git a/include/dbus_utility.hpp b/include/dbus_utility.hpp
index b4a5e81..d1f4a84 100644
--- a/include/dbus_utility.hpp
+++ b/include/dbus_utility.hpp
@@ -5,19 +5,15 @@
 
 #include "boost_formatters.hpp"
 #include "dbus_singleton.hpp"
-#include "logging.hpp"
 
 #include <boost/system/error_code.hpp>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/property.hpp>
 #include <sdbusplus/message/native_types.hpp>
 
-#include <array>
 #include <cstddef>
 #include <cstdint>
-#include <filesystem>
 #include <functional>
-#include <regex>
 #include <span>
 #include <string>
 #include <string_view>
@@ -89,64 +85,25 @@
 
 using MapperEndPoints = std::vector<std::string>;
 
-inline void escapePathForDbus(std::string& path)
-{
-    const static std::regex reg("[^A-Za-z0-9_/]");
-    std::regex_replace(path.begin(), path.begin(), path.end(), reg, "_");
-}
+void escapePathForDbus(std::string& path);
 
-inline void logError(const boost::system::error_code& ec)
-{
-    if (ec)
-    {
-        BMCWEB_LOG_ERROR("DBus error: {}, cannot call method", ec);
-    }
-}
+void logError(const boost::system::error_code& ec);
 
 // gets the string N strings deep into a path
 // i.e.  /0th/1st/2nd/3rd
-inline bool getNthStringFromPath(const std::string& path, int index,
-                                 std::string& result)
-{
-    if (index < 0)
-    {
-        return false;
-    }
+bool getNthStringFromPath(const std::string& path, int index,
+                          std::string& result);
 
-    std::filesystem::path p1(path);
-    int count = -1;
-    for (const auto& element : p1)
-    {
-        if (element.has_filename())
-        {
-            ++count;
-            if (count == index)
-            {
-                result = element.stem().string();
-                break;
-            }
-        }
-    }
-    return count >= index;
-}
-
-inline void getAllProperties(
-    const std::string& service, const std::string& objectPath,
-    const std::string& interface,
-    std::function<void(const boost::system::error_code&,
-                       const DBusPropertiesMap&)>&& callback)
-{
-    sdbusplus::asio::getAllProperties(*crow::connections::systemBus, service,
-                                      objectPath, interface,
-                                      std::move(callback));
-}
+void getAllProperties(const std::string& service, const std::string& objectPath,
+                      const std::string& interface,
+                      std::function<void(const boost::system::error_code&,
+                                         const DBusPropertiesMap&)>&& callback);
 
 template <typename PropertyType>
-inline void getProperty(
-    const std::string& service, const std::string& objectPath,
-    const std::string& interface, const std::string& propertyName,
-    std::function<void(const boost::system::error_code&, const PropertyType&)>&&
-        callback)
+void getProperty(const std::string& service, const std::string& objectPath,
+                 const std::string& interface, const std::string& propertyName,
+                 std::function<void(const boost::system::error_code&,
+                                    const PropertyType&)>&& callback)
 {
     sdbusplus::asio::getProperty<PropertyType>(
         *crow::connections::systemBus, service, objectPath, interface,
@@ -154,186 +111,80 @@
 }
 
 template <typename PropertyType>
-inline void getProperty(
-    sdbusplus::asio::connection& /*conn*/, const std::string& service,
-    const std::string& objectPath, const std::string& interface,
-    const std::string& propertyName,
-    std::function<void(const boost::system::error_code&, const PropertyType&)>&&
-        callback)
+void getProperty(sdbusplus::asio::connection& /*conn*/,
+                 const std::string& service, const std::string& objectPath,
+                 const std::string& interface, const std::string& propertyName,
+                 std::function<void(const boost::system::error_code&,
+                                    const PropertyType&)>&& callback)
 {
     getProperty(service, objectPath, interface, propertyName,
                 std::move(callback));
 }
 
-inline void getAllProperties(
-    sdbusplus::asio::connection& /*conn*/, const std::string& service,
-    const std::string& objectPath, const std::string& interface,
-    std::function<void(const boost::system::error_code&,
-                       const DBusPropertiesMap&)>&& callback)
-{
-    getAllProperties(service, objectPath, interface, std::move(callback));
-}
+void getAllProperties(sdbusplus::asio::connection& /*conn*/,
+                      const std::string& service, const std::string& objectPath,
+                      const std::string& interface,
+                      std::function<void(const boost::system::error_code&,
+                                         const DBusPropertiesMap&)>&& callback);
 
-inline void checkDbusPathExists(const std::string& path,
-                                std::function<void(bool)>&& callback)
-{
-    crow::connections::systemBus->async_method_call(
-        [callback = std::move(callback)](const boost::system::error_code& ec,
-                                         const MapperGetObject& objectNames) {
-            callback(!ec && !objectNames.empty());
-        },
-        "xyz.openbmc_project.ObjectMapper",
-        "/xyz/openbmc_project/object_mapper",
-        "xyz.openbmc_project.ObjectMapper", "GetObject", path,
-        std::array<std::string, 0>());
-}
+void checkDbusPathExists(const std::string& path,
+                         std::function<void(bool)>&& callback);
 
-inline void getSubTree(
+void getSubTree(
     const std::string& path, int32_t depth,
     std::span<const std::string_view> interfaces,
     std::function<void(const boost::system::error_code&,
-                       const MapperGetSubTreeResponse&)>&& callback)
-{
-    crow::connections::systemBus->async_method_call(
-        [callback{std::move(callback)}](
-            const boost::system::error_code& ec,
-            const MapperGetSubTreeResponse& subtree) { callback(ec, subtree); },
-        "xyz.openbmc_project.ObjectMapper",
-        "/xyz/openbmc_project/object_mapper",
-        "xyz.openbmc_project.ObjectMapper", "GetSubTree", path, depth,
-        interfaces);
-}
+                       const MapperGetSubTreeResponse&)>&& callback);
 
-inline void getSubTreePaths(
+void getSubTreePaths(
     const std::string& path, int32_t depth,
     std::span<const std::string_view> interfaces,
     std::function<void(const boost::system::error_code&,
-                       const MapperGetSubTreePathsResponse&)>&& callback)
-{
-    crow::connections::systemBus->async_method_call(
-        [callback{std::move(callback)}](
-            const boost::system::error_code& ec,
-            const MapperGetSubTreePathsResponse& subtreePaths) {
-            callback(ec, subtreePaths);
-        },
-        "xyz.openbmc_project.ObjectMapper",
-        "/xyz/openbmc_project/object_mapper",
-        "xyz.openbmc_project.ObjectMapper", "GetSubTreePaths", path, depth,
-        interfaces);
-}
+                       const MapperGetSubTreePathsResponse&)>&& callback);
 
-inline void getAssociatedSubTree(
+void getAssociatedSubTree(
     const sdbusplus::message::object_path& associatedPath,
     const sdbusplus::message::object_path& path, int32_t depth,
     std::span<const std::string_view> interfaces,
     std::function<void(const boost::system::error_code&,
-                       const MapperGetSubTreeResponse&)>&& callback)
-{
-    crow::connections::systemBus->async_method_call(
-        [callback{std::move(callback)}](
-            const boost::system::error_code& ec,
-            const MapperGetSubTreeResponse& subtree) { callback(ec, subtree); },
-        "xyz.openbmc_project.ObjectMapper",
-        "/xyz/openbmc_project/object_mapper",
-        "xyz.openbmc_project.ObjectMapper", "GetAssociatedSubTree",
-        associatedPath, path, depth, interfaces);
-}
+                       const MapperGetSubTreeResponse&)>&& callback);
 
-inline void getAssociatedSubTreePaths(
+void getAssociatedSubTreePaths(
     const sdbusplus::message::object_path& associatedPath,
     const sdbusplus::message::object_path& path, int32_t depth,
     std::span<const std::string_view> interfaces,
     std::function<void(const boost::system::error_code&,
-                       const MapperGetSubTreePathsResponse&)>&& callback)
-{
-    crow::connections::systemBus->async_method_call(
-        [callback{std::move(callback)}](
-            const boost::system::error_code& ec,
-            const MapperGetSubTreePathsResponse& subtreePaths) {
-            callback(ec, subtreePaths);
-        },
-        "xyz.openbmc_project.ObjectMapper",
-        "/xyz/openbmc_project/object_mapper",
-        "xyz.openbmc_project.ObjectMapper", "GetAssociatedSubTreePaths",
-        associatedPath, path, depth, interfaces);
-}
+                       const MapperGetSubTreePathsResponse&)>&& callback);
 
-inline void getAssociatedSubTreeById(
+void getAssociatedSubTreeById(
     const std::string& id, const std::string& path,
     std::span<const std::string_view> subtreeInterfaces,
     std::string_view association,
     std::span<const std::string_view> endpointInterfaces,
     std::function<void(const boost::system::error_code&,
-                       const MapperGetSubTreeResponse&)>&& callback)
-{
-    crow::connections::systemBus->async_method_call(
-        [callback{std::move(callback)}](
-            const boost::system::error_code& ec,
-            const MapperGetSubTreeResponse& subtree) { callback(ec, subtree); },
-        "xyz.openbmc_project.ObjectMapper",
-        "/xyz/openbmc_project/object_mapper",
-        "xyz.openbmc_project.ObjectMapper", "GetAssociatedSubTreeById", id,
-        path, subtreeInterfaces, association, endpointInterfaces);
-}
+                       const MapperGetSubTreeResponse&)>&& callback);
 
-inline void getAssociatedSubTreePathsById(
+void getAssociatedSubTreePathsById(
     const std::string& id, const std::string& path,
     std::span<const std::string_view> subtreeInterfaces,
     std::string_view association,
     std::span<const std::string_view> endpointInterfaces,
     std::function<void(const boost::system::error_code&,
-                       const MapperGetSubTreePathsResponse&)>&& callback)
-{
-    crow::connections::systemBus->async_method_call(
-        [callback{std::move(callback)}](
-            const boost::system::error_code& ec,
-            const MapperGetSubTreePathsResponse& subtreePaths) {
-            callback(ec, subtreePaths);
-        },
-        "xyz.openbmc_project.ObjectMapper",
-        "/xyz/openbmc_project/object_mapper",
-        "xyz.openbmc_project.ObjectMapper", "GetAssociatedSubTreePathsById", id,
-        path, subtreeInterfaces, association, endpointInterfaces);
-}
+                       const MapperGetSubTreePathsResponse&)>&& callback);
 
-inline void getDbusObject(
-    const std::string& path, std::span<const std::string_view> interfaces,
-    std::function<void(const boost::system::error_code&,
-                       const MapperGetObject&)>&& callback)
-{
-    crow::connections::systemBus->async_method_call(
-        [callback{std::move(callback)}](const boost::system::error_code& ec,
-                                        const MapperGetObject& object) {
-            callback(ec, object);
-        },
-        "xyz.openbmc_project.ObjectMapper",
-        "/xyz/openbmc_project/object_mapper",
-        "xyz.openbmc_project.ObjectMapper", "GetObject", path, interfaces);
-}
+void getDbusObject(const std::string& path,
+                   std::span<const std::string_view> interfaces,
+                   std::function<void(const boost::system::error_code&,
+                                      const MapperGetObject&)>&& callback);
 
-inline void getAssociationEndPoints(
+void getAssociationEndPoints(
     const std::string& path,
     std::function<void(const boost::system::error_code&,
-                       const MapperEndPoints&)>&& callback)
-{
-    getProperty<MapperEndPoints>("xyz.openbmc_project.ObjectMapper", path,
-                                 "xyz.openbmc_project.Association", "endpoints",
-                                 std::move(callback));
-}
+                       const MapperEndPoints&)>&& callback);
 
-inline void getManagedObjects(
+void getManagedObjects(
     const std::string& service, const sdbusplus::message::object_path& path,
     std::function<void(const boost::system::error_code&,
-                       const ManagedObjectType&)>&& callback)
-{
-    crow::connections::systemBus->async_method_call(
-        [callback{std::move(callback)}](const boost::system::error_code& ec,
-                                        const ManagedObjectType& objects) {
-            callback(ec, objects);
-        },
-        service, path, "org.freedesktop.DBus.ObjectManager",
-        "GetManagedObjects");
-}
-
+                       const ManagedObjectType&)>&& callback);
 } // namespace utility
 } // namespace dbus