diff --git a/CLI/actioner/sonic_cli_clear_bgp.py b/CLI/actioner/sonic_cli_clear_bgp.py
index ea506dfc6f..6dfa203571 100755
--- a/CLI/actioner/sonic_cli_clear_bgp.py
+++ b/CLI/actioner/sonic_cli_clear_bgp.py
@@ -83,7 +83,6 @@ def clear_bgp_api(args):
 
     if dampeningIndex != "":
         af = ""
-        vrfname = ""
         pg = ""
         external = ""
         ifname = ""
diff --git a/CLI/clitree/cli-xml/bgp.xml b/CLI/clitree/cli-xml/bgp.xml
index 076012b0fe..568ff8892c 100644
--- a/CLI/clitree/cli-xml/bgp.xml
+++ b/CLI/clitree/cli-xml/bgp.xml
@@ -188,7 +188,7 @@ limitations under the License.
     </DOCGEN>
   </COMMAND>
   <COMMAND name="clear bgp ipv4" help="Clear BGP IPv4">
-    <MACRO name="NEW_BGP_CLR_OPTIONS" arg="4"></MACRO>
+    <MACRO name="NEW_BGP_CLR_OPTIONS" arg="4,"></MACRO>
     <ACTION builtin="clish_pyobj">sonic_cli_clear_bgp clear_bgp asn=${as-num-dot} n-ipv4=${ipv4-addr} n-ipv6=${ipv6-addr} cleartype=${cleartype} dampopt=${damptype} ${__line}</ACTION>
     <DOCGEN>
       <DESCRIPTION>
@@ -215,7 +215,7 @@ limitations under the License.
     </DOCGEN>
   </COMMAND>
   <COMMAND name="clear bgp ipv6" help="Clear BGP IPv6">
-    <MACRO name="NEW_BGP_CLR_OPTIONS" arg="6"></MACRO>
+    <MACRO name="NEW_BGP_CLR_OPTIONS" arg="6,V6"></MACRO>
     <ACTION builtin="clish_pyobj">sonic_cli_clear_bgp clear_bgp asn=${as-num-dot} n-ipv4=${ipv4-addr} n-ipv6=${ipv6-addr} cleartype=${cleartype} dampopt=${damptype} ${__full_line}</ACTION>
   </COMMAND>
   <COMMAND name="clear evpn" help="Clear EVPN information"/>
diff --git a/CLI/clitree/macro/bgp_macro.xml b/CLI/clitree/macro/bgp_macro.xml
index 2b7d86a7b5..10d3998910 100644
--- a/CLI/clitree/macro/bgp_macro.xml
+++ b/CLI/clitree/macro/bgp_macro.xml
@@ -84,8 +84,7 @@ limitations under the License.
         <PARAM name="ipv6-addr" help="IPv6 Neighbor address to clear BGP" ptype="IPV6_ADDR">
         <MACRO name="CLEAR_BGP_INOUT_SUB_CMDS" arg=""></MACRO>
         </PARAM>
-        <PARAM name="ip-prefix" help="IPv4 Prefix to clear BGP" ptype="IP_ADDR_MASK" test='"4" = "arg1"'>
-        <MACRO name="CLEAR_BGP_INOUT_SUB_CMDS" arg=""></MACRO>
+        <PARAM name="ip-prefix" help="IPvarg1 Prefix to clear BGP" ptype="IParg2_ADDR_MASK">
         </PARAM>
         <PARAM name="interface" help="Interface to clear BGP" ptype="SUBCOMMAND" mode="subcommand">
           <PARAM name="interface_type" help="Neigh type" ptype="SUBCOMMAND" mode="switch">