1 files changed, 3 insertions, 26 deletions

diff --git a/mgmtd/mgmt_ds.c b/mgmtd/mgmt_ds.c
index 1724afb182..58c49b8789 100644
--- a/mgmtd/mgmt_ds.c
+++ b/mgmtd/mgmt_ds.c
@@ -87,7 +87,6 @@ static int mgmt_ds_replace_dst_with_src_ds(struct mgmt_ds_ctx *src,
 					   struct mgmt_ds_ctx *dst)
 {
 	struct lyd_node *dst_dnode, *src_dnode;
-	struct ly_out *out;
 
 	if (!src || !dst)
 		return -1;
@@ -117,13 +116,6 @@ static int mgmt_ds_replace_dst_with_src_ds(struct mgmt_ds_ctx *src,
 		nb_config_diff_del_changes(&src->root.cfg_root->cfg_chgs);
 	}
 
-	if (dst->ds_id == MGMTD_DS_RUNNING) {
-		if (ly_out_new_filepath(MGMTD_STARTUP_DS_FILE_PATH, &out)
-		    == LY_SUCCESS)
-			mgmt_ds_dump_in_memory(dst, "", LYD_JSON, out);
-		ly_out_free(out, NULL, 0);
-	}
-
 	/* TODO: Update the versions if nb_config present */
 
 	return 0;
@@ -134,7 +126,6 @@ static int mgmt_ds_merge_src_with_dst_ds(struct mgmt_ds_ctx *src,
 {
 	int ret;
 	struct lyd_node **dst_dnode, *src_dnode;
-	struct ly_out *out;
 
 	if (!src || !dst)
 		return -1;
@@ -159,13 +150,6 @@ static int mgmt_ds_merge_src_with_dst_ds(struct mgmt_ds_ctx *src,
 		nb_config_diff_del_changes(&src->root.cfg_root->cfg_chgs);
 	}
 
-	if (dst->ds_id == MGMTD_DS_RUNNING) {
-		if (ly_out_new_filepath(MGMTD_STARTUP_DS_FILE_PATH, &out)
-		    == LY_SUCCESS)
-			mgmt_ds_dump_in_memory(dst, "", LYD_JSON, out);
-		ly_out_free(out, NULL, 0);
-	}
-
 	return 0;
 }
 
@@ -190,6 +174,7 @@ static int mgmt_ds_load_cfg_from_file(const char *filepath,
 void mgmt_ds_reset_candidate(void)
 {
 	struct lyd_node *dnode = mm->candidate_ds->root.cfg_root->dnode;
+
 	if (dnode)
 		yang_dnode_free(dnode);
 
@@ -200,8 +185,6 @@ void mgmt_ds_reset_candidate(void)
 
 int mgmt_ds_init(struct mgmt_master *mm)
 {
-	struct lyd_node *root;
-
 	if (mgmt_ds_mm || mm->running_ds || mm->candidate_ds || mm->oper_ds)
 		assert(!"MGMTD: Call ds_init only once!");
 
@@ -209,12 +192,6 @@ int mgmt_ds_init(struct mgmt_master *mm)
 	if (!running_config)
 		assert(!"MGMTD: Call ds_init after frr_init only!");
 
-	if (mgmt_ds_load_cfg_from_file(MGMTD_STARTUP_DS_FILE_PATH, &root)
-	    == 0) {
-		nb_config_free(running_config);
-		running_config = nb_config_new(root);
-	}
-
 	running.root.cfg_root = running_config;
 	running.config_ds = true;
 	running.ds_id = MGMTD_DS_RUNNING;
@@ -523,12 +500,12 @@ int mgmt_ds_delete_data_nodes(struct mgmt_ds_ctx *ds_ctx, const char *xpath)
 		 */
 		return NB_ERR_NOT_FOUND;
 	/* destroy dependant */
-	if (nb_node->dep_cbs.get_dependant_xpath) {
+	if (nb_node && nb_node->dep_cbs.get_dependant_xpath) {
 		nb_node->dep_cbs.get_dependant_xpath(dnode, dep_xpath);
 
 		dep_dnode = yang_dnode_get(
 			ds_ctx->config_ds ? ds_ctx->root.cfg_root->dnode
-					   : ds_ctx->root.dnode_root,
+					  : ds_ctx->root.dnode_root,
 			dep_xpath);
 		if (dep_dnode)
 			lyd_free_tree(dep_dnode);