diff --git a/src/main.cpp b/src/main.cpp
index 98cae3e..d808498 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,8 +19,8 @@
 
 int main(int argc, char* argv[])
 {
-    PostCodeDataHolder* postcodeDataHolderObj =
-        postcodeDataHolderObj->getInstance();
+    PostCodeDataHolder postcodeDataHolderObj =
+        PostCodeDataHolder::getInstance();
 
     int arg;
     int optIndex = 0;
@@ -36,7 +36,7 @@
         switch (arg)
         {
             case 'h':
-                postcodeDataHolderObj->node = std::stoi(optarg);
+                postcodeDataHolderObj.node = std::stoi(optarg);
                 break;
             default:
                 break;
@@ -60,7 +60,7 @@
     sdbusplus::bus::bus bus = sdbusplus::bus::new_default();
     sdbusplus::server::manager_t m{bus, DBUS_OBJECT_NAME};
 
-    intfName = DBUS_INTF_NAME + std::to_string(postcodeDataHolderObj->node);
+    intfName = DBUS_INTF_NAME + std::to_string(postcodeDataHolderObj.node);
 
     bus.request_name(intfName.c_str());
 
diff --git a/src/post_code.cpp b/src/post_code.cpp
index 1fcbe55..b1ffab8 100644
--- a/src/post_code.cpp
+++ b/src/post_code.cpp
@@ -17,16 +17,14 @@
 
 #include "iomanip"
 
-PostCodeDataHolder* PostCodeDataHolder::instance = 0;
-
 void PostCode::deleteAll()
 {
-    auto dir = fs::path(postcodeDataHolderObj->PostCodeListPathPrefix +
-                        std::to_string(postcodeDataHolderObj->node));
+    auto dir = fs::path(postcodeDataHolderObj.PostCodeListPathPrefix +
+                        std::to_string(postcodeDataHolderObj.node));
     std::uintmax_t n = fs::remove_all(dir);
     std::cerr << "clearPostCodes deleted " << n << " files in "
-              << postcodeDataHolderObj->PostCodeListPathPrefix +
-                     std::to_string(postcodeDataHolderObj->node)
+              << postcodeDataHolderObj.PostCodeListPathPrefix +
+                     std::to_string(postcodeDataHolderObj.node)
               << std::endl;
     fs::create_directories(dir);
     postCodes.clear();