diff --git a/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4 b/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4
index b1bbcaf..34a88b8 100644
--- a/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4
@@ -92,10 +92,8 @@
     }
     table uplink_pdr_lookup {
         key = {
-            // tunnel_dst_addr will be static for Q2 target. Can remove if need more scaling
             hdr.ipv4.dst_addr           : exact @name("tunnel_ipv4_dst");
             hdr.gtpu.teid               : exact @name("teid");
-            hdr.inner_ipv4.src_addr     : exact @name("ue_addr");
         }
         actions = {
             set_pdr_attributes;
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index e0d2c6a..8e85366 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -2011,7 +2011,7 @@
       "id" : 19,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 182,
+        "line" : 180,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -2059,7 +2059,7 @@
       "id" : 23,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 303,
+        "line" : 301,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -2135,7 +2135,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 364,
+        "line" : 362,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -4398,7 +4398,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 140,
+            "line" : 138,
             "column" : 35,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -4437,7 +4437,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 141,
+            "line" : 139,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -4508,7 +4508,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 150,
+            "line" : 148,
             "column" : 35,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -4547,7 +4547,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 149,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -4576,7 +4576,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 151,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -4595,7 +4595,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 154,
+            "line" : 152,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -4614,7 +4614,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 155,
+            "line" : 153,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -4633,7 +4633,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 156,
+            "line" : 154,
             "column" : 39,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -4652,7 +4652,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 157,
+            "line" : 155,
             "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -4671,7 +4671,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 159,
+            "line" : 157,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -4690,7 +4690,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 160,
+            "line" : 158,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -4709,7 +4709,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 161,
+            "line" : 159,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -4728,7 +4728,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 162,
+            "line" : 160,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -4773,7 +4773,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 187,
             "column" : 27,
             "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
           }
@@ -4792,7 +4792,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 188,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
           }
@@ -4811,7 +4811,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 191,
+            "line" : 189,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
           }
@@ -4830,7 +4830,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 192,
+            "line" : 190,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_sport; ..."
           }
@@ -4849,7 +4849,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 193,
+            "line" : 191,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_dport; ..."
           }
@@ -4868,7 +4868,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 195,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
           }
@@ -4883,7 +4883,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 196,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "hdr.inner_ipv4.setInvalid()"
           }
@@ -4898,7 +4898,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 197,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "hdr.gtpu.setInvalid()"
           }
@@ -4913,7 +4913,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 201,
+            "line" : 199,
             "column" : 8,
             "source_fragment" : "hdr.udp.setInvalid()"
           }
@@ -4932,7 +4932,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 202,
+            "line" : 200,
             "column" : 8,
             "source_fragment" : "hdr.tcp = hdr.inner_tcp"
           }
@@ -4947,7 +4947,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 203,
+            "line" : 201,
             "column" : 8,
             "source_fragment" : "hdr.inner_tcp.setInvalid()"
           }
@@ -4992,7 +4992,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 187,
             "column" : 27,
             "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
           }
@@ -5011,7 +5011,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 188,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
           }
@@ -5030,7 +5030,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 191,
+            "line" : 189,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
           }
@@ -5049,7 +5049,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 192,
+            "line" : 190,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_sport; ..."
           }
@@ -5068,7 +5068,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 193,
+            "line" : 191,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_dport; ..."
           }
@@ -5087,7 +5087,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 195,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
           }
@@ -5102,7 +5102,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 196,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "hdr.inner_ipv4.setInvalid()"
           }
@@ -5117,7 +5117,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 197,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "hdr.gtpu.setInvalid()"
           }
@@ -5136,7 +5136,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 207,
+            "line" : 205,
             "column" : 8,
             "source_fragment" : "hdr.udp = hdr.inner_udp"
           }
@@ -5151,7 +5151,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 208,
+            "line" : 206,
             "column" : 8,
             "source_fragment" : "hdr.inner_udp.setInvalid()"
           }
@@ -5196,7 +5196,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 187,
             "column" : 27,
             "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
           }
@@ -5215,7 +5215,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 188,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
           }
@@ -5234,7 +5234,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 191,
+            "line" : 189,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
           }
@@ -5253,7 +5253,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 192,
+            "line" : 190,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_sport; ..."
           }
@@ -5272,7 +5272,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 193,
+            "line" : 191,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_dport; ..."
           }
@@ -5291,7 +5291,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 195,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
           }
@@ -5306,7 +5306,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 196,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "hdr.inner_ipv4.setInvalid()"
           }
@@ -5321,7 +5321,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 197,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "hdr.gtpu.setInvalid()"
           }
