diff --git a/bfdd/bfdd_cli.c b/bfdd/bfdd_cli.c
index e51aa21b4932..2e213a2237ea 100644
--- a/bfdd/bfdd_cli.c
+++ b/bfdd/bfdd_cli.c
@@ -338,11 +338,12 @@ void bfd_cli_show_minimum_ttl(struct vty *vty, const struct lyd_node *dnode,
 
 DEFPY_YANG(
 	bfd_peer_mult, bfd_peer_mult_cmd,
-	"detect-multiplier (2-255)$multiplier",
+	"[no] detect-multiplier ![(2-255)$multiplier]",
+	NO_STR
 	"Configure peer detection multiplier\n"
 	"Configure peer detection multiplier value\n")
 {
-	nb_cli_enqueue_change(vty, "./detection-multiplier", NB_OP_MODIFY,
+	nb_cli_enqueue_change(vty, "./detection-multiplier", no ? NB_OP_DESTROY : NB_OP_MODIFY,
 			      multiplier_str);
 	return nb_cli_apply_changes(vty, NULL);
 }
@@ -576,7 +577,8 @@ void bfd_cli_show_profile(struct vty *vty, const struct lyd_node *dnode,
 }
 
 ALIAS_YANG(bfd_peer_mult, bfd_profile_mult_cmd,
-      "detect-multiplier (2-255)$multiplier",
+      "[no] detect-multiplier ![(2-255)$multiplier]",
+      NO_STR
       "Configure peer detection multiplier\n"
       "Configure peer detection multiplier value\n")
 
@@ -619,7 +621,8 @@ ALIAS_YANG(bfd_peer_echo, bfd_profile_echo_cmd,
       "Configure echo mode\n")
 
 ALIAS_YANG(bfd_peer_echo_interval, bfd_profile_echo_interval_cmd,
-      "echo-interval (10-60000)$interval",
+      "[no] echo-interval ![(10-60000)$interval]",
+      NO_STR
       "Configure peer echo interval\n"
       "Configure peer echo interval value in milliseconds\n")
 
diff --git a/lib/bfd.h b/lib/bfd.h
index 48929a95642c..99790f96a54b 100644
--- a/lib/bfd.h
+++ b/lib/bfd.h
@@ -16,14 +16,8 @@ extern "C" {
 #endif
 
 #define BFD_DEF_MIN_RX 300
-#define BFD_MIN_MIN_RX 50
-#define BFD_MAX_MIN_RX 60000
 #define BFD_DEF_MIN_TX 300
-#define BFD_MIN_MIN_TX 50
-#define BFD_MAX_MIN_TX 60000
 #define BFD_DEF_DETECT_MULT 3
-#define BFD_MIN_DETECT_MULT 2
-#define BFD_MAX_DETECT_MULT 255
 
 #define BFD_STATUS_UNKNOWN    (1 << 0) /* BFD session status never received */
 #define BFD_STATUS_DOWN       (1 << 1) /* BFD session status is down */