diff --git a/bgpd/rfapi/vnc_debug.c b/bgpd/rfapi/vnc_debug.c
index cb9799870b..7cac7ac7a1 100644
--- a/bgpd/rfapi/vnc_debug.c
+++ b/bgpd/rfapi/vnc_debug.c
@@ -114,21 +114,6 @@ DEFUN (no_debug_bgp_vnc,
 	return CMD_WARNING_CONFIG_FAILED;
 }
 
-#if CONFDATE > 20190402
-CPP_NOTICE("bgpd: time to remove undebug commands")
-#endif
-ALIAS_HIDDEN(no_debug_bgp_vnc,
-             undebug_bgp_vnc_cmd,
-	     "undebug bgp vnc <rfapi-query|import-bi-attach|import-del-remote|verbose>",
-             "Undebug\n"
-             BGP_STR
-             VNC_STR
-             "rfapi query handling\n"
-             "import BI atachment\n"
-             "import delete remote routes\n"
-             "verbose logging\n")
-
-
 /***********************************************************************
  *	no debug bgp vnc all
  ***********************************************************************/
@@ -148,17 +133,6 @@ DEFUN (no_debug_bgp_vnc_all,
 	return CMD_SUCCESS;
 }
 
-#if CONFDATE > 20190402
-CPP_NOTICE("bgpd: time to remove undebug commands")
-#endif
-ALIAS_HIDDEN (no_debug_bgp_vnc_all,
-              undebug_bgp_vnc_all_cmd,
-              "undebug all bgp vnc",
-              "Undebug\n"
-              "Disable all VNC debugging\n"
-              BGP_STR
-              VNC_STR)
-
 /***********************************************************************
  *	show/save
  ***********************************************************************/
@@ -210,11 +184,7 @@ void vnc_debug_init(void)
 	install_element(CONFIG_NODE, &debug_bgp_vnc_cmd);
 	install_element(ENABLE_NODE, &no_debug_bgp_vnc_cmd);
 	install_element(CONFIG_NODE, &no_debug_bgp_vnc_cmd);
-	install_element(ENABLE_NODE, &undebug_bgp_vnc_cmd);
-	install_element(CONFIG_NODE, &undebug_bgp_vnc_cmd);
 
 	install_element(ENABLE_NODE, &no_debug_bgp_vnc_all_cmd);
 	install_element(CONFIG_NODE, &no_debug_bgp_vnc_all_cmd);
-	install_element(ENABLE_NODE, &undebug_bgp_vnc_all_cmd);
-	install_element(CONFIG_NODE, &undebug_bgp_vnc_all_cmd);
 }
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 70b3ae10e5..58870b6525 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -7414,14 +7414,6 @@ DEFUN (no_debug_msdp,
 	return CMD_SUCCESS;
 }
 
-#if CONFDATE > 20190402
-CPP_NOTICE("bgpd: time to remove undebug commands")
-#endif
-ALIAS_HIDDEN (no_debug_msdp,
-              undebug_msdp_cmd,
-              "undebug msdp",
-              UNDEBUG_STR DEBUG_MSDP_STR)
-
 DEFUN (debug_msdp_events,
        debug_msdp_events_cmd,
        "debug msdp events",
@@ -7445,16 +7437,6 @@ DEFUN (no_debug_msdp_events,
 	return CMD_SUCCESS;
 }
 
-#if CONFDATE > 20190402
-CPP_NOTICE("bgpd: time to remove undebug commands")
-#endif
-ALIAS_HIDDEN (no_debug_msdp_events,
-              undebug_msdp_events_cmd,
-              "undebug msdp events",
-              UNDEBUG_STR
-              DEBUG_MSDP_STR
-              DEBUG_MSDP_EVENTS_STR)
-
 DEFUN (debug_msdp_packets,
        debug_msdp_packets_cmd,
        "debug msdp packets",
@@ -7478,16 +7460,6 @@ DEFUN (no_debug_msdp_packets,
 	return CMD_SUCCESS;
 }
 
-#if CONFDATE > 20190402
-CPP_NOTICE("bgpd: time to remove undebug commands")
-#endif
-ALIAS_HIDDEN (no_debug_msdp_packets,
-              undebug_msdp_packets_cmd,
-              "undebug msdp packets",
-              UNDEBUG_STR
-              DEBUG_MSDP_STR
-              DEBUG_MSDP_PACKETS_STR)
-
 DEFUN (debug_mtrace,
        debug_mtrace_cmd,
        "debug mtrace",
@@ -8921,13 +8893,10 @@ void pim_cmd_init(void)
 	install_element(ENABLE_NODE, &no_debug_pim_zebra_cmd);
 	install_element(ENABLE_NODE, &debug_msdp_cmd);
 	install_element(ENABLE_NODE, &no_debug_msdp_cmd);
-	install_element(ENABLE_NODE, &undebug_msdp_cmd);
 	install_element(ENABLE_NODE, &debug_msdp_events_cmd);
 	install_element(ENABLE_NODE, &no_debug_msdp_events_cmd);
-	install_element(ENABLE_NODE, &undebug_msdp_events_cmd);
 	install_element(ENABLE_NODE, &debug_msdp_packets_cmd);
 	install_element(ENABLE_NODE, &no_debug_msdp_packets_cmd);
-	install_element(ENABLE_NODE, &undebug_msdp_packets_cmd);
 	install_element(ENABLE_NODE, &debug_mtrace_cmd);
 	install_element(ENABLE_NODE, &no_debug_mtrace_cmd);
 
@@ -8965,13 +8934,10 @@ void pim_cmd_init(void)
 	install_element(CONFIG_NODE, &no_debug_pim_zebra_cmd);
 	install_element(CONFIG_NODE, &debug_msdp_cmd);
 	install_element(CONFIG_NODE, &no_debug_msdp_cmd);
-	install_element(CONFIG_NODE, &undebug_msdp_cmd);
 	install_element(CONFIG_NODE, &debug_msdp_events_cmd);
 	install_element(CONFIG_NODE, &no_debug_msdp_events_cmd);
-	install_element(CONFIG_NODE, &undebug_msdp_events_cmd);
 	install_element(CONFIG_NODE, &debug_msdp_packets_cmd);
 	install_element(CONFIG_NODE, &no_debug_msdp_packets_cmd);
-	install_element(CONFIG_NODE, &undebug_msdp_packets_cmd);
 	install_element(CONFIG_NODE, &debug_mtrace_cmd);
 	install_element(CONFIG_NODE, &no_debug_mtrace_cmd);