@@ -5336,7 +5336,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 212,
+            "line" : 210,
             "column" : 8,
             "source_fragment" : "hdr.udp.setInvalid()"
           }
@@ -5355,7 +5355,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 213,
+            "line" : 211,
             "column" : 8,
             "source_fragment" : "hdr.icmp = hdr.inner_icmp"
           }
@@ -5370,7 +5370,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 214,
+            "line" : 212,
             "column" : 8,
             "source_fragment" : "hdr.inner_icmp.setInvalid()"
           }
@@ -5415,7 +5415,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 187,
             "column" : 27,
             "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
           }
@@ -5434,7 +5434,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 188,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
           }
@@ -5453,7 +5453,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 191,
+            "line" : 189,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
           }
@@ -5472,7 +5472,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 192,
+            "line" : 190,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_sport; ..."
           }
@@ -5491,7 +5491,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 193,
+            "line" : 191,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_dport; ..."
           }
@@ -5510,7 +5510,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 195,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
           }
@@ -5525,7 +5525,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 196,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "hdr.inner_ipv4.setInvalid()"
           }
@@ -5540,7 +5540,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 197,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "hdr.gtpu.setInvalid()"
           }
@@ -5555,7 +5555,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 218,
+            "line" : 216,
             "column" : 8,
             "source_fragment" : "hdr.udp.setInvalid()"
           }
@@ -5701,7 +5701,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 251,
+            "line" : 249,
             "column" : 46,
             "source_fragment" : "return"
           }
@@ -5727,7 +5727,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 265,
+            "line" : 263,
             "column" : 8,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
@@ -5763,7 +5763,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 282,
+            "line" : 280,
             "column" : 38,
             "source_fragment" : "= true; ..."
           }
@@ -5792,7 +5792,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 283,
+            "line" : 281,
             "column" : 32,
             "source_fragment" : "= true; ..."
           }
@@ -5818,7 +5818,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 291,
+            "line" : 289,
             "column" : 32,
             "source_fragment" : "= hdr.ipv4.total_len; ..."
           }
@@ -14943,7 +14943,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 308,
+            "line" : 306,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.setValid()"
           }
@@ -14962,7 +14962,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 309,
+            "line" : 307,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.version = 4"
           }
@@ -15000,7 +15000,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 311,
+            "line" : 309,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
           }
@@ -15019,7 +15019,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 312,
+            "line" : 310,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
           }
@@ -15061,7 +15061,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 313,
+            "line" : 311,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
           }
@@ -15080,7 +15080,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 315,
+            "line" : 313,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
           }
@@ -15099,7 +15099,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 316,
+            "line" : 314,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
           }
@@ -15118,7 +15118,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 317,
+            "line" : 315,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
           }
@@ -15175,7 +15175,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 320,
+            "line" : 318,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
           }
@@ -15194,7 +15194,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 321,
+            "line" : 319,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
           }
@@ -15213,7 +15213,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 322,
+            "line" : 320,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
           }
@@ -15228,7 +15228,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 324,
+            "line" : 322,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.setValid()"
           }
@@ -15247,7 +15247,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 325,
+            "line" : 323,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
           }
@@ -15266,7 +15266,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 326,
+            "line" : 324,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.dport = 2152"
           }
@@ -15308,7 +15308,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 327,
+            "line" : 325,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
           }
@@ -15327,7 +15327,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 329,
+            "line" : 327,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.checksum = 0"
           }
@@ -15342,7 +15342,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 332,
+            "line" : 330,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.setValid()"
           }
@@ -15361,7 +15361,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 333,
+            "line" : 331,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.version = 0x01"
           }
@@ -15380,7 +15380,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 334,
+            "line" : 332,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
           }
@@ -15399,7 +15399,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 335,
+            "line" : 333,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.spare = 0"
           }
@@ -15418,7 +15418,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 336,
+            "line" : 334,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
           }
@@ -15437,7 +15437,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 337,
+            "line" : 335,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
           }
@@ -15456,7 +15456,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 338,
+            "line" : 336,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
           }
@@ -15475,7 +15475,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 339,
+            "line" : 337,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
           }
@@ -15494,7 +15494,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 340,
+            "line" : 338,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
           }
@@ -15513,7 +15513,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 341,
+            "line" : 339,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
           }
@@ -15934,7 +15934,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 345,
+            "line" : 343,
             "column" : 46,
             "source_fragment" : "return"
           }
@@ -15990,7 +15990,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 346,
+            "line" : 344,
             "column" : 8,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
