diff --git a/ttcn/Lib3GPP/NAS/NAS_CommonTypeDefs.ttcn b/ttcn/Lib3GPP/NAS/NAS_CommonTypeDefs.ttcn
index 8c3dd55b165708ea3fd60564b07d7433d509bb5b..1b77127ad1e3a3c38a956c3dca62b187a970bdb7 100644
--- a/ttcn/Lib3GPP/NAS/NAS_CommonTypeDefs.ttcn
+++ b/ttcn/Lib3GPP/NAS/NAS_CommonTypeDefs.ttcn
@@ -1276,7 +1276,6 @@ type record NBIFOMContainer {
     variant "FIELDORDER(msb)";
     variant (iel) "LENGTHTO (replayedNASMsgContainerValue)";
     variant (iel) "BYTEORDER(last)";
-    variant (replayedNASMsgContainerValue) "BYTEORDER(last)";
   };
 
   type record NAS_SecurityAlgorithms {                          /* 24.301 cl. 9.9.3.23 */
diff --git a/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn b/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn
index 80881dfd45f3ed3e114123c2b0e1e3d550bce30b..f8249d2d15dc4135dbd76301559821f69ef07c37 100644
--- a/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn
+++ b/ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn
@@ -794,8 +794,6 @@ module NG_NAS_TypeDefs {
     NG_NAS_Message                      plainNASMessage                         /* cl. 9.9       M V 3-n */
   } with {
     variant "FIELDORDER(msb)";
-    variant (messageAuthenticationCode) "BYTEORDER(last)";
-    variant (plainNASMessage) "BYTEORDER(last)";
    }
 
 
@@ -925,6 +923,7 @@ module NG_NAS_TypeDefs {
     RSN                                 rsn                           optional  /* cl. 9.11.4.33  O TLV 3 IEI=35 Sep22 @sic R5s221179 Baseline Moving sic@ */
   } with {
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant (integrityProtMaxDataRate) "FORCEOMIT(iei)";
     variant "TAG(pduSessionType, iei = '9'H;
                  sscMode, iei = 'A'H;
@@ -977,6 +976,7 @@ module NG_NAS_TypeDefs {
     ReceivedMBSContainer                receivedMBS                   optional   /* cl. 9.11.4.31 O TLV-E 9-65538 IEI=71 Sep22 @sic R5s221179 Baseline Moving sic@ */
   } with {
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant (sscMode) "FORCEOMIT(iei)";
     variant (pduSessionType) "FORCEOMIT(iei)";
     variant (authorizedQoSRules) "FORCEOMIT(iei)";
@@ -1018,6 +1018,7 @@ module NG_NAS_TypeDefs {
     ServiceLvlAAContainer               serviceLvlAA                  optional   /* cl. 9.11.2.10 O TLV-E 6-n IEI=72 Sep22 @sic R5s221179 Baseline Moving sic@ */
   } with {
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant (gsmCause) "FORCEOMIT(iei)";
     variant "TAG(backOffTimerValue, iei = '37'O;
                  allowedSSCMode, iei = 'F'H;
@@ -1039,6 +1040,7 @@ module NG_NAS_TypeDefs {
     ExtdProtocolConfigOptions           extdProtocolConfigurationOptions optional  /* cl. 9.11.4.6  O TLV-E 4-65538 IEI=0x7B */
   } with {
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant (eapMessage) "FORCEOMIT(iei)";
     variant "TAG(extdProtocolConfigurationOptions, iei = '7b'O)";
   }
@@ -1054,6 +1056,7 @@ module NG_NAS_TypeDefs {
     ExtdProtocolConfigOptions           extdProtocolConfigurationOptions optional  /* cl. 9.11.4.6  O TLV-E 4-65538 IEI=0x7B */
   } with {
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant (eapMessage) "FORCEOMIT(iei)";
     variant "TAG(extdProtocolConfigurationOptions, iei = '7b'O)";
   }
@@ -1069,6 +1072,7 @@ module NG_NAS_TypeDefs {
     ExtdProtocolConfigOptions           extdProtocolConfigurationOptions optional  /* cl. 9.11.4.6  O TLV-E 4-65538 IEI=0x7B */
   } with {
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant "TAG(eapMessage, iei = '78'O;
                  extdProtocolConfigurationOptions, iei = '7b'O)";
   }
@@ -1096,6 +1100,7 @@ module NG_NAS_TypeDefs {
     ServiceLvlAAContainer               serviceLvlAA                  optional    /* cl. 9.11.2.10 O TLV-E 6-n IEI=72 Sep22 @sic R5s221179 Baseline Moving sic@ */
   } with {
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant "TAG(smCapability, iei = '28'O;
                  gsmCause, iei = '59'O;
                  maxNumPacketFilters, iei = '55'O;
@@ -1127,6 +1132,7 @@ module NG_NAS_TypeDefs {
     ReAttemptIndicator                  reattemptInd                  optional   /* cl. 9.11.4.17 O TLV 3 IEI=1D Sep20 @sic R5s201387 Baseline Moving sic@ */
   } with {
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant (gsmCause) "FORCEOMIT(iei)";
     variant "TAG(backOffTimerValue, iei = '37'O;
                  ngsmCongestionReattemptInd, iei = '61'O;
@@ -1160,6 +1166,7 @@ module NG_NAS_TypeDefs {
   } with { // Check code for mappedEPSContexts: ETSI TS 124 501 V16.14.0 (2023-09) Table 8.3.7.1.1: PDU SESSION MODIFICATION REQUEST message content
            // Check code for mappedEPSContexts: ETSI TS 124 501 V16.14.0 (2023-09) Table 8.3.7.1.1 note
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant "TAG(gsmCause, iei = '59'O;
                  sessionAMBR, iei = '2A'O;
                  rqTimerValue, iei = '56'O;
@@ -1189,6 +1196,7 @@ module NG_NAS_TypeDefs {
     PortManagementInfoContainer         portManagementInfoContainer   optional   /* cl. 9.11.4.27  O TLV-E 8-65538 IEI=74 Sep20 @sic R5s201387, R5s210444 Baseline Moving sic@ */
   } with {
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant "TAG(extdProtocolConfigurationOptions, iei = '7B'O;
                  portManagementInfoContainer, iei = '74'O;
                  )";
@@ -1205,6 +1213,7 @@ module NG_NAS_TypeDefs {
     ExtdProtocolConfigOptions           extdProtocolConfigurationOptions optional /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=7B */
   } with {
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant (gsmCause) "FORCEOMIT(iei)";
     variant "TAG(extdProtocolConfigurationOptions, iei = '7B'O)";
   }
@@ -1220,6 +1229,7 @@ module NG_NAS_TypeDefs {
     ExtdProtocolConfigOptions           extdProtocolConfigurationOptions optional /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=0x7B */
   } with {
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant "TAG(gsmCause, iei = '59'O;
                  extdProtocolConfigurationOptions, iei = '7b'O)";
   }
@@ -1255,6 +1265,7 @@ module NG_NAS_TypeDefs {
     ServiceLvlAAContainer               serviceLvlAA                  optional   /* cl. 9.11.2.10 O TLV-E 6-n IEI=72 Sep22 @sic R5s221179 Baseline Moving sic@ */
   } with {
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant (gsmCause) "FORCEOMIT(iei)";
     variant "TAG(backOffTimerValue, iei = '37'O;
                  eapMessage, iei = '78'O;
@@ -1276,6 +1287,7 @@ module NG_NAS_TypeDefs {
     ExtdProtocolConfigOptions           extdProtocolConfigurationOptions optional /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=0x7B */
   } with {
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant "TAG(gsmCause, iei = '59'O;
                  extdProtocolConfigurationOptions, iei = '7b'O)";
   }
@@ -1290,6 +1302,7 @@ module NG_NAS_TypeDefs {
     GMM_GSM_Cause                       gsmCause                                /* cl. 9.11.4.2  M V 1   */
   } with {
     variant "FIELDORDER(msb)";
+    variant (pduSessionId) "FORCEOMIT(iei)";
     variant (gsmCause) "FORCEOMIT(iei)";
   }
 
@@ -1305,7 +1318,6 @@ module NG_NAS_TypeDefs {
     variant "FIELDORDER(msb)";
     variant (iel) "LENGTHTO (dnnValue)";
     variant (iel) "BYTEORDER(last)";
-    variant (dnnValue) "BYTEORDER(last)";
   };
 
   type record EAP_Message {                                     /* 24.501 cl. 9.11.2.2 */
@@ -1901,7 +1913,6 @@ module NG_NAS_TypeDefs {
     variant "FIELDORDER(msb)";
     variant (dnnLength) "LENGTHTO (dnnValue, listOfPartialTais)";
     variant (dnnLength) "BYTEORDER(last)";
-    variant (dnnValue) "BYTEORDER(last)";
   };
 
   type record LADN_Info {                              /* 24.501 cl. 9.11.3.30 */
@@ -2032,7 +2043,6 @@ module NG_NAS_TypeDefs {
     variant "FIELDORDER(msb)";
     variant (iel) "LENGTHTO (payload)";
     variant (iel) "BYTEORDER(last)";
-    variant (payload) "BYTEORDER(last)";
   };
 
   type record PayloadContainerType {                        /* 24.501 cl. 9.11.3.40 @sic R5w190208 sic@*/