diff --git a/gdbus/interfaces/openbmc_intf.c b/gdbus/interfaces/openbmc_intf.c
index 4d0c822..ff10424 100644
--- a/gdbus/interfaces/openbmc_intf.c
+++ b/gdbus/interfaces/openbmc_intf.c
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.44.1. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.42.2. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
@@ -149,828 +149,6 @@
 }
 
 /* ------------------------------------------------------------------------
- * Code for interface org.openbmc.Object.Mapper
- * ------------------------------------------------------------------------
- */
-
-/**
- * SECTION:ObjectMapper
- * @title: ObjectMapper
- * @short_description: Generated C code for the org.openbmc.Object.Mapper D-Bus interface
- *
- * This section contains code for working with the <link linkend="gdbus-interface-org-openbmc-Object-Mapper.top_of_page">org.openbmc.Object.Mapper</link> D-Bus interface in C.
- */
-
-/* ---- Introspection data for org.openbmc.Object.Mapper ---- */
-
-static const _ExtendedGDBusArgInfo _object_mapper_signal_info_object_added_ARG_object_path =
-{
-  {
-    -1,
-    (gchar *) "object_path",
-    (gchar *) "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _object_mapper_signal_info_object_added_ARG_interface_name =
-{
-  {
-    -1,
-    (gchar *) "interface_name",
-    (gchar *) "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _object_mapper_signal_info_object_added_ARG_pointers[] =
-{
-  &_object_mapper_signal_info_object_added_ARG_object_path,
-  &_object_mapper_signal_info_object_added_ARG_interface_name,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _object_mapper_signal_info_object_added =
-{
-  {
-    -1,
-    (gchar *) "ObjectAdded",
-    (GDBusArgInfo **) &_object_mapper_signal_info_object_added_ARG_pointers,
-    NULL
-  },
-  "object-added"
-};
-
-static const _ExtendedGDBusSignalInfo * const _object_mapper_signal_info_pointers[] =
-{
-  &_object_mapper_signal_info_object_added,
-  NULL
-};
-
-static const _ExtendedGDBusInterfaceInfo _object_mapper_interface_info =
-{
-  {
-    -1,
-    (gchar *) "org.openbmc.Object.Mapper",
-    NULL,
-    (GDBusSignalInfo **) &_object_mapper_signal_info_pointers,
-    NULL,
-    NULL
-  },
-  "object-mapper",
-};
-
-
-/**
- * object_mapper_interface_info:
- *
- * Gets a machine-readable description of the <link linkend="gdbus-interface-org-openbmc-Object-Mapper.top_of_page">org.openbmc.Object.Mapper</link> D-Bus interface.
- *
- * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.
- */
-GDBusInterfaceInfo *
-object_mapper_interface_info (void)
-{
-  return (GDBusInterfaceInfo *) &_object_mapper_interface_info.parent_struct;
-}
-
-/**
- * object_mapper_override_properties:
- * @klass: The class structure for a #GObject<!-- -->-derived class.
- * @property_id_begin: The property id to assign to the first overridden property.
- *
- * Overrides all #GObject properties in the #ObjectMapper interface for a concrete class.
- * The properties are overridden in the order they are defined.
- *
- * Returns: The last property id.
- */
-guint
-object_mapper_override_properties (GObjectClass *klass, guint property_id_begin)
-{
-  return property_id_begin - 1;
-}
-
-
-
-/**
- * ObjectMapper:
- *
- * Abstract interface type for the D-Bus interface <link linkend="gdbus-interface-org-openbmc-Object-Mapper.top_of_page">org.openbmc.Object.Mapper</link>.
- */
-
-/**
- * ObjectMapperIface:
- * @parent_iface: The parent interface.
- * @object_added: Handler for the #ObjectMapper::object-added signal.
- *
- * Virtual table for the D-Bus interface <link linkend="gdbus-interface-org-openbmc-Object-Mapper.top_of_page">org.openbmc.Object.Mapper</link>.
- */
-
-typedef ObjectMapperIface ObjectMapperInterface;
-G_DEFINE_INTERFACE (ObjectMapper, object_mapper, G_TYPE_OBJECT);
-
-static void
-object_mapper_default_init (ObjectMapperIface *iface)
-{
-  /* GObject signals for received D-Bus signals: */
-  /**
-   * ObjectMapper::object-added:
-   * @object: A #ObjectMapper.
-   * @arg_object_path: Argument.
-   * @arg_interface_name: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-openbmc-Object-Mapper.ObjectAdded">"ObjectAdded"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("object-added",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (ObjectMapperIface, object_added),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    2, G_TYPE_STRING, G_TYPE_STRING);
-
-}
-
-/**
- * object_mapper_emit_object_added:
- * @object: A #ObjectMapper.
- * @arg_object_path: Argument to pass with the signal.
- * @arg_interface_name: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-openbmc-Object-Mapper.ObjectAdded">"ObjectAdded"</link> D-Bus signal.
- */
-void
-object_mapper_emit_object_added (
-    ObjectMapper *object,
-    const gchar *arg_object_path,
-    const gchar *arg_interface_name)
-{
-  g_signal_emit_by_name (object, "object-added", arg_object_path, arg_interface_name);
-}
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * ObjectMapperProxy:
- *
- * The #ObjectMapperProxy structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * ObjectMapperProxyClass:
- * @parent_class: The parent class.
- *
- * Class structure for #ObjectMapperProxy.
- */
-
-struct _ObjectMapperProxyPrivate
-{
-  GData *qdata;
-};
-
-static void object_mapper_proxy_iface_init (ObjectMapperIface *iface);
-
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-G_DEFINE_TYPE_WITH_CODE (ObjectMapperProxy, object_mapper_proxy, G_TYPE_DBUS_PROXY,
-                         G_ADD_PRIVATE (ObjectMapperProxy)
-                         G_IMPLEMENT_INTERFACE (TYPE_OBJECT_MAPPER, object_mapper_proxy_iface_init));
-
-#else
-G_DEFINE_TYPE_WITH_CODE (ObjectMapperProxy, object_mapper_proxy, G_TYPE_DBUS_PROXY,
-                         G_IMPLEMENT_INTERFACE (TYPE_OBJECT_MAPPER, object_mapper_proxy_iface_init));
-
-#endif
-static void
-object_mapper_proxy_finalize (GObject *object)
-{
-  ObjectMapperProxy *proxy = OBJECT_MAPPER_PROXY (object);
-  g_datalist_clear (&proxy->priv->qdata);
-  G_OBJECT_CLASS (object_mapper_proxy_parent_class)->finalize (object);
-}
-
-static void
-object_mapper_proxy_get_property (GObject      *object,
-  guint         prop_id,
-  GValue       *value,
-  GParamSpec   *pspec G_GNUC_UNUSED)
-{
-}
-
-static void
-object_mapper_proxy_set_property (GObject      *object,
-  guint         prop_id,
-  const GValue *value,
-  GParamSpec   *pspec G_GNUC_UNUSED)
-{
-}
-
-static void
-object_mapper_proxy_g_signal (GDBusProxy *proxy,
-  const gchar *sender_name G_GNUC_UNUSED,
-  const gchar *signal_name,
-  GVariant *parameters)
-{
-  _ExtendedGDBusSignalInfo *info;
-  GVariantIter iter;
-  GVariant *child;
-  GValue *paramv;
-  guint num_params;
-  guint n;
-  guint signal_id;
-  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_object_mapper_interface_info.parent_struct, signal_name);
-  if (info == NULL)
-    return;
-  num_params = g_variant_n_children (parameters);
-  paramv = g_new0 (GValue, num_params + 1);
-  g_value_init (&paramv[0], TYPE_OBJECT_MAPPER);
-  g_value_set_object (&paramv[0], proxy);
-  g_variant_iter_init (&iter, parameters);
-  n = 1;
-  while ((child = g_variant_iter_next_value (&iter)) != NULL)
-    {
-      _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1];
-      if (arg_info->use_gvariant)
-        {
-          g_value_init (&paramv[n], G_TYPE_VARIANT);
-          g_value_set_variant (&paramv[n], child);
-          n++;
-        }
-      else
-        g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
-      g_variant_unref (child);
-    }
-  signal_id = g_signal_lookup (info->signal_name, TYPE_OBJECT_MAPPER);
-  g_signal_emitv (paramv, signal_id, 0, NULL);
-  for (n = 0; n < num_params + 1; n++)
-    g_value_unset (&paramv[n]);
-  g_free (paramv);
-}
-
-static void
-object_mapper_proxy_g_properties_changed (GDBusProxy *_proxy,
-  GVariant *changed_properties,
-  const gchar *const *invalidated_properties)
-{
-  ObjectMapperProxy *proxy = OBJECT_MAPPER_PROXY (_proxy);
-  guint n;
-  const gchar *key;
-  GVariantIter *iter;
-  _ExtendedGDBusPropertyInfo *info;
-  g_variant_get (changed_properties, "a{sv}", &iter);
-  while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
-    {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_object_mapper_interface_info.parent_struct, key);
-      g_datalist_remove_data (&proxy->priv->qdata, key);
-      if (info != NULL)
-        g_object_notify (G_OBJECT (proxy), info->hyphen_name);
-    }
-  g_variant_iter_free (iter);
-  for (n = 0; invalidated_properties[n] != NULL; n++)
-    {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_object_mapper_interface_info.parent_struct, invalidated_properties[n]);
-      g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
-      if (info != NULL)
-        g_object_notify (G_OBJECT (proxy), info->hyphen_name);
-    }
-}
-
-static void
-object_mapper_proxy_init (ObjectMapperProxy *proxy)
-{
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-  proxy->priv = object_mapper_proxy_get_instance_private (proxy);
-#else
-  proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, TYPE_OBJECT_MAPPER_PROXY, ObjectMapperProxyPrivate);
-#endif
-
-  g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), object_mapper_interface_info ());
-}
-
-static void
-object_mapper_proxy_class_init (ObjectMapperProxyClass *klass)
-{
-  GObjectClass *gobject_class;
-  GDBusProxyClass *proxy_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize     = object_mapper_proxy_finalize;
-  gobject_class->get_property = object_mapper_proxy_get_property;
-  gobject_class->set_property = object_mapper_proxy_set_property;
-
-  proxy_class = G_DBUS_PROXY_CLASS (klass);
-  proxy_class->g_signal = object_mapper_proxy_g_signal;
-  proxy_class->g_properties_changed = object_mapper_proxy_g_properties_changed;
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
-  g_type_class_add_private (klass, sizeof (ObjectMapperProxyPrivate));
-#endif
-}
-
-static void
-object_mapper_proxy_iface_init (ObjectMapperIface *iface)
-{
-}
-
-/**
- * object_mapper_proxy_new:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-openbmc-Object-Mapper.top_of_page">org.openbmc.Object.Mapper</link>. See g_dbus_proxy_new() for more details.
- *
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call object_mapper_proxy_new_finish() to get the result of the operation.
- *
- * See object_mapper_proxy_new_sync() for the synchronous, blocking version of this constructor.
- */
-void
-object_mapper_proxy_new (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data)
-{
-  g_async_initable_new_async (TYPE_OBJECT_MAPPER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.openbmc.Object.Mapper", NULL);
-}
-
-/**
- * object_mapper_proxy_new_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to object_mapper_proxy_new().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with object_mapper_proxy_new().
- *
- * Returns: (transfer full) (type ObjectMapperProxy): The constructed proxy object or %NULL if @error is set.
- */
-ObjectMapper *
-object_mapper_proxy_new_finish (
-    GAsyncResult        *res,
-    GError             **error)
-{
-  GObject *ret;
-  GObject *source_object;
-  source_object = g_async_result_get_source_object (res);
-  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
-  g_object_unref (source_object);
-  if (ret != NULL)
-    return OBJECT_MAPPER (ret);
-  else
-    return NULL;
-}
-
-/**
- * object_mapper_proxy_new_sync:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Synchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-openbmc-Object-Mapper.top_of_page">org.openbmc.Object.Mapper</link>. See g_dbus_proxy_new_sync() for more details.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See object_mapper_proxy_new() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type ObjectMapperProxy): The constructed proxy object or %NULL if @error is set.
- */
-ObjectMapper *
-object_mapper_proxy_new_sync (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error)
-{
-  GInitable *ret;
-  ret = g_initable_new (TYPE_OBJECT_MAPPER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.openbmc.Object.Mapper", NULL);
-  if (ret != NULL)
-    return OBJECT_MAPPER (ret);
-  else
-    return NULL;
-}
-
-
-/**
- * object_mapper_proxy_new_for_bus:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Like object_mapper_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
- *
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call object_mapper_proxy_new_for_bus_finish() to get the result of the operation.
- *
- * See object_mapper_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
- */
-void
-object_mapper_proxy_new_for_bus (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data)
-{
-  g_async_initable_new_async (TYPE_OBJECT_MAPPER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.openbmc.Object.Mapper", NULL);
-}
-
-/**
- * object_mapper_proxy_new_for_bus_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to object_mapper_proxy_new_for_bus().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with object_mapper_proxy_new_for_bus().
- *
- * Returns: (transfer full) (type ObjectMapperProxy): The constructed proxy object or %NULL if @error is set.
- */
-ObjectMapper *
-object_mapper_proxy_new_for_bus_finish (
-    GAsyncResult        *res,
-    GError             **error)
-{
-  GObject *ret;
-  GObject *source_object;
-  source_object = g_async_result_get_source_object (res);
-  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
-  g_object_unref (source_object);
-  if (ret != NULL)
-    return OBJECT_MAPPER (ret);
-  else
-    return NULL;
-}
-
-/**
- * object_mapper_proxy_new_for_bus_sync:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Like object_mapper_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See object_mapper_proxy_new_for_bus() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type ObjectMapperProxy): The constructed proxy object or %NULL if @error is set.
- */
-ObjectMapper *
-object_mapper_proxy_new_for_bus_sync (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error)
-{
-  GInitable *ret;
-  ret = g_initable_new (TYPE_OBJECT_MAPPER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.openbmc.Object.Mapper", NULL);
-  if (ret != NULL)
-    return OBJECT_MAPPER (ret);
-  else
-    return NULL;
-}
-
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * ObjectMapperSkeleton:
- *
- * The #ObjectMapperSkeleton structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * ObjectMapperSkeletonClass:
- * @parent_class: The parent class.
- *
- * Class structure for #ObjectMapperSkeleton.
- */
-
-struct _ObjectMapperSkeletonPrivate
-{
-  GValue *properties;
-  GList *changed_properties;
-  GSource *changed_properties_idle_source;
-  GMainContext *context;
-  GMutex lock;
-};
-
-static void
-_object_mapper_skeleton_handle_method_call (
-  GDBusConnection *connection G_GNUC_UNUSED,
-  const gchar *sender G_GNUC_UNUSED,
-  const gchar *object_path G_GNUC_UNUSED,
-  const gchar *interface_name,
-  const gchar *method_name,
-  GVariant *parameters,
-  GDBusMethodInvocation *invocation,
-  gpointer user_data)
-{
-  ObjectMapperSkeleton *skeleton = OBJECT_MAPPER_SKELETON (user_data);
-  _ExtendedGDBusMethodInfo *info;
-  GVariantIter iter;
-  GVariant *child;
-  GValue *paramv;
-  guint num_params;
-  guint num_extra;
-  guint n;
-  guint signal_id;
-  GValue return_value = G_VALUE_INIT;
-  info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
-  g_assert (info != NULL);
-  num_params = g_variant_n_children (parameters);
-  num_extra = info->pass_fdlist ? 3 : 2;  paramv = g_new0 (GValue, num_params + num_extra);
-  n = 0;
-  g_value_init (&paramv[n], TYPE_OBJECT_MAPPER);
-  g_value_set_object (&paramv[n++], skeleton);
-  g_value_init (&paramv[n], G_TYPE_DBUS_METHOD_INVOCATION);
-  g_value_set_object (&paramv[n++], invocation);
-  if (info->pass_fdlist)
-    {
-#ifdef G_OS_UNIX
-      g_value_init (&paramv[n], G_TYPE_UNIX_FD_LIST);
-      g_value_set_object (&paramv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)));
-#else
-      g_assert_not_reached ();
-#endif
-    }
-  g_variant_iter_init (&iter, parameters);
-  while ((child = g_variant_iter_next_value (&iter)) != NULL)
-    {
-      _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra];
-      if (arg_info->use_gvariant)
-        {
-          g_value_init (&paramv[n], G_TYPE_VARIANT);
-          g_value_set_variant (&paramv[n], child);
-          n++;
-        }
-      else
-        g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
-      g_variant_unref (child);
-    }
-  signal_id = g_signal_lookup (info->signal_name, TYPE_OBJECT_MAPPER);
-  g_value_init (&return_value, G_TYPE_BOOLEAN);
-  g_signal_emitv (paramv, signal_id, 0, &return_value);
-  if (!g_value_get_boolean (&return_value))
-    g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name);
-  g_value_unset (&return_value);
-  for (n = 0; n < num_params + num_extra; n++)
-    g_value_unset (&paramv[n]);
-  g_free (paramv);
-}
-
-static GVariant *
-_object_mapper_skeleton_handle_get_property (
-  GDBusConnection *connection G_GNUC_UNUSED,
-  const gchar *sender G_GNUC_UNUSED,
-  const gchar *object_path G_GNUC_UNUSED,
-  const gchar *interface_name G_GNUC_UNUSED,
-  const gchar *property_name,
-  GError **error,
-  gpointer user_data)
-{
-  ObjectMapperSkeleton *skeleton = OBJECT_MAPPER_SKELETON (user_data);
-  GValue value = G_VALUE_INIT;
-  GParamSpec *pspec;
-  _ExtendedGDBusPropertyInfo *info;
-  GVariant *ret;
-  ret = NULL;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_object_mapper_interface_info.parent_struct, property_name);
-  g_assert (info != NULL);
-  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
-  if (pspec == NULL)
-    {
-      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
-    }
-  else
-    {
-      g_value_init (&value, pspec->value_type);
-      g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value);
-      ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature));
-      g_value_unset (&value);
-    }
-  return ret;
-}
-
-static gboolean
-_object_mapper_skeleton_handle_set_property (
-  GDBusConnection *connection G_GNUC_UNUSED,
-  const gchar *sender G_GNUC_UNUSED,
-  const gchar *object_path G_GNUC_UNUSED,
-  const gchar *interface_name G_GNUC_UNUSED,
-  const gchar *property_name,
-  GVariant *variant,
-  GError **error,
-  gpointer user_data)
-{
-  ObjectMapperSkeleton *skeleton = OBJECT_MAPPER_SKELETON (user_data);
-  GValue value = G_VALUE_INIT;
-  GParamSpec *pspec;
-  _ExtendedGDBusPropertyInfo *info;
-  gboolean ret;
-  ret = FALSE;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_object_mapper_interface_info.parent_struct, property_name);
-  g_assert (info != NULL);
-  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
-  if (pspec == NULL)
-    {
-      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
-    }
-  else
-    {
-      if (info->use_gvariant)
-        g_value_set_variant (&value, variant);
-      else
-        g_dbus_gvariant_to_gvalue (variant, &value);
-      g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value);
-      g_value_unset (&value);
-      ret = TRUE;
-    }
-  return ret;
-}
-
-static const GDBusInterfaceVTable _object_mapper_skeleton_vtable =
-{
-  _object_mapper_skeleton_handle_method_call,
-  _object_mapper_skeleton_handle_get_property,
-  _object_mapper_skeleton_handle_set_property,
-  {NULL}
-};
-
-static GDBusInterfaceInfo *
-object_mapper_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
-{
-  return object_mapper_interface_info ();
-}
-
-static GDBusInterfaceVTable *
-object_mapper_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
-{
-  return (GDBusInterfaceVTable *) &_object_mapper_skeleton_vtable;
-}
-
-static GVariant *
-object_mapper_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
-{
-  ObjectMapperSkeleton *skeleton = OBJECT_MAPPER_SKELETON (_skeleton);
-
-  GVariantBuilder builder;
-  guint n;
-  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
-  if (_object_mapper_interface_info.parent_struct.properties == NULL)
-    goto out;
-  for (n = 0; _object_mapper_interface_info.parent_struct.properties[n] != NULL; n++)
-    {
-      GDBusPropertyInfo *info = _object_mapper_interface_info.parent_struct.properties[n];
-      if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)
-        {
-          GVariant *value;
-          value = _object_mapper_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.openbmc.Object.Mapper", info->name, NULL, skeleton);
-          if (value != NULL)
-            {
-              g_variant_take_ref (value);
-              g_variant_builder_add (&builder, "{sv}", info->name, value);
-              g_variant_unref (value);
-            }
-        }
-    }
-out:
-  return g_variant_builder_end (&builder);
-}
-
-static void
-object_mapper_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
-{
-}
-
-static void
-_object_mapper_on_signal_object_added (
-    ObjectMapper *object,
-    const gchar *arg_object_path,
-    const gchar *arg_interface_name)
-{
-  ObjectMapperSkeleton *skeleton = OBJECT_MAPPER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(ss)",
-                   arg_object_path,
-                   arg_interface_name));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.openbmc.Object.Mapper", "ObjectAdded",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void object_mapper_skeleton_iface_init (ObjectMapperIface *iface);
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-G_DEFINE_TYPE_WITH_CODE (ObjectMapperSkeleton, object_mapper_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
-                         G_ADD_PRIVATE (ObjectMapperSkeleton)
-                         G_IMPLEMENT_INTERFACE (TYPE_OBJECT_MAPPER, object_mapper_skeleton_iface_init));
-
-#else
-G_DEFINE_TYPE_WITH_CODE (ObjectMapperSkeleton, object_mapper_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
-                         G_IMPLEMENT_INTERFACE (TYPE_OBJECT_MAPPER, object_mapper_skeleton_iface_init));
-
-#endif
-static void
-object_mapper_skeleton_finalize (GObject *object)
-{
-  ObjectMapperSkeleton *skeleton = OBJECT_MAPPER_SKELETON (object);
-  g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free);
-  if (skeleton->priv->changed_properties_idle_source != NULL)
-    g_source_destroy (skeleton->priv->changed_properties_idle_source);
-  g_main_context_unref (skeleton->priv->context);
-  g_mutex_clear (&skeleton->priv->lock);
-  G_OBJECT_CLASS (object_mapper_skeleton_parent_class)->finalize (object);
-}
-
-static void
-object_mapper_skeleton_init (ObjectMapperSkeleton *skeleton)
-{
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-  skeleton->priv = object_mapper_skeleton_get_instance_private (skeleton);
-#else
-  skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, TYPE_OBJECT_MAPPER_SKELETON, ObjectMapperSkeletonPrivate);
-#endif
-
-  g_mutex_init (&skeleton->priv->lock);
-  skeleton->priv->context = g_main_context_ref_thread_default ();
-}
-
-static void
-object_mapper_skeleton_class_init (ObjectMapperSkeletonClass *klass)
-{
-  GObjectClass *gobject_class;
-  GDBusInterfaceSkeletonClass *skeleton_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize = object_mapper_skeleton_finalize;
-
-  skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);
-  skeleton_class->get_info = object_mapper_skeleton_dbus_interface_get_info;
-  skeleton_class->get_properties = object_mapper_skeleton_dbus_interface_get_properties;
-  skeleton_class->flush = object_mapper_skeleton_dbus_interface_flush;
-  skeleton_class->get_vtable = object_mapper_skeleton_dbus_interface_get_vtable;
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
-  g_type_class_add_private (klass, sizeof (ObjectMapperSkeletonPrivate));
-#endif
-}
-
-static void
-object_mapper_skeleton_iface_init (ObjectMapperIface *iface)
-{
-  iface->object_added = _object_mapper_on_signal_object_added;
-}
-
-/**
- * object_mapper_skeleton_new:
- *
- * Creates a skeleton object for the D-Bus interface <link linkend="gdbus-interface-org-openbmc-Object-Mapper.top_of_page">org.openbmc.Object.Mapper</link>.
- *
- * Returns: (transfer full) (type ObjectMapperSkeleton): The skeleton object.
- */
-ObjectMapper *
-object_mapper_skeleton_new (void)
-{
-  return OBJECT_MAPPER (g_object_new (TYPE_OBJECT_MAPPER_SKELETON, NULL));
-}
-
-/* ------------------------------------------------------------------------
  * Code for interface org.openbmc.Hwmon
  * ------------------------------------------------------------------------
  */