@@ -16371,7 +16371,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 251,
+            "line" : 249,
             "column" : 46,
             "source_fragment" : "return"
           },
@@ -16416,12 +16416,6 @@
               "name" : "teid",
               "target" : ["gtpu", "teid"],
               "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "ue_addr",
-              "target" : ["inner_ipv4", "src_addr"],
-              "mask" : null
             }
           ],
           "match_type" : "exact",
@@ -16484,7 +16478,7 @@
           "id" : 6,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 265,
+            "line" : 263,
             "column" : 8,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           },
@@ -16513,7 +16507,7 @@
           "id" : 7,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 221,
+            "line" : 219,
             "column" : 10,
             "source_fragment" : "decap_gtpu"
           },
@@ -16562,7 +16556,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 235,
+                "line" : 233,
                 "column" : 12,
                 "source_fragment" : "(true, false, false) : decap_inner_tcp()"
               },
@@ -16589,7 +16583,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 236,
+                "line" : 234,
                 "column" : 12,
                 "source_fragment" : "(false, true, false) : decap_inner_udp()"
               },
@@ -16616,7 +16610,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 237,
+                "line" : 235,
                 "column" : 12,
                 "source_fragment" : "(false, false, true) : decap_inner_icmp()"
               },
@@ -16647,7 +16641,7 @@
           "id" : 8,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 165,
+            "line" : 163,
             "column" : 10,
             "source_fragment" : "far_lookup"
           },
@@ -16684,7 +16678,7 @@
           "id" : 9,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 282,
+            "line" : 280,
             "column" : 38,
             "source_fragment" : "= true; ..."
           },
@@ -16713,7 +16707,7 @@
           "id" : 10,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 291,
+            "line" : 289,
             "column" : 32,
             "source_fragment" : "="
           },
@@ -18293,7 +18287,7 @@
           "id" : 1,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 251,
+            "line" : 249,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.skip_spgw == true"
           },
@@ -18350,7 +18344,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 255,
+            "line" : 253,
             "column" : 12,
             "source_fragment" : "hdr.gtpu.isValid()"
           },
@@ -18373,7 +18367,7 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 268,
+            "line" : 266,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
           },
@@ -18406,7 +18400,7 @@
           "id" : 5,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 279,
+            "line" : 277,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.far_dropped == true"
           },
@@ -19503,7 +19497,7 @@
           "id" : 70,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 345,
+            "line" : 343,
             "column" : 46,
             "source_fragment" : "return"
           },
@@ -19532,7 +19526,7 @@
           "id" : 71,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 346,
+            "line" : 344,
             "column" : 8,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           },
@@ -19561,7 +19555,7 @@
           "id" : 72,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 349,
+            "line" : 347,
             "column" : 12,
             "source_fragment" : "gtpu_encap()"
           },
@@ -21112,7 +21106,7 @@
           "id" : 40,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 345,
+            "line" : 343,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.skip_spgw == true"
           },
@@ -21169,7 +21163,7 @@
           "id" : 42,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 348,
+            "line" : 346,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_encap == true"
           },
@@ -21625,7 +21619,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 364,
+        "line" : 362,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
index 4fd6025..1d379f5 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
@@ -755,12 +755,6 @@
     bitwidth: 32
     match_type: EXACT
   }
-  match_fields {
-    id: 3
-    name: "ue_addr"
-    bitwidth: 32
-    match_type: EXACT
-  }
   action_refs {
     id: 16799934
   }
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index 66cdf74..a57258b 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -1508,7 +1508,7 @@
       "id" : 12,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 182,
+        "line" : 180,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1544,7 +1544,7 @@
       "id" : 15,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 303,
+        "line" : 301,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1620,7 +1620,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 364,
+        "line" : 362,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -3007,7 +3007,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 140,
+            "line" : 138,
             "column" : 35,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -3046,7 +3046,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 141,
+            "line" : 139,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -3117,7 +3117,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 150,
+            "line" : 148,
             "column" : 35,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -3156,7 +3156,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 149,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -3185,7 +3185,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 151,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -3204,7 +3204,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 154,
+            "line" : 152,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -3223,7 +3223,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 155,
+            "line" : 153,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -3242,7 +3242,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 156,
+            "line" : 154,
             "column" : 39,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -3261,7 +3261,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 157,
+            "line" : 155,
             "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -3280,7 +3280,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 159,
+            "line" : 157,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -3299,7 +3299,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 160,
+            "line" : 158,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -3318,7 +3318,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 161,
+            "line" : 159,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -3337,7 +3337,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 162,
+            "line" : 160,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -3382,7 +3382,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 187,
             "column" : 27,
             "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
           }
