diff --git a/Makefile.am b/Makefile.am
index e225ff8..fa086da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@
 	common.c \
 	control.c \
 	control_legacy.c \
-	mboxd_dbus.c \
 	control_dbus.c \
 	mboxd_lpc.c \
 	mboxd_msg.c \
diff --git a/control.c b/control.c
index 8c122ac..39099d3 100644
--- a/control.c
+++ b/control.c
@@ -82,7 +82,7 @@
 
 	if (context->state & STATE_SUSPENDED) {
 		/* Already Suspended */
-		return DBUS_SUCCESS;
+		return 0;
 	}
 
 	/* Nothing to check - Just set the bit to notify the host */
@@ -102,7 +102,7 @@
 
 	if (!(context->state & STATE_SUSPENDED)) {
 		/* We weren't suspended... */
-		return DBUS_SUCCESS;
+		return 0;
 	}
 
 	if (modified) {
@@ -112,9 +112,8 @@
 
 	/* Clear the bit and send the BMC Event to the host */
 	rc = clr_bmc_events(context, BMC_EVENT_FLASH_CTRL_LOST, SET_BMC_EVENT);
-
 	if (rc < 0) {
-		rc = -E_DBUS_HARDWARE;
+		return rc;
 	}
 	context->state &= ~STATE_SUSPENDED;
 
diff --git a/control_legacy.c b/control_legacy.c
index 08ac6f3..8ef9ea9 100644
--- a/control_legacy.c
+++ b/control_legacy.c
@@ -8,6 +8,31 @@
 #include "control_dbus.h"
 #include "mbox.h"
 
+/* Command IDs (Legacy interface) */
+#define DBUS_C_PING            0x00
+#define DBUS_C_DAEMON_STATE    0x01
+#define DBUS_C_RESET           0x02
+#define DBUS_C_SUSPEND         0x03
+#define DBUS_C_RESUME          0x04
+#define DBUS_C_MODIFIED        0x05
+#define DBUS_C_KILL            0x06
+#define DBUS_C_LPC_STATE       0x07
+#define NUM_DBUS_CMDS          (DBUS_C_LPC_STATE + 1)
+
+/* Return Values (Legacy interface) */
+#define DBUS_SUCCESS           0x00 /* Command Succeded */
+#define E_DBUS_INTERNAL        0x01 /* Internal DBUS Error */
+#define E_DBUS_INVAL           0x02 /* Invalid Command */
+#define E_DBUS_REJECTED        0x03 /* Daemon Rejected Request */
+#define E_DBUS_HARDWARE        0x04 /* BMC Hardware Error */
+#define E_DBUS_NO_MEM          0x05 /* Failed Memory Allocation */
+
+struct mbox_dbus_msg {
+       uint8_t cmd;
+       size_t num_args;
+       uint8_t *args;
+};
+
 /*
  * Command: DBUS Ping
  * Ping the daemon
diff --git a/dbus.h b/dbus.h
index a40bfd1..be48cad 100644
--- a/dbus.h
+++ b/dbus.h
@@ -24,46 +24,22 @@
 #define MBOX_DBUS_LEGACY_NAME		"org.openbmc.mboxd"
 #define MBOX_DBUS_LEGACY_OBJECT		"/org/openbmc/mboxd"
 
-/* Command IDs (Legacy interface) */
-#define DBUS_C_PING		0x00
-#define	DBUS_C_DAEMON_STATE	0x01
-#define DBUS_C_RESET		0x02
-#define DBUS_C_SUSPEND		0x03
-#define DBUS_C_RESUME		0x04
-#define DBUS_C_MODIFIED		0x05
-#define DBUS_C_KILL		0x06
-#define DBUS_C_LPC_STATE	0x07
-#define NUM_DBUS_CMDS		(DBUS_C_LPC_STATE + 1)
-
 /* Command Args */
 /* Resume */
 #define RESUME_NUM_ARGS		1
 #define RESUME_NOT_MODIFIED	0x00
 #define RESUME_FLASH_MODIFIED	0x01
 
-/* Return Values (Legacy interface) */
-#define DBUS_SUCCESS		0x00 /* Command Succeded */
-#define E_DBUS_INTERNAL		0x01 /* Internal DBUS Error */
-#define E_DBUS_INVAL		0x02 /* Invalid Command */
-#define E_DBUS_REJECTED		0x03 /* Daemon Rejected Request */
-#define E_DBUS_HARDWARE		0x04 /* BMC Hardware Error */
-#define E_DBUS_NO_MEM		0x05 /* Failed Memory Allocation */
-
 /* Response Args */
 /* Status */
 #define DAEMON_STATE_NUM_ARGS	1
 #define DAEMON_STATE_ACTIVE	0x00 /* Daemon Active */
 #define DAEMON_STATE_SUSPENDED	0x01 /* Daemon Suspended */
+
 /* LPC State */
 #define LPC_STATE_NUM_ARGS	1
 #define LPC_STATE_INVALID	0x00 /* Invalid State */
 #define LPC_STATE_FLASH		0x01 /* LPC Maps Flash Directly */
 #define LPC_STATE_MEM		0x02 /* LPC Maps Memory */
 
-struct mbox_dbus_msg {
-	uint8_t cmd;
-	size_t num_args;
-	uint8_t *args;
-};
-
 #endif /* MBOX_DBUS_H */
diff --git a/mboxctl.c b/mboxctl.c
index d2e590e..e5262e1 100644
--- a/mboxctl.c
+++ b/mboxctl.c
@@ -222,7 +222,6 @@
 	if (rc < 0) {
 		MSG_ERR("Failed to init method call: %s\n",
 			strerror(-rc));
-		rc = -E_DBUS_INTERNAL;
 		goto out;
 	}
 
@@ -241,14 +240,12 @@
 	if (rc < 0) {
 		MSG_ERR("Failed to add args to message: %s\n",
 			strerror(-rc));
-		rc = -E_DBUS_INTERNAL;
 		goto out;
 	}
 
 	rc = sd_bus_call(context->bus, m, 0, &error, &n);
 	if (rc < 0) {
 		MSG_ERR("Failed to post message: %s\n", strerror(-rc));
-		rc = -E_DBUS_INTERNAL;
 		goto out;
 	}
 
diff --git a/mboxd.c b/mboxd.c
index efed052..d04daf4 100644
--- a/mboxd.c
+++ b/mboxd.c
@@ -50,8 +50,57 @@
 "\t\t\t\t(default: 1MB)\n" \
 "\t-f | --flash\t\tSize of flash in [K|M] bytes\n\n"
 
-int mboxd_dbus_init(struct mbox_context *context);
-void mboxd_dbus_free(struct mbox_context *context);
+static int dbus_init(struct mbox_context *context)
+{
+	int rc;
+
+	rc = sd_bus_default_system(&context->bus);
+	if (rc < 0) {
+		MSG_ERR("Failed to connect to the system bus: %s\n",
+			strerror(-rc));
+		return rc;
+	}
+
+	rc = control_legacy_init(context);
+	if (rc < 0) {
+		MSG_ERR("Failed to initialise legacy DBus interface: %s\n",
+			strerror(-rc));
+		return rc;
+	}
+
+	rc = control_dbus_init(context);
+	if (rc < 0) {
+		MSG_ERR("Failed to initialise DBus control interface: %s\n",
+			strerror(-rc));
+		return rc;
+	}
+
+	rc = sd_bus_request_name(context->bus, MBOX_DBUS_NAME,
+				 SD_BUS_NAME_ALLOW_REPLACEMENT |
+				 SD_BUS_NAME_REPLACE_EXISTING);
+	if (rc < 0) {
+		MSG_ERR("Failed to request name on the bus: %s\n",
+			strerror(-rc));
+		return rc;
+	}
+
+	rc = sd_bus_get_fd(context->bus);
+	if (rc < 0) {
+		MSG_ERR("Failed to get bus fd: %s\n", strerror(-rc));
+		return rc;
+	}
+
+	context->fds[DBUS_FD].fd = rc;
+
+	return 0;
+}
+
+static void dbus_free(struct mbox_context *context)
+{
+	control_dbus_free(context);
+	control_legacy_free(context);
+	sd_bus_unref(context->bus);
+}
 
 static int poll_loop(struct mbox_context *context)
 {
@@ -325,7 +374,7 @@
 		goto finish;
 	}
 
-	rc = mboxd_dbus_init(context);
+	rc = dbus_init(context);
 	if (rc) {
 		goto finish;
 	}
@@ -354,7 +403,7 @@
 	MSG_INFO("Daemon Exiting...\n");
 	clr_bmc_events(context, BMC_EVENT_DAEMON_READY, SET_BMC_EVENT);
 
-	mboxd_dbus_free(context);
+	dbus_free(context);
 	free_flash_dev(context);
 	free_lpc_dev(context);
 	free_mbox_dev(context);
diff --git a/mboxd_dbus.c b/mboxd_dbus.c
deleted file mode 100644
index 2200bed..0000000
--- a/mboxd_dbus.c
+++ /dev/null
@@ -1,61 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// Copyright (C) 2018 IBM Corp.
-
-#define _GNU_SOURCE
-#include <systemd/sd-bus.h>
-
-#include "common.h"
-#include "dbus.h"
-#include "mbox.h"
-#include "control_dbus.h"
-
-int mboxd_dbus_init(struct mbox_context *context)
-{
-	int rc;
-
-	rc = sd_bus_default_system(&context->bus);
-	if (rc < 0) {
-		MSG_ERR("Failed to connect to the system bus: %s\n",
-			strerror(-rc));
-		return rc;
-	}
-
-	rc = control_legacy_init(context);
-	if (rc < 0) {
-		MSG_ERR("Failed to initialise legacy DBus interface: %s\n",
-			strerror(-rc));
-		return rc;
-	}
-
-	rc = control_dbus_init(context);
-	if (rc < 0) {
-		MSG_ERR("Failed to initialise DBus control interface: %s\n",
-			strerror(-rc));
-		return rc;
-	}
-
-	rc = sd_bus_request_name(context->bus, MBOX_DBUS_NAME,
-				 SD_BUS_NAME_ALLOW_REPLACEMENT |
-				 SD_BUS_NAME_REPLACE_EXISTING);
-	if (rc < 0) {
-		MSG_ERR("Failed to request bus name: %s\n", strerror(-rc));
-		return rc;
-	}
-
-	rc = sd_bus_get_fd(context->bus);
-	if (rc < 0) {
-		MSG_ERR("Failed to get bus fd: %s\n", strerror(-rc));
-		return rc;
-	}
-
-	context->fds[DBUS_FD].fd = rc;
-
-	return 0;
-}
-
-void mboxd_dbus_free(struct mbox_context *context)
-{
-	control_dbus_free(context);
-	control_legacy_free(context);
-	sd_bus_unref(context->bus);
-}