@@ -30984,15 +30162,6 @@
 object_default_init (ObjectIface *iface)
 {
   /**
-   * Object:object-mapper:
-   *
-   * The #ObjectMapper instance corresponding to the D-Bus interface <link linkend="gdbus-interface-org-openbmc-Object-Mapper.top_of_page">org.openbmc.Object.Mapper</link>, if any.
-   *
-   * Connect to the #GObject::notify signal to get informed of property changes.
-   */
-  g_object_interface_install_property (iface, g_param_spec_object ("object-mapper", "object-mapper", "object-mapper", TYPE_OBJECT_MAPPER, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS));
-
-  /**
    * Object:hwmon:
    *
    * The #Hwmon instance corresponding to the D-Bus interface <link linkend="gdbus-interface-org-openbmc-Hwmon.top_of_page">org.openbmc.Hwmon</link>, if any.
@@ -31175,23 +30344,6 @@
 }
 
 /**
- * object_get_object_mapper:
- * @object: A #Object.
- *
- * Gets the #ObjectMapper instance for the D-Bus interface <link linkend="gdbus-interface-org-openbmc-Object-Mapper.top_of_page">org.openbmc.Object.Mapper</link> on @object, if any.
- *
- * Returns: (transfer full): A #ObjectMapper that must be freed with g_object_unref() or %NULL if @object does not implement the interface.
- */
-ObjectMapper *object_get_object_mapper (Object *object)
-{
-  GDBusInterface *ret;
-  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Object.Mapper");
-  if (ret == NULL)
-    return NULL;
-  return OBJECT_MAPPER (ret);
-}
-
-/**
  * object_get_hwmon:
  * @object: A #Object.
  *
@@ -31533,26 +30685,6 @@
 
 
 /**
- * object_peek_object_mapper: (skip)
- * @object: A #Object.
- *
- * Like object_get_object_mapper() but doesn't increase the reference count on the returned object.
- *
- * <warning>It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running.</warning>
- *
- * Returns: (transfer none): A #ObjectMapper or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object.
- */
-ObjectMapper *object_peek_object_mapper (Object *object)
-{
-  GDBusInterface *ret;
-  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Object.Mapper");
-  if (ret == NULL)
-    return NULL;
-  g_object_unref (ret);
-  return OBJECT_MAPPER (ret);
-}
-
-/**
  * object_peek_hwmon: (skip)
  * @object: A #Object.
  *
@@ -32020,106 +31152,101 @@
   switch (prop_id)
     {
     case 1:
-      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Object.Mapper");
-      g_value_take_object (value, interface);
-      break;
-
-    case 2:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Hwmon");
       g_value_take_object (value, interface);
       break;
 
-    case 3:
+    case 2:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Fan");
       g_value_take_object (value, interface);
       break;
 
-    case 4:
+    case 3:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.SensorValue");
       g_value_take_object (value, interface);
       break;
 
-    case 5:
+    case 4:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.SensorThreshold");
       g_value_take_object (value, interface);
       break;
 
-    case 6:
+    case 5:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.SensorI2c");
       g_value_take_object (value, interface);
       break;
 
-    case 7:
+    case 6:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.SensorMatch");
       g_value_take_object (value, interface);
       break;
 
-    case 8:
+    case 7:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Process");
       g_value_take_object (value, interface);
       break;
 
-    case 9:
+    case 8:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.SharedResource");
       g_value_take_object (value, interface);
       break;
 
-    case 10:
+    case 9:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Control");
       g_value_take_object (value, interface);
       break;
 
-    case 11:
+    case 10:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.control.Bmc");
       g_value_take_object (value, interface);
       break;
 
-    case 12:
+    case 11:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.control.Host");
       g_value_take_object (value, interface);
       break;
 
-    case 13:
+    case 12:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.control.Power");
       g_value_take_object (value, interface);
       break;
 
-    case 14:
+    case 13:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.control.Checkstop");
       g_value_take_object (value, interface);
       break;
 
-    case 15:
+    case 14:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Watchdog");
       g_value_take_object (value, interface);
       break;
 
-    case 16:
+    case 15:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.EventLog");
       g_value_take_object (value, interface);
       break;
 
-    case 17:
+    case 16:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Flash");
       g_value_take_object (value, interface);
       break;
 
-    case 18:
+    case 17:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.FlashControl");
       g_value_take_object (value, interface);
       break;
 
-    case 19:
+    case 18:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Button");
       g_value_take_object (value, interface);
       break;
 
-    case 20:
+    case 19:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Led");
       g_value_take_object (value, interface);
       break;
 
-    case 21:
+    case 20:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.HostIpmi");
       g_value_take_object (value, interface);
       break;
@@ -32138,27 +31265,26 @@
   gobject_class->set_property = object_proxy_set_property;
   gobject_class->get_property = object_proxy_get_property;
 
-  g_object_class_override_property (gobject_class, 1, "object-mapper");
-  g_object_class_override_property (gobject_class, 2, "hwmon");
-  g_object_class_override_property (gobject_class, 3, "fan");
-  g_object_class_override_property (gobject_class, 4, "sensor-value");
-  g_object_class_override_property (gobject_class, 5, "sensor-threshold");
-  g_object_class_override_property (gobject_class, 6, "sensor-i2c");
-  g_object_class_override_property (gobject_class, 7, "sensor-match");
-  g_object_class_override_property (gobject_class, 8, "process");
-  g_object_class_override_property (gobject_class, 9, "shared-resource");
-  g_object_class_override_property (gobject_class, 10, "control");
-  g_object_class_override_property (gobject_class, 11, "control-bmc");
-  g_object_class_override_property (gobject_class, 12, "control-host");
-  g_object_class_override_property (gobject_class, 13, "control-power");
-  g_object_class_override_property (gobject_class, 14, "control-checkstop");
-  g_object_class_override_property (gobject_class, 15, "watchdog");
-  g_object_class_override_property (gobject_class, 16, "event-log");
-  g_object_class_override_property (gobject_class, 17, "flash");
-  g_object_class_override_property (gobject_class, 18, "flash-control");
-  g_object_class_override_property (gobject_class, 19, "button");
-  g_object_class_override_property (gobject_class, 20, "led");
-  g_object_class_override_property (gobject_class, 21, "host-ipmi");
+  g_object_class_override_property (gobject_class, 1, "hwmon");
+  g_object_class_override_property (gobject_class, 2, "fan");
+  g_object_class_override_property (gobject_class, 3, "sensor-value");
+  g_object_class_override_property (gobject_class, 4, "sensor-threshold");
+  g_object_class_override_property (gobject_class, 5, "sensor-i2c");
+  g_object_class_override_property (gobject_class, 6, "sensor-match");
+  g_object_class_override_property (gobject_class, 7, "process");
+  g_object_class_override_property (gobject_class, 8, "shared-resource");
+  g_object_class_override_property (gobject_class, 9, "control");
+  g_object_class_override_property (gobject_class, 10, "control-bmc");
+  g_object_class_override_property (gobject_class, 11, "control-host");
+  g_object_class_override_property (gobject_class, 12, "control-power");
+  g_object_class_override_property (gobject_class, 13, "control-checkstop");
+  g_object_class_override_property (gobject_class, 14, "watchdog");
+  g_object_class_override_property (gobject_class, 15, "event-log");
+  g_object_class_override_property (gobject_class, 16, "flash");
+  g_object_class_override_property (gobject_class, 17, "flash-control");
+  g_object_class_override_property (gobject_class, 18, "button");
+  g_object_class_override_property (gobject_class, 19, "led");
+  g_object_class_override_property (gobject_class, 20, "host-ipmi");
 }
 
 /**
@@ -32229,19 +31355,6 @@
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
-          g_warn_if_fail (IS_OBJECT_MAPPER (interface));
-          g_dbus_object_skeleton_add_interface (G_DBUS_OBJECT_SKELETON (object), interface);
-        }
-      else
-        {
-          g_dbus_object_skeleton_remove_interface_by_name (G_DBUS_OBJECT_SKELETON (object), "org.openbmc.Object.Mapper");
-        }
-      break;
-
-    case 2:
-      interface = g_value_get_object (value);
-      if (interface != NULL)
-        {
           g_warn_if_fail (IS_HWMON (interface));
           g_dbus_object_skeleton_add_interface (G_DBUS_OBJECT_SKELETON (object), interface);
         }
@@ -32251,7 +31364,7 @@
         }
       break;
 
-    case 3:
+    case 2:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32264,7 +31377,7 @@
         }
       break;
 
-    case 4:
+    case 3:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32277,7 +31390,7 @@
         }
       break;
 
-    case 5:
+    case 4:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32290,7 +31403,7 @@
         }
       break;
 
-    case 6:
+    case 5:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32303,7 +31416,7 @@
         }
       break;
 
-    case 7:
+    case 6:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32316,7 +31429,7 @@
         }
       break;
 
-    case 8:
+    case 7:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32329,7 +31442,7 @@
         }
       break;
 
-    case 9:
+    case 8:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32342,7 +31455,7 @@
         }
       break;
 
-    case 10:
+    case 9:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32355,7 +31468,7 @@
         }
       break;
 
-    case 11:
+    case 10:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32368,7 +31481,7 @@
         }
       break;
 
-    case 12:
+    case 11:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32381,7 +31494,7 @@
         }
       break;
 
-    case 13:
+    case 12:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32394,7 +31507,7 @@
         }
       break;
 
-    case 14:
+    case 13:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32407,7 +31520,7 @@
         }
       break;
 
-    case 15:
+    case 14:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32420,7 +31533,7 @@
         }
       break;
 
-    case 16:
+    case 15:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32433,7 +31546,7 @@
         }
       break;
 
-    case 17:
+    case 16:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32446,7 +31559,7 @@
         }
       break;
 
-    case 18:
+    case 17:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32459,7 +31572,7 @@
         }
       break;
 
-    case 19:
+    case 18:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32472,7 +31585,7 @@
         }
       break;
 
-    case 20:
+    case 19:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32485,7 +31598,7 @@
         }
       break;
 
-    case 21:
+    case 20:
       interface = g_value_get_object (value);
       if (interface != NULL)
         {
@@ -32516,106 +31629,101 @@
   switch (prop_id)
     {
     case 1:
-      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Object.Mapper");
-      g_value_take_object (value, interface);
-      break;
-
-    case 2:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Hwmon");
       g_value_take_object (value, interface);
       break;
 
-    case 3:
+    case 2:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Fan");
       g_value_take_object (value, interface);
       break;
 
-    case 4:
+    case 3:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.SensorValue");
       g_value_take_object (value, interface);
       break;
 
-    case 5:
+    case 4:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.SensorThreshold");
       g_value_take_object (value, interface);
       break;
 
-    case 6:
+    case 5:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.SensorI2c");
       g_value_take_object (value, interface);
       break;
 
-    case 7:
+    case 6:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.SensorMatch");
       g_value_take_object (value, interface);
       break;
 
-    case 8:
+    case 7:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Process");
       g_value_take_object (value, interface);
       break;
 
-    case 9:
+    case 8:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.SharedResource");
       g_value_take_object (value, interface);
       break;
 
-    case 10:
+    case 9:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Control");
       g_value_take_object (value, interface);
       break;
 
-    case 11:
+    case 10:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.control.Bmc");
       g_value_take_object (value, interface);
       break;
 
-    case 12:
+    case 11:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.control.Host");
       g_value_take_object (value, interface);
       break;
 
-    case 13:
+    case 12:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.control.Power");
       g_value_take_object (value, interface);
       break;
 
-    case 14:
+    case 13:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.control.Checkstop");
       g_value_take_object (value, interface);
       break;
 
-    case 15:
+    case 14:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Watchdog");
       g_value_take_object (value, interface);
       break;
 
-    case 16:
+    case 15:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.EventLog");
       g_value_take_object (value, interface);
       break;
 
-    case 17:
+    case 16:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Flash");
       g_value_take_object (value, interface);
       break;
 
-    case 18:
+    case 17:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.FlashControl");
       g_value_take_object (value, interface);
       break;
 
-    case 19:
+    case 18:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Button");
       g_value_take_object (value, interface);
       break;
 
-    case 20:
+    case 19:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.Led");
       g_value_take_object (value, interface);
       break;
 
-    case 21:
+    case 20:
       interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.openbmc.HostIpmi");
       g_value_take_object (value, interface);
       break;
@@ -32634,27 +31742,26 @@
   gobject_class->set_property = object_skeleton_set_property;
   gobject_class->get_property = object_skeleton_get_property;
 
-  g_object_class_override_property (gobject_class, 1, "object-mapper");
-  g_object_class_override_property (gobject_class, 2, "hwmon");
-  g_object_class_override_property (gobject_class, 3, "fan");
-  g_object_class_override_property (gobject_class, 4, "sensor-value");
-  g_object_class_override_property (gobject_class, 5, "sensor-threshold");
-  g_object_class_override_property (gobject_class, 6, "sensor-i2c");
-  g_object_class_override_property (gobject_class, 7, "sensor-match");
-  g_object_class_override_property (gobject_class, 8, "process");
-  g_object_class_override_property (gobject_class, 9, "shared-resource");
-  g_object_class_override_property (gobject_class, 10, "control");
-  g_object_class_override_property (gobject_class, 11, "control-bmc");
-  g_object_class_override_property (gobject_class, 12, "control-host");
-  g_object_class_override_property (gobject_class, 13, "control-power");
-  g_object_class_override_property (gobject_class, 14, "control-checkstop");
-  g_object_class_override_property (gobject_class, 15, "watchdog");
-  g_object_class_override_property (gobject_class, 16, "event-log");
-  g_object_class_override_property (gobject_class, 17, "flash");
-  g_object_class_override_property (gobject_class, 18, "flash-control");
-  g_object_class_override_property (gobject_class, 19, "button");
-  g_object_class_override_property (gobject_class, 20, "led");
-  g_object_class_override_property (gobject_class, 21, "host-ipmi");
+  g_object_class_override_property (gobject_class, 1, "hwmon");
+  g_object_class_override_property (gobject_class, 2, "fan");
+  g_object_class_override_property (gobject_class, 3, "sensor-value");
+  g_object_class_override_property (gobject_class, 4, "sensor-threshold");
+  g_object_class_override_property (gobject_class, 5, "sensor-i2c");
+  g_object_class_override_property (gobject_class, 6, "sensor-match");
+  g_object_class_override_property (gobject_class, 7, "process");
+  g_object_class_override_property (gobject_class, 8, "shared-resource");
+  g_object_class_override_property (gobject_class, 9, "control");
+  g_object_class_override_property (gobject_class, 10, "control-bmc");
+  g_object_class_override_property (gobject_class, 11, "control-host");
+  g_object_class_override_property (gobject_class, 12, "control-power");
+  g_object_class_override_property (gobject_class, 13, "control-checkstop");
+  g_object_class_override_property (gobject_class, 14, "watchdog");
+  g_object_class_override_property (gobject_class, 15, "event-log");
+  g_object_class_override_property (gobject_class, 16, "flash");
+  g_object_class_override_property (gobject_class, 17, "flash-control");
+  g_object_class_override_property (gobject_class, 18, "button");
+  g_object_class_override_property (gobject_class, 19, "led");
+  g_object_class_override_property (gobject_class, 20, "host-ipmi");
 }
 
 /**
@@ -32673,18 +31780,6 @@
 }
 
 /**
- * object_skeleton_set_object_mapper:
- * @object: A #ObjectSkeleton.
- * @interface_: (allow-none): A #ObjectMapper or %NULL to clear the interface.
- *
- * Sets the #ObjectMapper instance for the D-Bus interface <link linkend="gdbus-interface-org-openbmc-Object-Mapper.top_of_page">org.openbmc.Object.Mapper</link> on @object.
- */
-void object_skeleton_set_object_mapper (ObjectSkeleton *object, ObjectMapper *interface_)
-{
-  g_object_set (G_OBJECT (object), "object-mapper", interface_, NULL);
-}
-
-/**
  * object_skeleton_set_hwmon:
  * @object: A #ObjectSkeleton.
  * @interface_: (allow-none): A #Hwmon or %NULL to clear the interface.
@@ -32986,7 +32081,6 @@
   if (g_once_init_enter (&once_init_value))
     {
       lookup_hash = g_hash_table_new (g_str_hash, g_str_equal);
-      g_hash_table_insert (lookup_hash, (gpointer) "org.openbmc.Object.Mapper", GSIZE_TO_POINTER (TYPE_OBJECT_MAPPER_PROXY));
       g_hash_table_insert (lookup_hash, (gpointer) "org.openbmc.Hwmon", GSIZE_TO_POINTER (TYPE_HWMON_PROXY));
       g_hash_table_insert (lookup_hash, (gpointer) "org.openbmc.Fan", GSIZE_TO_POINTER (TYPE_FAN_PROXY));
       g_hash_table_insert (lookup_hash, (gpointer) "org.openbmc.SensorValue", GSIZE_TO_POINTER (TYPE_SENSOR_VALUE_PROXY));
diff --git a/gdbus/interfaces/openbmc_intf.h b/gdbus/interfaces/openbmc_intf.h
index 060b0e0..3ba589d 100644
--- a/gdbus/interfaces/openbmc_intf.h
+++ b/gdbus/interfaces/openbmc_intf.h
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.44.1. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.42.2. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
@@ -13,139 +13,6 @@
 
 
 /* ------------------------------------------------------------------------ */
-/* Declarations for org.openbmc.Object.Mapper */
-
-#define TYPE_OBJECT_MAPPER (object_mapper_get_type ())
-#define OBJECT_MAPPER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_OBJECT_MAPPER, ObjectMapper))
-#define IS_OBJECT_MAPPER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_OBJECT_MAPPER))
-#define OBJECT_MAPPER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), TYPE_OBJECT_MAPPER, ObjectMapperIface))
-
-struct _ObjectMapper;
-typedef struct _ObjectMapper ObjectMapper;
-typedef struct _ObjectMapperIface ObjectMapperIface;
-
-struct _ObjectMapperIface
-{
-  GTypeInterface parent_iface;
-
-  void (*object_added) (
-    ObjectMapper *object,
-    const gchar *arg_object_path,
-    const gchar *arg_interface_name);
-
-};
-
-GType object_mapper_get_type (void) G_GNUC_CONST;
-
-GDBusInterfaceInfo *object_mapper_interface_info (void);
-guint object_mapper_override_properties (GObjectClass *klass, guint property_id_begin);
-
-
-/* D-Bus signal emissions functions: */
-void object_mapper_emit_object_added (
-    ObjectMapper *object,
-    const gchar *arg_object_path,
-    const gchar *arg_interface_name);
-
-
-
-/* ---- */
-
-#define TYPE_OBJECT_MAPPER_PROXY (object_mapper_proxy_get_type ())
-#define OBJECT_MAPPER_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_OBJECT_MAPPER_PROXY, ObjectMapperProxy))
-#define OBJECT_MAPPER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_OBJECT_MAPPER_PROXY, ObjectMapperProxyClass))
-#define OBJECT_MAPPER_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_OBJECT_MAPPER_PROXY, ObjectMapperProxyClass))
-#define IS_OBJECT_MAPPER_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_OBJECT_MAPPER_PROXY))
-#define IS_OBJECT_MAPPER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_OBJECT_MAPPER_PROXY))
-
-typedef struct _ObjectMapperProxy ObjectMapperProxy;
-typedef struct _ObjectMapperProxyClass ObjectMapperProxyClass;
-typedef struct _ObjectMapperProxyPrivate ObjectMapperProxyPrivate;
-
-struct _ObjectMapperProxy
-{
-  /*< private >*/
-  GDBusProxy parent_instance;
-  ObjectMapperProxyPrivate *priv;
-};
-
-struct _ObjectMapperProxyClass
-{
-  GDBusProxyClass parent_class;
-};
-
-GType object_mapper_proxy_get_type (void) G_GNUC_CONST;
-
-void object_mapper_proxy_new (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data);
-ObjectMapper *object_mapper_proxy_new_finish (
-    GAsyncResult        *res,
-    GError             **error);
-ObjectMapper *object_mapper_proxy_new_sync (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error);
-
-void object_mapper_proxy_new_for_bus (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data);
-ObjectMapper *object_mapper_proxy_new_for_bus_finish (
-    GAsyncResult        *res,
-    GError             **error);
-ObjectMapper *object_mapper_proxy_new_for_bus_sync (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error);
-
-
-/* ---- */
-
-#define TYPE_OBJECT_MAPPER_SKELETON (object_mapper_skeleton_get_type ())
-#define OBJECT_MAPPER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_OBJECT_MAPPER_SKELETON, ObjectMapperSkeleton))
-#define OBJECT_MAPPER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_OBJECT_MAPPER_SKELETON, ObjectMapperSkeletonClass))
-#define OBJECT_MAPPER_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_OBJECT_MAPPER_SKELETON, ObjectMapperSkeletonClass))
-#define IS_OBJECT_MAPPER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_OBJECT_MAPPER_SKELETON))
-#define IS_OBJECT_MAPPER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_OBJECT_MAPPER_SKELETON))
-
-typedef struct _ObjectMapperSkeleton ObjectMapperSkeleton;
-typedef struct _ObjectMapperSkeletonClass ObjectMapperSkeletonClass;
-typedef struct _ObjectMapperSkeletonPrivate ObjectMapperSkeletonPrivate;
-
-struct _ObjectMapperSkeleton
-{
-  /*< private >*/
-  GDBusInterfaceSkeleton parent_instance;
-  ObjectMapperSkeletonPrivate *priv;
-};
-
-struct _ObjectMapperSkeletonClass
-{
-  GDBusInterfaceSkeletonClass parent_class;
-};
-
-GType object_mapper_skeleton_get_type (void) G_GNUC_CONST;
-
-ObjectMapper *object_mapper_skeleton_new (void);
-
-
-/* ------------------------------------------------------------------------ */
 /* Declarations for org.openbmc.Hwmon */
 
 #define TYPE_HWMON (hwmon_get_type ())
@@ -4147,7 +4014,6 @@
 
 GType object_get_type (void) G_GNUC_CONST;
 
-ObjectMapper *object_get_object_mapper (Object *object);
 Hwmon *object_get_hwmon (Object *object);
 Fan *object_get_fan (Object *object);
 SensorValue *object_get_sensor_value (Object *object);
@@ -4168,7 +4034,6 @@
 Button *object_get_button (Object *object);
 Led *object_get_led (Object *object);
 HostIpmi *object_get_host_ipmi (Object *object);
-ObjectMapper *object_peek_object_mapper (Object *object);
 Hwmon *object_peek_hwmon (Object *object);
 Fan *object_peek_fan (Object *object);
 SensorValue *object_peek_sensor_value (Object *object);
@@ -4241,7 +4106,6 @@
 
 GType object_skeleton_get_type (void) G_GNUC_CONST;
 ObjectSkeleton *object_skeleton_new (const gchar *object_path);
-void object_skeleton_set_object_mapper (ObjectSkeleton *object, ObjectMapper *interface_);
 void object_skeleton_set_hwmon (ObjectSkeleton *object, Hwmon *interface_);
 void object_skeleton_set_fan (ObjectSkeleton *object, Fan *interface_);
 void object_skeleton_set_sensor_value (ObjectSkeleton *object, SensorValue *interface_);
diff --git a/gdbus/xml/openbmc_intf.xml b/gdbus/xml/openbmc_intf.xml
index d296291..cabe910 100644
--- a/gdbus/xml/openbmc_intf.xml
+++ b/gdbus/xml/openbmc_intf.xml
@@ -1,10 +1,4 @@
 <node>
-	<interface name="org.openbmc.Object.Mapper">
-		<signal name="ObjectAdded">
-			<arg name="object_path" type="s"/>
-			<arg name="interface_name" type="s"/>
-		</signal>
-	</interface>
 	<interface name="org.openbmc.Hwmon">
 		<property name="poll_interval" type="i" access="read"/>
 		<property name="sysfs_path" type="s" access="read"/>
diff --git a/pytools/obmcutil b/pytools/obmcutil
index bd753ca..6db589e 100644
--- a/pytools/obmcutil
+++ b/pytools/obmcutil
@@ -1,13 +1,9 @@
 #!/usr/bin/python
 
 import sys
-#import subprocess
-import gobject
 import dbus
-import dbus.service
-import dbus.mainloop.glib
-import xml.etree.ElementTree as ET
 import json
+import xml.etree.ElementTree as ET
 
 
 def fix_byte(it,key,parent):   
@@ -22,7 +18,17 @@
                 parent[key] = int(it)  
     else:                              
         pass                           
-                     
+
+
+def merge_interfaces(objs):
+    for op in objs:
+        merged = {}
+        for interface, properties in objs[op].items():
+            merged.update(properties)
+
+        del objs[op]
+        objs[op] = merged
+
 
 def printDict(name,data):
     	if (isinstance(data, dict)):   
@@ -118,14 +124,16 @@
 	'getinventory' : {
 		'bus_name' : 'org.openbmc.Inventory',
 		'object_name' : '/org/openbmc/inventory',
-		'interface_name' : 'org.openbmc.Object.Enumerate',
-		'method' : 'enumerate'
+		'interface_name' : 'org.freedesktop.DBus.ObjectManager',
+		'method' : 'GetManagedObjects',
+		'transform' : merge_interfaces
 	},
 	'getsensors' : {
 		'bus_name' : 'org.openbmc.Sensors',
 		'object_name' : '/org/openbmc/sensors',
-		'interface_name' : 'org.openbmc.Object.Enumerate',
-		'method' : 'enumerate'
+		'interface_name' : 'org.freedesktop.DBus.ObjectManager',
+		'method' : 'GetManagedObjects',
+		'transform' : merge_interfaces
 	},
 	'host' : {
 		'bus_name' : 'org.openbmc.control.Host',
@@ -183,6 +191,8 @@
 		data = methd(*sys.argv)
 		fix_byte(data,None,None)	
 		pydata = json.loads(json.dumps(data))
+		if 'transform' in objinfo:
+			objinfo['transform'](pydata)
 		printDict("",pydata)
 	except Exception as e:
 		print e