@@ -3401,7 +3401,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 188,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
           }
@@ -3420,7 +3420,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 191,
+            "line" : 189,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
           }
@@ -3439,7 +3439,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 192,
+            "line" : 190,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_sport; ..."
           }
@@ -3458,7 +3458,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 193,
+            "line" : 191,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_dport; ..."
           }
@@ -3477,7 +3477,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 195,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
           }
@@ -3492,7 +3492,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 196,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "hdr.inner_ipv4.setInvalid()"
           }
@@ -3507,7 +3507,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 197,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "hdr.gtpu.setInvalid()"
           }
@@ -3522,7 +3522,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 201,
+            "line" : 199,
             "column" : 8,
             "source_fragment" : "hdr.udp.setInvalid()"
           }
@@ -3541,7 +3541,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 202,
+            "line" : 200,
             "column" : 8,
             "source_fragment" : "hdr.tcp = hdr.inner_tcp"
           }
@@ -3556,7 +3556,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 203,
+            "line" : 201,
             "column" : 8,
             "source_fragment" : "hdr.inner_tcp.setInvalid()"
           }
@@ -3601,7 +3601,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 187,
             "column" : 27,
             "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
           }
@@ -3620,7 +3620,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 188,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
           }
@@ -3639,7 +3639,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 191,
+            "line" : 189,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
           }
@@ -3658,7 +3658,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 192,
+            "line" : 190,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_sport; ..."
           }
@@ -3677,7 +3677,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 193,
+            "line" : 191,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_dport; ..."
           }
@@ -3696,7 +3696,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 195,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
           }
@@ -3711,7 +3711,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 196,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "hdr.inner_ipv4.setInvalid()"
           }
@@ -3726,7 +3726,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 197,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "hdr.gtpu.setInvalid()"
           }
@@ -3745,7 +3745,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 207,
+            "line" : 205,
             "column" : 8,
             "source_fragment" : "hdr.udp = hdr.inner_udp"
           }
@@ -3760,7 +3760,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 208,
+            "line" : 206,
             "column" : 8,
             "source_fragment" : "hdr.inner_udp.setInvalid()"
           }
@@ -3805,7 +3805,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 187,
             "column" : 27,
             "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
           }
@@ -3824,7 +3824,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 188,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
           }
@@ -3843,7 +3843,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 191,
+            "line" : 189,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
           }
@@ -3862,7 +3862,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 192,
+            "line" : 190,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_sport; ..."
           }
@@ -3881,7 +3881,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 193,
+            "line" : 191,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_dport; ..."
           }
@@ -3900,7 +3900,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 195,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
           }
@@ -3915,7 +3915,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 196,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "hdr.inner_ipv4.setInvalid()"
           }
@@ -3930,7 +3930,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 197,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "hdr.gtpu.setInvalid()"
           }
@@ -3945,7 +3945,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 212,
+            "line" : 210,
             "column" : 8,
             "source_fragment" : "hdr.udp.setInvalid()"
           }
@@ -3964,7 +3964,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 213,
+            "line" : 211,
             "column" : 8,
             "source_fragment" : "hdr.icmp = hdr.inner_icmp"
           }
@@ -3979,7 +3979,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 214,
+            "line" : 212,
             "column" : 8,
             "source_fragment" : "hdr.inner_icmp.setInvalid()"
           }
@@ -4024,7 +4024,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 187,
             "column" : 27,
             "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
           }
@@ -4043,7 +4043,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 188,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
           }
@@ -4062,7 +4062,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 191,
+            "line" : 189,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
           }
@@ -4081,7 +4081,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 192,
+            "line" : 190,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_sport; ..."
           }
@@ -4100,7 +4100,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 193,
+            "line" : 191,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_dport; ..."
           }
@@ -4119,7 +4119,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 195,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
           }
@@ -4134,7 +4134,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 196,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "hdr.inner_ipv4.setInvalid()"
           }
@@ -4149,7 +4149,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 197,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "hdr.gtpu.setInvalid()"
           }
@@ -4164,7 +4164,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 218,
+            "line" : 216,
             "column" : 8,
             "source_fragment" : "hdr.udp.setInvalid()"
           }
@@ -4310,7 +4310,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 251,
+            "line" : 249,
             "column" : 46,
             "source_fragment" : "return"
           }
@@ -4336,7 +4336,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 265,
+            "line" : 263,
             "column" : 8,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
@@ -4372,7 +4372,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 282,
+            "line" : 280,
             "column" : 38,
             "source_fragment" : "= true; ..."
           }
