diff --git a/models/yang/sonic/sonic-loopback-interface.yang b/models/yang/sonic/sonic-loopback-interface.yang
index d2c228ff1a..99703a8bae 100644
--- a/models/yang/sonic/sonic-loopback-interface.yang
+++ b/models/yang/sonic/sonic-loopback-interface.yang
@@ -44,7 +44,6 @@ module sonic-loopback-interface {
                 }
 
                 leaf ip_prefix {
-                    mandatory true;
                     type inet:ip-prefix;
 
                 }
diff --git a/models/yang/sonic/sonic-mgmt-interface.yang b/models/yang/sonic/sonic-mgmt-interface.yang
index d9d8ae89b0..19798c8986 100644
--- a/models/yang/sonic/sonic-mgmt-interface.yang
+++ b/models/yang/sonic/sonic-mgmt-interface.yang
@@ -63,7 +63,6 @@ module sonic-mgmt-interface {
 
                 leaf ip_prefix {
                     type inet:ip-prefix;
-
                 }
 
                 leaf gwaddr {
diff --git a/models/yang/sonic/sonic-vlan-interface.yang b/models/yang/sonic/sonic-vlan-interface.yang
index 87f79b31a8..805603b874 100644
--- a/models/yang/sonic/sonic-vlan-interface.yang
+++ b/models/yang/sonic/sonic-vlan-interface.yang
@@ -48,7 +48,6 @@ module sonic-vlan-interface {
                 }
 
                 leaf ip_prefix {
-                    mandatory true;
                     type inet:ip-prefix;
 
                 }
diff --git a/models/yang/sonic/sonic-vlan.yang b/models/yang/sonic/sonic-vlan.yang
index 2d5c7cfc28..7d6170a727 100644
--- a/models/yang/sonic/sonic-vlan.yang
+++ b/models/yang/sonic/sonic-vlan.yang
@@ -104,9 +104,6 @@ module sonic-vlan {
                 }
 
                 leaf ifname {
-                    //type leafref {
-                        //path "/prt:sonic-port/prt:PORT/prt:PORT_LIST/prt:ifname";
-                    //}
                     type union {
                         type leafref {
                             path "/prt:sonic-port/prt:PORT/prt:PORT_LIST/prt:ifname";