diff --git a/src/agent/fos-agent/fos_agent.ml b/src/agent/fos-agent/fos_agent.ml
index 74a35970..4d1397b1 100644
--- a/src/agent/fos-agent/fos_agent.ml
+++ b/src/agent/fos-agent/fos_agent.ml
@@ -531,10 +531,9 @@ let agent verbose_flag debug_flag configuration =
        | None -> Lwt.return_unit)
     | true ->
       (match uuid with
-       | Some _ ->
-         Lwt.return_unit
-       (* MVar.read self >>= fun self ->
-          Yaks_connector.Global.Actual.remove_node_fdu sys_id Yaks_connector.default_tenant_id (Apero.Option.get self.configuration.agent.uuid) fduid self.yaks >>= Lwt.return *)
+       | Some fdu_id ->
+         MVar.read self >>= fun self ->
+         Yaks_connector.Global.Actual.remove_node_fdu sys_id Yaks_connector.default_tenant_id (Apero.Option.get self.configuration.agent.uuid) fdu_id self.yaks >>= Lwt.return
        | None -> Lwt.return_unit)
   in
   (* Constrained Nodes Global *)
@@ -645,6 +644,7 @@ let agent verbose_flag debug_flag configuration =
   (* Constraint Eval  *)
   let%lwt _ = Yaks_connector.LocalConstraint.Actual.add_agent_eval uuid "get_fdu_info" (eval_get_fdu_info state) yaks in
   (* Registering listeners *)
+  (* Global Desired Listeners *)
   let%lwt _ = Yaks_connector.Global.Desired.observe_node_plugins sys_id Yaks_connector.default_tenant_id uuid (cb_gd_plugin state) yaks in
   let%lwt _ = Yaks_connector.Global.Desired.observe_fdu sys_id Yaks_connector.default_tenant_id (cb_gd_fdu state) yaks in
   let%lwt _ = Yaks_connector.Global.Desired.observe_node_fdu sys_id Yaks_connector.default_tenant_id uuid (cb_gd_node_fdu state) yaks in
@@ -652,6 +652,7 @@ let agent verbose_flag debug_flag configuration =
   let%lwt _ = Yaks_connector.Global.Desired.observe_ports sys_id Yaks_connector.default_tenant_id (cb_gd_cp state) yaks in
   let%lwt _ = Yaks_connector.Global.Desired.observe_images sys_id Yaks_connector.default_tenant_id (cb_gd_image state) yaks in
   let%lwt _ = Yaks_connector.Global.Desired.observe_flavors sys_id Yaks_connector.default_tenant_id (cb_gd_flavor state) yaks in
+  (* Local Actual Listeners *)
   let%lwt _ = Yaks_connector.Local.Actual.observe_node_plugins uuid (cb_la_plugin state) yaks in
   let%lwt _ = Yaks_connector.Local.Actual.observe_node_info uuid (cb_la_ni state) yaks in
   let%lwt _ = Yaks_connector.Local.Actual.observe_node_status uuid (cb_la_ns state) yaks in