@@ -4401,7 +4401,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 283,
+            "line" : 281,
             "column" : 32,
             "source_fragment" : "= true; ..."
           }
@@ -4427,7 +4427,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 291,
+            "line" : 289,
             "column" : 32,
             "source_fragment" : "= hdr.ipv4.total_len; ..."
           }
@@ -11388,7 +11388,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 308,
+            "line" : 306,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.setValid()"
           }
@@ -11407,7 +11407,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 309,
+            "line" : 307,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.version = 4"
           }
@@ -11445,7 +11445,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 311,
+            "line" : 309,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
           }
@@ -11464,7 +11464,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 312,
+            "line" : 310,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
           }
@@ -11506,7 +11506,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 313,
+            "line" : 311,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
           }
@@ -11525,7 +11525,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 315,
+            "line" : 313,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
           }
@@ -11544,7 +11544,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 316,
+            "line" : 314,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
           }
@@ -11563,7 +11563,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 317,
+            "line" : 315,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
           }
@@ -11620,7 +11620,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 320,
+            "line" : 318,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
           }
@@ -11639,7 +11639,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 321,
+            "line" : 319,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
           }
@@ -11658,7 +11658,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 322,
+            "line" : 320,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
           }
@@ -11673,7 +11673,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 324,
+            "line" : 322,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.setValid()"
           }
@@ -11692,7 +11692,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 325,
+            "line" : 323,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
           }
@@ -11711,7 +11711,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 326,
+            "line" : 324,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.dport = 2152"
           }
@@ -11753,7 +11753,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 327,
+            "line" : 325,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
           }
@@ -11772,7 +11772,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 329,
+            "line" : 327,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.checksum = 0"
           }
@@ -11787,7 +11787,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 332,
+            "line" : 330,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.setValid()"
           }
@@ -11806,7 +11806,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 333,
+            "line" : 331,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.version = 0x01"
           }
@@ -11825,7 +11825,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 334,
+            "line" : 332,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
           }
@@ -11844,7 +11844,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 335,
+            "line" : 333,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.spare = 0"
           }
@@ -11863,7 +11863,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 336,
+            "line" : 334,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
           }
@@ -11882,7 +11882,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 337,
+            "line" : 335,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
           }
@@ -11901,7 +11901,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 338,
+            "line" : 336,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
           }
@@ -11920,7 +11920,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 339,
+            "line" : 337,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
           }
@@ -11939,7 +11939,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 340,
+            "line" : 338,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
           }
@@ -11958,7 +11958,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 341,
+            "line" : 339,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
           }
@@ -12286,7 +12286,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 345,
+            "line" : 343,
             "column" : 46,
             "source_fragment" : "return"
           }
@@ -12342,7 +12342,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 346,
+            "line" : 344,
             "column" : 8,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
@@ -12723,7 +12723,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 251,
+            "line" : 249,
             "column" : 46,
             "source_fragment" : "return"
           },
@@ -12768,12 +12768,6 @@
               "name" : "teid",
               "target" : ["gtpu", "teid"],
               "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "ue_addr",
-              "target" : ["inner_ipv4", "src_addr"],
-              "mask" : null
             }
           ],
           "match_type" : "exact",
@@ -12836,7 +12830,7 @@
           "id" : 6,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 265,
+            "line" : 263,
             "column" : 8,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           },
@@ -12865,7 +12859,7 @@
           "id" : 7,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 221,
+            "line" : 219,
             "column" : 10,
             "source_fragment" : "decap_gtpu"
           },
@@ -12914,7 +12908,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 235,
+                "line" : 233,
                 "column" : 12,
                 "source_fragment" : "(true, false, false) : decap_inner_tcp()"
               },
@@ -12941,7 +12935,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 236,
+                "line" : 234,
                 "column" : 12,
                 "source_fragment" : "(false, true, false) : decap_inner_udp()"
               },
@@ -12968,7 +12962,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 237,
+                "line" : 235,
                 "column" : 12,
                 "source_fragment" : "(false, false, true) : decap_inner_icmp()"
               },
@@ -12999,7 +12993,7 @@
           "id" : 8,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 165,
+            "line" : 163,
             "column" : 10,
             "source_fragment" : "far_lookup"
           },
@@ -13036,7 +13030,7 @@
           "id" : 9,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 282,
+            "line" : 280,
             "column" : 38,
             "source_fragment" : "= true; ..."
           },
@@ -13065,7 +13059,7 @@
           "id" : 10,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 291,
+            "line" : 289,
             "column" : 32,
             "source_fragment" : "="
           },
