diff --git a/host_state_manager.cpp b/host_state_manager.cpp
index fd89cf6..6731432 100644
--- a/host_state_manager.cpp
+++ b/host_state_manager.cpp
@@ -36,10 +36,6 @@
 constexpr auto SYSTEMD_OBJ_PATH  = "/org/freedesktop/systemd1";
 constexpr auto SYSTEMD_INTERFACE = "org.freedesktop.systemd1.Manager";
 
-constexpr auto SYSTEM_SERVICE   = "org.openbmc.managers.System";
-constexpr auto SYSTEM_OBJ_PATH  = "/org/openbmc/managers/System";
-constexpr auto SYSTEM_INTERFACE = SYSTEM_SERVICE;
-
 constexpr auto MAPPER_BUSNAME = "xyz.openbmc_project.ObjectMapper";
 constexpr auto MAPPER_PATH = "/xyz/openbmc_project/object_mapper";
 constexpr auto MAPPER_INTERFACE = "xyz.openbmc_project.ObjectMapper";
@@ -71,22 +67,10 @@
     return;
 }
 
-// TODO - Will be rewritten once sdbusplus client bindings are in place
-//        and persistent storage design is in place
 void Host::determineInitialState()
 {
-    std::string sysState;
 
-    auto method = this->bus.new_method_call(SYSTEM_SERVICE,
-                                            SYSTEM_OBJ_PATH,
-                                            SYSTEM_INTERFACE,
-                                            "getSystemState");
-
-    auto reply = this->bus.call(method);
-
-    reply.read(sysState);
-
-    if(sysState == "HOST_BOOTED")
+    if(stateActive(HOST_STATE_POWERON_TGT))
     {
         log<level::INFO>("Initial Host State will be Running",
                          entry("CURRENT_HOST_STATE=%s",