diff --git a/orchagent/portsorch.cpp b/orchagent/portsorch.cpp
index afbefbad34..09caa28a5d 100644
--- a/orchagent/portsorch.cpp
+++ b/orchagent/portsorch.cpp
@@ -7214,9 +7214,7 @@ bool PortsOrch::addTunnel(string tunnel_alias, sai_object_id_t tunnel_id, bool h
     {
         tunnel.m_learn_mode = SAI_BRIDGE_PORT_FDB_LEARNING_MODE_DISABLE;
     }
-    tunnel.m_oper_status = SAI_PORT_OPER_STATUS_DOWN;
     m_portList[tunnel_alias] = tunnel;
-    saiOidToAlias[tunnel_id] = tunnel_alias;
 
     SWSS_LOG_INFO("addTunnel:: %" PRIx64, tunnel_id);
 
@@ -7227,7 +7225,6 @@ bool PortsOrch::removeTunnel(Port tunnel)
 {
     SWSS_LOG_ENTER();
 
-    saiOidToAlias.erase(tunnel.m_tunnel_id);
     m_portList.erase(tunnel.m_alias);
 
     return true;
@@ -8101,7 +8098,7 @@ void PortsOrch::updatePortOperStatus(Port &port, sai_port_oper_status_t status)
         return;
     }
 
-    if (port.m_type == Port::PHY || port.m_type == Port::TUNNEL)
+    if (port.m_type == Port::PHY)
     {
         updateDbPortOperStatus(port, status);
         updateDbPortFlapCount(port, status);
diff --git a/orchagent/vxlanorch.cpp b/orchagent/vxlanorch.cpp
index bf81e8b072..05a2d3e603 100644
--- a/orchagent/vxlanorch.cpp
+++ b/orchagent/vxlanorch.cpp
@@ -358,15 +358,6 @@ create_tunnel(
         attr.id = SAI_TUNNEL_ATTR_ENCAP_TTL_VAL;
         attr.value.u8 = encap_ttl;
         tunnel_attrs.push_back(attr);
-    } else {
-        attr.id = SAI_TUNNEL_ATTR_ENCAP_TTL_MODE;
-        attr.value.s32 = SAI_TUNNEL_TTL_MODE_PIPE_MODEL;
-        tunnel_attrs.push_back(attr);
-
-        attr.id = SAI_TUNNEL_ATTR_ENCAP_TTL_VAL;
-        attr.value.u8 = DEFAULT_TUNNEL_ENCAP_TTL;
-        tunnel_attrs.push_back(attr);
-
     }
 
     sai_object_id_t tunnel_id;
diff --git a/orchagent/vxlanorch.h b/orchagent/vxlanorch.h
index eb68d0ce70..695f7441e0 100644
--- a/orchagent/vxlanorch.h
+++ b/orchagent/vxlanorch.h
@@ -46,7 +46,6 @@ typedef enum
 #define MAX_VLAN_ID 4095
 
 #define MAX_VNI_ID 16777215
-#define DEFAULT_TUNNEL_ENCAP_TTL 64
 
 typedef enum
 {