@@ -13790,7 +13784,7 @@
           "id" : 1,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 251,
+            "line" : 249,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.skip_spgw == true"
           },
@@ -13847,7 +13841,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 255,
+            "line" : 253,
             "column" : 12,
             "source_fragment" : "hdr.gtpu.isValid()"
           },
@@ -13870,7 +13864,7 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 268,
+            "line" : 266,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
           },
@@ -13903,7 +13897,7 @@
           "id" : 5,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 279,
+            "line" : 277,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.far_dropped == true"
           },
@@ -14600,7 +14594,7 @@
           "id" : 40,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 345,
+            "line" : 343,
             "column" : 46,
             "source_fragment" : "return"
           },
@@ -14629,7 +14623,7 @@
           "id" : 41,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 346,
+            "line" : 344,
             "column" : 8,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           },
@@ -14658,7 +14652,7 @@
           "id" : 42,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 349,
+            "line" : 347,
             "column" : 12,
             "source_fragment" : "gtpu_encap()"
           },
@@ -15981,7 +15975,7 @@
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 345,
+            "line" : 343,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.skip_spgw == true"
           },
@@ -16038,7 +16032,7 @@
           "id" : 28,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 348,
+            "line" : 346,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_encap == true"
           },
@@ -16363,7 +16357,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 364,
+        "line" : 362,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
index 0a41be6..bb77114 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
@@ -447,12 +447,6 @@
     bitwidth: 32
     match_type: EXACT
   }
-  match_fields {
-    id: 3
-    name: "ue_addr"
-    bitwidth: 32
-    match_type: EXACT
-  }
   action_refs {
     id: 16799934
   }
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
index 250c226..4351291 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
@@ -1182,7 +1182,7 @@
       "id" : 11,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 182,
+        "line" : 180,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1206,7 +1206,7 @@
       "id" : 13,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 303,
+        "line" : 301,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1282,7 +1282,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 364,
+        "line" : 362,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -2627,7 +2627,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 140,
+            "line" : 138,
             "column" : 35,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -2666,7 +2666,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 141,
+            "line" : 139,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -2737,7 +2737,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 150,
+            "line" : 148,
             "column" : 35,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -2776,7 +2776,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 149,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -2805,7 +2805,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 151,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -2824,7 +2824,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 154,
+            "line" : 152,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -2843,7 +2843,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 155,
+            "line" : 153,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -2862,7 +2862,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 156,
+            "line" : 154,
             "column" : 39,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -2881,7 +2881,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 157,
+            "line" : 155,
             "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -2900,7 +2900,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 159,
+            "line" : 157,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -2919,7 +2919,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 160,
+            "line" : 158,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -2938,7 +2938,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 161,
+            "line" : 159,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -2957,7 +2957,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 162,
+            "line" : 160,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -3002,7 +3002,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 187,
             "column" : 27,
             "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
           }
@@ -3021,7 +3021,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 188,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
           }
@@ -3040,7 +3040,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 191,
+            "line" : 189,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
           }
@@ -3059,7 +3059,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 192,
+            "line" : 190,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_sport; ..."
           }
@@ -3078,7 +3078,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 193,
+            "line" : 191,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_dport; ..."
           }
@@ -3097,7 +3097,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 195,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
           }
@@ -3112,7 +3112,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 196,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "hdr.inner_ipv4.setInvalid()"
           }
@@ -3127,7 +3127,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 197,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "hdr.gtpu.setInvalid()"
           }
@@ -3142,7 +3142,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 201,
+            "line" : 199,
             "column" : 8,
             "source_fragment" : "hdr.udp.setInvalid()"
           }
@@ -3161,7 +3161,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 202,
+            "line" : 200,
             "column" : 8,
             "source_fragment" : "hdr.tcp = hdr.inner_tcp"
           }
@@ -3176,7 +3176,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 203,
+            "line" : 201,
             "column" : 8,
             "source_fragment" : "hdr.inner_tcp.setInvalid()"
           }
@@ -3221,7 +3221,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 187,
             "column" : 27,
             "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
           }
@@ -3240,7 +3240,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 188,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
           }
@@ -3259,7 +3259,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 191,
+            "line" : 189,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
           }
@@ -3278,7 +3278,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 192,
+            "line" : 190,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_sport; ..."
           }
@@ -3297,7 +3297,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 193,
+            "line" : 191,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_dport; ..."
           }
@@ -3316,7 +3316,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 195,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
           }
@@ -3331,7 +3331,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 196,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "hdr.inner_ipv4.setInvalid()"
           }
@@ -3346,7 +3346,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 197,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "hdr.gtpu.setInvalid()"
           }
@@ -3365,7 +3365,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 207,
+            "line" : 205,
             "column" : 8,
             "source_fragment" : "hdr.udp = hdr.inner_udp"
           }
@@ -3380,7 +3380,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 208,
+            "line" : 206,
             "column" : 8,
             "source_fragment" : "hdr.inner_udp.setInvalid()"
           }
@@ -3425,7 +3425,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 187,
             "column" : 27,
             "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
           }
@@ -3444,7 +3444,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 188,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
           }
@@ -3463,7 +3463,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 191,
+            "line" : 189,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
           }
@@ -3482,7 +3482,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 192,
+            "line" : 190,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_sport; ..."
           }
@@ -3501,7 +3501,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 193,
+            "line" : 191,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_dport; ..."
           }
@@ -3520,7 +3520,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 195,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
           }
@@ -3535,7 +3535,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 196,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "hdr.inner_ipv4.setInvalid()"
           }
@@ -3550,7 +3550,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 197,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "hdr.gtpu.setInvalid()"
           }
@@ -3565,7 +3565,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 212,
+            "line" : 210,
             "column" : 8,
             "source_fragment" : "hdr.udp.setInvalid()"
           }
@@ -3584,7 +3584,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 213,
+            "line" : 211,
             "column" : 8,
             "source_fragment" : "hdr.icmp = hdr.inner_icmp"
           }
@@ -3599,7 +3599,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 214,
+            "line" : 212,
             "column" : 8,
             "source_fragment" : "hdr.inner_icmp.setInvalid()"
           }
@@ -3644,7 +3644,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 187,
             "column" : 27,
             "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
           }
@@ -3663,7 +3663,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 188,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
           }
@@ -3682,7 +3682,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 191,
+            "line" : 189,
             "column" : 32,
             "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
           }
@@ -3701,7 +3701,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 192,
+            "line" : 190,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_sport; ..."
           }
@@ -3720,7 +3720,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 193,
+            "line" : 191,
             "column" : 27,
             "source_fragment" : "= fabric_md.inner_l4_dport; ..."
           }
@@ -3739,7 +3739,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 195,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
           }
@@ -3754,7 +3754,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 196,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "hdr.inner_ipv4.setInvalid()"
           }
@@ -3769,7 +3769,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 197,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "hdr.gtpu.setInvalid()"
           }
@@ -3784,7 +3784,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 218,
+            "line" : 216,
             "column" : 8,
             "source_fragment" : "hdr.udp.setInvalid()"
           }
@@ -3930,7 +3930,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 251,
+            "line" : 249,
             "column" : 46,
             "source_fragment" : "return"
           }
@@ -3956,7 +3956,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 265,
+            "line" : 263,
             "column" : 8,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
@@ -3992,7 +3992,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 282,
+            "line" : 280,
             "column" : 38,
             "source_fragment" : "= true; ..."
           }
@@ -4021,7 +4021,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 283,
+            "line" : 281,
             "column" : 32,
             "source_fragment" : "= true; ..."
           }
@@ -4047,7 +4047,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 291,
+            "line" : 289,
             "column" : 32,
             "source_fragment" : "= hdr.ipv4.total_len; ..."
           }
@@ -4559,7 +4559,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 308,
+            "line" : 306,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.setValid()"
           }
@@ -4578,7 +4578,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 309,
+            "line" : 307,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.version = 4"
           }
@@ -4616,7 +4616,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 311,
+            "line" : 309,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
           }
@@ -4635,7 +4635,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 312,
+            "line" : 310,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
           }
@@ -4677,7 +4677,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 313,
+            "line" : 311,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
           }
@@ -4696,7 +4696,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 315,
+            "line" : 313,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
           }
@@ -4715,7 +4715,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 316,
+            "line" : 314,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
           }
@@ -4734,7 +4734,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 317,
+            "line" : 315,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
           }
@@ -4791,7 +4791,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 320,
+            "line" : 318,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
           }
@@ -4810,7 +4810,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 321,
+            "line" : 319,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
           }
@@ -4829,7 +4829,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 322,
+            "line" : 320,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
           }
@@ -4844,7 +4844,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 324,
+            "line" : 322,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.setValid()"
           }
@@ -4863,7 +4863,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 325,
+            "line" : 323,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
           }
@@ -4882,7 +4882,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 326,
+            "line" : 324,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.dport = 2152"
           }
@@ -4924,7 +4924,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 327,
+            "line" : 325,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
           }
@@ -4943,7 +4943,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 329,
+            "line" : 327,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.checksum = 0"
           }
@@ -4958,7 +4958,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 332,
+            "line" : 330,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.setValid()"
           }
@@ -4977,7 +4977,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 333,
+            "line" : 331,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.version = 0x01"
           }
@@ -4996,7 +4996,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 334,
+            "line" : 332,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
           }
@@ -5015,7 +5015,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 335,
+            "line" : 333,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.spare = 0"
           }
@@ -5034,7 +5034,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 336,
+            "line" : 334,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
           }
@@ -5053,7 +5053,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 337,
+            "line" : 335,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
           }
@@ -5072,7 +5072,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 338,
+            "line" : 336,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
           }
@@ -5091,7 +5091,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 339,
+            "line" : 337,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
           }
@@ -5110,7 +5110,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 340,
+            "line" : 338,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
           }
@@ -5129,7 +5129,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 341,
+            "line" : 339,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
           }
@@ -5457,7 +5457,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 345,
+            "line" : 343,
             "column" : 46,
             "source_fragment" : "return"
           }
@@ -5513,7 +5513,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 346,
+            "line" : 344,
             "column" : 8,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
@@ -5632,7 +5632,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 251,
+            "line" : 249,
             "column" : 46,
             "source_fragment" : "return"
           },
@@ -5677,12 +5677,6 @@
               "name" : "teid",
               "target" : ["gtpu", "teid"],
               "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "ue_addr",
-              "target" : ["inner_ipv4", "src_addr"],
-              "mask" : null
             }
           ],
           "match_type" : "exact",
@@ -5745,7 +5739,7 @@
           "id" : 6,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 265,
+            "line" : 263,
             "column" : 8,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           },
@@ -5774,7 +5768,7 @@
           "id" : 7,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 221,
+            "line" : 219,
             "column" : 10,
             "source_fragment" : "decap_gtpu"
           },
@@ -5823,7 +5817,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 235,
+                "line" : 233,
                 "column" : 12,
                 "source_fragment" : "(true, false, false) : decap_inner_tcp()"
               },
@@ -5850,7 +5844,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 236,
+                "line" : 234,
                 "column" : 12,
                 "source_fragment" : "(false, true, false) : decap_inner_udp()"
               },
@@ -5877,7 +5871,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 237,
+                "line" : 235,
                 "column" : 12,
                 "source_fragment" : "(false, false, true) : decap_inner_icmp()"
               },
@@ -5908,7 +5902,7 @@
           "id" : 8,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 165,
+            "line" : 163,
             "column" : 10,
             "source_fragment" : "far_lookup"
           },
@@ -5945,7 +5939,7 @@
           "id" : 9,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 282,
+            "line" : 280,
             "column" : 38,
             "source_fragment" : "= true; ..."
           },
@@ -5974,7 +5968,7 @@
           "id" : 10,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 291,
+            "line" : 289,
             "column" : 32,
             "source_fragment" : "="
           },
@@ -6662,7 +6656,7 @@
           "id" : 1,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 251,
+            "line" : 249,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.skip_spgw == true"
           },
@@ -6719,7 +6713,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 255,
+            "line" : 253,
             "column" : 12,
             "source_fragment" : "hdr.gtpu.isValid()"
           },
@@ -6742,7 +6736,7 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 268,
+            "line" : 266,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
           },
@@ -6775,7 +6769,7 @@
           "id" : 5,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 279,
+            "line" : 277,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.far_dropped == true"
           },
@@ -7472,7 +7466,7 @@
           "id" : 39,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 345,
+            "line" : 343,
             "column" : 46,
             "source_fragment" : "return"
           },
@@ -7501,7 +7495,7 @@
           "id" : 40,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 346,
+            "line" : 344,
             "column" : 8,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           },
@@ -7530,7 +7524,7 @@
           "id" : 41,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 349,
+            "line" : 347,
             "column" : 12,
             "source_fragment" : "gtpu_encap()"
           },
@@ -7877,7 +7871,7 @@
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 345,
+            "line" : 343,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.skip_spgw == true"
           },
@@ -7934,7 +7928,7 @@
           "id" : 28,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 348,
+            "line" : 346,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_encap == true"
           },
@@ -7997,7 +7991,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 364,
+        "line" : 362,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
index 96fee20..0db6431 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
@@ -423,12 +423,6 @@
     bitwidth: 32
     match_type: EXACT
   }
-  match_fields {
-    id: 3
-    name: "ue_addr"
-    bitwidth: 32
-    match_type: EXACT
-  }
   action_refs {
     id: 16799934
   }