Make subscription manager independent of E2SMs

Issue-ID: RIC-628

Change-Id: Ia9e37863c0a5b76f535867b5aa127a8748d0a1d9
Signed-off-by: Juha Hyttinen <juha.hyttinen@nokia.com>
diff --git a/e2ap/libe2ap_wrapper/E2AP_if.c b/e2ap/libe2ap_wrapper/E2AP_if.c
index 9a5dc0a..8686908 100644
--- a/e2ap/libe2ap_wrapper/E2AP_if.c
+++ b/e2ap/libe2ap_wrapper/E2AP_if.c
@@ -20,28 +20,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "E2_asn_constant.h"
 #include "E2AP-PDU.h"
 #include "ProtocolIE-Field.h"
 #include "RICsubsequentAction.h"
-#include "E2_E2SM-gNB-X2-eventTriggerDefinition.h"
-#include "E2_E2SM-gNB-NRT-EventTriggerDefinition.h"
-#include "E2_E2SM-gNB-X2-ActionDefinitionChoice.h"
-#include "E2_E2SM-gNB-X2-actionDefinition.h"
-#include "E2_ActionParameter-Item.h"
-#include "E2_E2SM-gNB-X2-ActionDefinition-Format2.h"
-#include "E2_RANueGroup-Item.h"
-#include "E2_RANueGroupDef-Item.h"
-#include "E2_RANimperativePolicy.h"
-#include "E2_RANParameter-Item.h"
-
-// E2SM-gNB-NRT
-#include "E2_E2SM-gNB-NRT-ActionDefinition.h"
-#include "E2_E2SM-gNB-NRT-ActionDefinition-Format1.h"
-#include "E2_RANparameter-Item.h"
 
 #include "asn_constant.h"
-#include "E2_asn_constant.h"
 #include "E2AP_if.h"
 
 
@@ -170,10 +153,6 @@
             pRICsubscriptionRequest_IEs->value.present = RICsubscriptionRequest_IEs__value_PR_RICsubscriptionDetails;
 
             // RICeventTriggerDefinition
-            uint64_t returnCode;
-            if ((returnCode = packRICEventTriggerDefinition(pLogBuffer, &pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition) != e2err_OK))
-                return returnCode;
-
             pRICsubscriptionRequest_IEs->value.choice.RICsubscriptionDetails.ricEventTriggerDefinition.buf =
               calloc(1, pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.octetString.contentLength);
             if (pRICsubscriptionRequest_IEs->value.choice.RICsubscriptionDetails.ricEventTriggerDefinition.buf) {
@@ -205,10 +184,6 @@
 
                     // RICactionDefinition, OPTIONAL
                     if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionPresent) {
-                        uint64_t returnCode;
-                        if ((returnCode = packRICActionDefinition(pLogBuffer, &pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice) != e2err_OK)) {
-                            return returnCode;
-                        }
                         pRICaction_ToBeSetup_ItemIEs->value.choice.RICaction_ToBeSetup_Item.ricActionDefinition = calloc(1, sizeof (RICactionDefinition_t));
                         if (pRICaction_ToBeSetup_ItemIEs->value.choice.RICaction_ToBeSetup_Item.ricActionDefinition) {
                             pRICaction_ToBeSetup_ItemIEs->value.choice.RICaction_ToBeSetup_Item.ricActionDefinition->buf =
@@ -259,676 +234,6 @@
     return e2err_RICSubscriptionRequestAllocE2AP_PDUFail;
 }
 
-//////////////////////////////////////////////////////////////////////
-uint64_t packRICEventTriggerDefinition(char* pLogBuffer, RICEventTriggerDefinition_t* pRICEventTriggerDefinition) {
-
-    if (pRICEventTriggerDefinition->E2SMgNBX2EventTriggerDefinitionPresent)
-        return packRICEventTriggerDefinitionX2Format(pLogBuffer, pRICEventTriggerDefinition);
-    else if(pRICEventTriggerDefinition->E2SMgNBNRTEventTriggerDefinitionPresent)
-        return packRICEventTriggerDefinitionNRTFormat(pLogBuffer, pRICEventTriggerDefinition);
-    else
-        return e2err_RICEventTriggerDefinitionAllocEventTriggerDefinitionEmptyFail;
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t packRICEventTriggerDefinitionX2Format(char* pLogBuffer, RICEventTriggerDefinition_t* pRICEventTriggerDefinition) {
-
-    E2_E2SM_gNB_X2_eventTriggerDefinition_t* pE2SM_gNB_X2_eventTriggerDefinition = calloc(1, sizeof(E2_E2SM_gNB_X2_eventTriggerDefinition_t));
-    if(pE2SM_gNB_X2_eventTriggerDefinition == NULL)
-        return e2err_RICEventTriggerDefinitionAllocE2SM_gNB_X2_eventTriggerDefinitionFail;
-
-    // RICeventTriggerDefinition
-    // InterfaceID
-    if ((pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBIDPresent == true &&
-         pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBIDPresent == true) ||
-        (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBIDPresent == false &&
-         pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBIDPresent == false))
-        return e2err_RICEventTriggerDefinitionIEValueFail_1;
-
-    // GlobalENB-ID or GlobalGNB-ID
-    if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBIDPresent)
-    {
-        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.present = E2_Interface_ID_PR_global_eNB_ID;
-
-        // GlobalENB-ID
-        // PLMN-Identity
-        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.size =
-        pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.pLMNIdentity.contentLength;
-        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf = calloc(1,3);
-        if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf) {
-            memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf,
-                   pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.pLMNIdentity.pLMNIdentityVal,
-                   pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.pLMNIdentity.contentLength);
-        }
-        else
-            return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDpLMN_IdentityBufFail;
-
-        // Add ENB-ID
-        if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits == cMacroENBIDP_20Bits){
-            // BIT STRING, SIZE 20
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_macro_eNB_ID;
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.buf = calloc(1,3);
-            if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.buf) {
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.size = 3; // bytes
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.bits_unused = 4; // trailing unused bits
-                memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.buf,
-                       (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID,3);
-            }
-            else
-                return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDmacro_eNB_IDBufFail;
-        }
-        else if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits == cHomeENBID_28Bits) {
-            // BIT STRING, SIZE 28
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_home_eNB_ID;
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.buf = calloc(1,4);
-            if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.buf) {
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.size = 4; // bytes
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.bits_unused = 4; // trailing unused bits
-                memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.buf,
-                       (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID,4);
-            }
-            else
-                return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDhome_eNB_IDBufFail;
-        }
-        else if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits == cShortMacroENBID_18Bits) {
-            // BIT STRING, SIZE 18
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_short_Macro_eNB_ID;
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.buf = calloc(1,3);
-            if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.buf) {
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.size = 3;
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.bits_unused = 6; // trailing unused bits
-                memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.buf,
-                       (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID,3);
-            }
-            else
-                return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDshort_Macro_eNB_IDBufFail;
-        }
-        else if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits == clongMacroENBIDP_21Bits) {
-            // BIT STRING, SIZE 21
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_long_Macro_eNB_ID;
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.buf = calloc(1,3);
-            if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.buf) {
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.size = 3; // bytes
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.bits_unused = 3; // trailing unused bits
-                memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.buf,
-                       (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID,3);
-            }
-            else
-                return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDlong_Macro_eNB_IDBufFail;
-        }
-        else
-            return e2err_RICEventTriggerDefinitionIEValueFail_2;
-    }
-    else if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBIDPresent) {
-        // GlobalGNB-ID
-        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.present = E2_Interface_ID_PR_global_gNB_ID;
-
-        // PLMN-Identity
-        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.pLMN_Identity.size =
-          pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.contentLength;
-        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.pLMN_Identity.buf =
-          calloc(1,pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.contentLength);
-        if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.pLMN_Identity.buf) {
-            memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.pLMN_Identity.buf,
-                   (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.pLMNIdentityVal,
-                    pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.contentLength);
-        }
-        else
-            return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_gNB_IDpLMN_IdentityBufFail;
-
-        // GNB-ID, BIT STRING, SIZE 22..32
-        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.size = 4;  //32bits
-        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.buf = calloc(1, 4);
-        if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.buf) {
-            memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.buf,
-                   (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID,4); //32bits
-        }
-        else
-            return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_gNB_IDgNB_IDBufFail;
-    }
-    else
-        return e2err_RICEventTriggerDefinitionIEValueFail_3;
-
-    // InterfaceDirection
-    pE2SM_gNB_X2_eventTriggerDefinition->interfaceDirection = pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceDirection;
-
-    // InterfaceMessageType
-    // ProcedureCode
-    pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.procedureCode = pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.procedureCode;
-
-    // TypeOfMessage
-    if(pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage == cE2InitiatingMessage)
-        pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.typeOfMessage = E2_TypeOfMessage_initiating_message;
-    else if(pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage == cE2SuccessfulOutcome)
-        pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.typeOfMessage = E2_TypeOfMessage_successful_outcome;
-    else if(pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage == cE2UnsuccessfulOutcome)
-        pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.typeOfMessage = E2_TypeOfMessage_unsuccessful_outcome;
-    else
-        return e2err_RICEventTriggerDefinitionIEValueFail_4;
-
-    // InterfaceProtocolIE-List, OPTIONAL. Not used in RIC currently
-    if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceProtocolIEListPresent == true) {}
-
-    // Debug print
-    if (debug)
-        asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition);
-
-    // Encode
-    size_t bufferSize = sizeof(pRICEventTriggerDefinition->octetString.data);
-    asn_enc_rval_t rval;
-    rval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition,
-                                pRICEventTriggerDefinition->octetString.data, bufferSize);
-
-    if(rval.encoded == -1) {
-        sprintf(pLogBuffer,"Serialization of %s failed", asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition.name);
-        return e2err_RICEventTriggerDefinitionPackFail_1;
-    }
-    else if(rval.encoded > bufferSize) {
-       sprintf(pLogBuffer,"Buffer of size %zu is too small for %s, need %zu",bufferSize, asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition.name, rval.encoded);
-        return e2err_RICEventTriggerDefinitionPackFail_2;
-    }
-    else
-    if (debug)
-           sprintf(pLogBuffer,"Successfully encoded %s. Buffer size %zu, encoded size %zu",asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition.name, bufferSize, rval.encoded);
-
-    ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition);
-
-    pRICEventTriggerDefinition->octetString.contentLength = rval.encoded;
-    return e2err_OK;
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t packRICEventTriggerDefinitionNRTFormat(char* pLogBuffer, RICEventTriggerDefinition_t* pRICEventTriggerDefinition) {
-
-    E2_E2SM_gNB_NRT_EventTriggerDefinition_t* pE2_E2SM_gNB_NRT_EventTriggerDefinition = calloc(1, sizeof(E2_E2SM_gNB_NRT_EventTriggerDefinition_t));
-    if(pE2_E2SM_gNB_NRT_EventTriggerDefinition == NULL)
-        return e2err_RICEventTriggerDefinitionAllocE2SM_gNB_NRT_eventTriggerDefinitionFail;
-
-    pE2_E2SM_gNB_NRT_EventTriggerDefinition->present = E2_E2SM_gNB_NRT_EventTriggerDefinition_PR_eventDefinition_Format1;
-    pE2_E2SM_gNB_NRT_EventTriggerDefinition->choice.eventDefinition_Format1.triggerNature =
-      pRICEventTriggerDefinition->e2SMgNBNRTEventTriggerDefinition.eventDefinitionFormat1.triggerNature;
-
-    // Debug print
-    if (debug)
-        asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition, pE2_E2SM_gNB_NRT_EventTriggerDefinition);
-
-    // Encode
-    size_t bufferSize = sizeof(pRICEventTriggerDefinition->octetString.data);
-    asn_enc_rval_t rval;
-    rval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition, pE2_E2SM_gNB_NRT_EventTriggerDefinition,
-                                pRICEventTriggerDefinition->octetString.data, bufferSize);
-
-    if(rval.encoded == -1) {
-        sprintf(pLogBuffer,"Serialization of %s failed", asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition.name);
-        return e2err_RICENRTventTriggerDefinitionPackFail_1;
-    }
-    else if(rval.encoded > bufferSize) {
-       sprintf(pLogBuffer,"Buffer of size %zu is too small for %s, need %zu",bufferSize, asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition.name, rval.encoded);
-        return e2err_RICNRTEventTriggerDefinitionPackFail_2;
-    }
-    else
-    if (debug)
-           sprintf(pLogBuffer,"Successfully encoded %s. Buffer size %zu, encoded size %zu",asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition.name, bufferSize, rval.encoded);
-
-    ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition, pE2_E2SM_gNB_NRT_EventTriggerDefinition);
-
-    pRICEventTriggerDefinition->octetString.contentLength = rval.encoded;
-    return e2err_OK;
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t packRICActionDefinition(char* pLogBuffer, RICActionDefinitionChoice_t* pRICActionDefinitionChoice) {
-
-    if (pRICActionDefinitionChoice->actionDefinitionX2Format1Present ||
-        pRICActionDefinitionChoice->actionDefinitionX2Format2Present) {
-        // E2SM-gNB-X2-actionDefinition
-        return packActionDefinitionX2Format(pLogBuffer,pRICActionDefinitionChoice);
-    }
-    else if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1Present) {
-        // E2SM-gNB-NRT-actionDefinition
-        return packActionDefinitionNRTFormat(pLogBuffer,pRICActionDefinitionChoice);
-    }
-    else
-        return e2err_RICSubscriptionRequestRICActionDefinitionEmpty;
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t packActionDefinitionX2Format(char* pLogBuffer, RICActionDefinitionChoice_t* pRICActionDefinitionChoice) {
-
-    int result;
-
-    // E2SM-gNB-X2-actionDefinition
-    E2_E2SM_gNB_X2_ActionDefinitionChoice_t* pE2_E2SM_gNB_X2_ActionDefinitionChoice = calloc(1, sizeof(E2_E2SM_gNB_X2_ActionDefinitionChoice_t));
-    if (pE2_E2SM_gNB_X2_ActionDefinitionChoice == NULL) {
-        return e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_X2_ActionDefinitionChoiceFail;
-    }
-
-    if (pRICActionDefinitionChoice->actionDefinitionX2Format1Present) {
-
-        // E2SM-gNB-X2-actionDefinition
-        pE2_E2SM_gNB_X2_ActionDefinitionChoice->present = E2_E2SM_gNB_X2_ActionDefinitionChoice_PR_actionDefinition_Format1;
-        pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format1.style_ID = pRICActionDefinitionChoice->actionDefinitionX2Format1->styleID;
-
-        if (pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterCount > 0) {
-            struct E2_E2SM_gNB_X2_actionDefinition__actionParameter_List* pE2_E2SM_gNB_X2_actionDefinition__actionParameter_List =
-            calloc(1, sizeof (struct E2_E2SM_gNB_X2_actionDefinition__actionParameter_List));
-            uint64_t index = 0;
-            while (index < pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterCount && index < E2_maxofRANParameters) {
-                E2_ActionParameter_Item_t* pE2_ActionParameter_Item = calloc(1, sizeof(E2_ActionParameter_Item_t));
-                if (pE2_ActionParameter_Item) {
-                    pE2_ActionParameter_Item->actionParameter_ID = pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].parameterID;
-                    if (pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueIntPresent) {
-                        pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueInt;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueInt =
-                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueInt;
-                    }
-                    else if (pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueEnumPresent) {
-                        pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueEnum;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueEnum =
-                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueIntPresent;
-                    }
-                    else if (pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueBoolPresent) {
-                        pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueBool;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueBool =
-                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueBool;
-                    }
-                    else if (pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueBitSPresent) {
-                        pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueBitS;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.size =
-                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueBitS.byteLength;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.bits_unused =
-                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueBitS.unusedBits;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.buf =
-                        calloc(pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueBitS.byteLength, 1);
-                        if (pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.buf) {
-                            memcpy(pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.buf,
-                                pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueBitS.data,
-                                pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueBitS.byteLength);
-                        }
-                        else
-                            return e2err_RICSubscriptionRequestAllocactionParameterValueValueBitSFail;
-                    }
-                    else if (pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueOctSPresent) {
-                        pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueOctS;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.size =
-                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueOctS.length;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.buf =
-                        calloc(pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueOctS.length, 1);
-                        if (pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.buf) {
-                            memcpy(pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.buf,
-                                pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueOctS.data,
-                                pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueOctS.length);
-                        }
-                        else
-                            return e2err_RICSubscriptionRequestAllocactionParameterValueValueOctSFail;
-                    }
-                    else if (pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valuePrtSPresent) {
-                        pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valuePrtS;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.size =
-                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valuePrtS.length;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.buf =
-                        calloc(pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valuePrtS.length ,1);
-                        if (pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.buf) {
-                            memcpy(pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.buf,
-                                pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valuePrtS.data,
-                                pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valuePrtS.length);
-                        }
-                        else
-                            return e2err_RICSubscriptionRequestAllocactionParameterValueValuePrtsSFail;
-                    }
-                    else
-                        return e2err_RICSubscriptionRequestActionParameterItemFail;
-
-                    if ((result = asn_set_add(pE2_E2SM_gNB_X2_actionDefinition__actionParameter_List, pE2_ActionParameter_Item)) != 0)
-                        return e2err_RICSubscriptionRequestAsn_set_addE2_ActionParameter_ItemFail;
-                }
-                else
-                    return e2err_RICSubscriptionRequestAllocActionDefinitionFail;
-                index++;
-            }
-            pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format1.actionParameter_List = pE2_E2SM_gNB_X2_actionDefinition__actionParameter_List;
-        }
-    }
-    else if (pRICActionDefinitionChoice->actionDefinitionX2Format2Present) {
-
-        // E2SM-gNB-X2-ActionDefinition-Format2
-        pE2_E2SM_gNB_X2_ActionDefinitionChoice->present = E2_E2SM_gNB_X2_ActionDefinitionChoice_PR_actionDefinition_Format2;
-
-        if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupCount > 0) {
-            struct E2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List* pE2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List =
-            calloc(1, sizeof(struct E2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List));
-
-            uint64_t index = 0;
-            while (index < pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupCount && index < E2_maxofUEgroup) {
-
-                E2_RANueGroup_Item_t* pE2_RANueGroup_Item = calloc(1, sizeof(E2_RANueGroup_Item_t));
-                if (pE2_RANueGroup_Item) {
-
-                    struct E2_RANueGroupDefinition__ranUEgroupDef_List* pE2_RANueGroupDefinition__ranUEgroupDef_List =
-                    calloc(1, sizeof (struct E2_RANueGroupDefinition__ranUEgroupDef_List));
-
-                    pE2_RANueGroup_Item->ranUEgroupID = pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupID;
-
-                    uint64_t index2 = 0;
-                    while (index2 < pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefCount && index2 < E2_maxofRANParameters) {
-                        E2_RANueGroupDef_Item_t* pE2_RANueGroupDef_Item = calloc(1, sizeof(E2_RANueGroupDef_Item_t));
-                        if(pE2_RANueGroupDef_Item) {
-                            pE2_RANueGroupDef_Item->ranParameter_ID = pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterID;
-                            pE2_RANueGroupDef_Item->ranParameter_Test = pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterTest;
-                            if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueIntPresent) {
-                                pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueInt;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueInt =
-                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueInt;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueEnum) {
-                                pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueEnum;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueEnum =
-                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueEnum;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBoolPresent) {
-                                pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBool;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBool =
-                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBool;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitSPresent) {
-                                pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBitS;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.size =
-                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.byteLength;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.bits_unused =
-                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.unusedBits;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.buf =
-                                calloc(pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.byteLength, 1);
-                                if (pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.buf) {
-                                    memcpy(pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.buf,
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.data,
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.byteLength);
-                                }
-                                else
-                                    return e2err_RICSubscriptionRequestAllocactionRanParameterValueValueBitSFail;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctSPresent) {
-                                pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueOctS;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.size =
-                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.length;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.buf =
-                                calloc(pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.length, 1);
-                                if (pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.buf) {
-                                    memcpy(pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.buf,
-                                            pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.data,
-                                            pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.length);
-                                }
-                                else
-                                    return e2err_RICSubscriptionRequestAllocactionRanParameterValueValueOctSFail;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtSPresent) {
-                                pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valuePrtS;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.size =
-                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtS.length;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.buf =
-                                calloc(pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtS.length, 1);
-                                if (pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.buf) {
-                                    memcpy(pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.buf,
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtS.data,
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtS.length);
-                                }
-                                else
-                                    return e2err_RICSubscriptionRequestAllocactionRanParameterValueValuePrtsSFail;
-                            }
-                            else
-                                return e2err_RICSubscriptionRequestRanranUeGroupDefItemParameterValueEmptyFail;
-
-                            if ((result = asn_set_add(pE2_RANueGroupDefinition__ranUEgroupDef_List, pE2_RANueGroupDef_Item)) != 0)
-                                return e2err_RICSubscriptionRequestAsn_set_addRANueGroupDef_ItemFail;
-                            pE2_RANueGroup_Item->ranUEgroupDefinition.ranUEgroupDef_List = pE2_RANueGroupDefinition__ranUEgroupDef_List;
-                        }
-                        else
-                            return e2err_RICSubscriptionRequestAllocE2_RANueGroupDef_ItemFail;
-                        index2++;
-                    }
-
-                    struct E2_RANimperativePolicy__ranImperativePolicy_List* pE2_RANimperativePolicy__ranImperativePolicy_List =
-                    calloc(1, sizeof (struct E2_RANimperativePolicy__ranImperativePolicy_List));
-
-                    uint64_t index3 = 0;
-                    while (index3 < pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterCount && index3 < E2_maxofRANParameters) {
-                        E2_RANParameter_Item_t* pE2_RANParameter_Item = calloc(1, sizeof(E2_RANParameter_Item_t));
-                        if (pE2_RANParameter_Item) {
-                            pE2_RANParameter_Item->ranParameter_ID = pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterID;
-                            if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueIntPresent) {
-                                pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueInt;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueInt =
-                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueInt;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum) {
-                                pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueEnum;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueEnum =
-                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBoolPresent) {
-                                pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBool;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueBool =
-                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBool;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitSPresent) {
-                                pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBitS;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.size =
-                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.bits_unused =
-                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.unusedBits;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf =
-                                calloc(pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength, 1);
-                                if (pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf) {
-                                    memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf,
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.data,
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength);
-                                }
-                                else
-                                    return e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValueBitSFail;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctSPresent) {
-                                pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueOctS;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.size =
-                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf =
-                                calloc(pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length, 1);
-                                if (pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf) {
-                                    memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf,
-                                            pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.data,
-                                            pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length);
-                                }
-                                else
-                                    return e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValueOctSFail;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtSPresent) {
-                                pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valuePrtS;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.size =
-                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.length;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf =
-                                calloc(pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.length, 1);
-                                if (pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf) {
-                                    memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf,
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.data,
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.length);
-                                }
-                                else
-                                    return e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValuePrtsSFail;
-                            }
-                            else
-                                return e2err_RICSubscriptionRequestRanParameterItemRanParameterValueEmptyFail;
-
-                            if ((result = asn_set_add(pE2_RANimperativePolicy__ranImperativePolicy_List, pE2_RANParameter_Item)) != 0)
-                                return e2err_RICSubscriptionRequestAsn_set_addE2_RANParameter_ItemFail;
-                            pE2_RANueGroup_Item->ranPolicy.ranImperativePolicy_List = pE2_RANimperativePolicy__ranImperativePolicy_List;
-                        }
-                        else
-                            return e2err_RICSubscriptionRequestAllocActionDefinitionFail;
-                        index3++;
-                    }
-
-                    const int result = asn_set_add(pE2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List, pE2_RANueGroup_Item);
-                    if (result != 0)
-                        sprintf(pLogBuffer,"asn_set_add() failed");
-                }
-                else
-                    return e2err_RICSubscriptionRequestAllocRANParameter_ItemFail;
-                index++;
-            }
-            pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format2.ranUEgroup_List = pE2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List;
-        }
-    }
-    else {
-        return e2err_RICSubscriptionRequestRICActionDefinitionEmptyE2_E2SM_gNB_X2_actionDefinition;
-    }
-
-    // Debug print
-    if (debug)
-        asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
-
-    // Encode
-    size_t bufferSize = sizeof(pRICActionDefinitionChoice->octetString.data);
-    asn_enc_rval_t rval;
-    rval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice,
-                                pRICActionDefinitionChoice->octetString.data, bufferSize);
-    if(rval.encoded == -1) {
-        sprintf(pLogBuffer,"Serialization of %s failed", asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice.name);
-        return e2err_RICActionDefinitionChoicePackFail_1;
-    }
-    else if(rval.encoded > bufferSize) {
-       sprintf(pLogBuffer,"Buffer of size %zu is too small for %s, need %zu",bufferSize, asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice.name, rval.encoded);
-        return e2err_RICActionDefinitionChoicePackFail_2;
-    }
-    else
-    if (debug)
-           sprintf(pLogBuffer,"Successfully encoded %s. Buffer size %zu, encoded size %zu",asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice.name, bufferSize, rval.encoded);
-
-    ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
-
-    pRICActionDefinitionChoice->octetString.contentLength = rval.encoded;
-    return e2err_OK;
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t packActionDefinitionNRTFormat(char* pLogBuffer, RICActionDefinitionChoice_t* pRICActionDefinitionChoice) {
-
-    // E2SM-gNB-NRT-actionDefinition
-    E2_E2SM_gNB_NRT_ActionDefinition_t* pE2_E2SM_gNB_NRT_ActionDefinition = calloc(1, sizeof(E2_E2SM_gNB_NRT_ActionDefinition_t));
-    if (pE2_E2SM_gNB_NRT_ActionDefinition == NULL)
-        return e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_NRT_ActionDefinitionFail;
-
-    if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1Present) {
-
-        // E2SM-gNB-NRT-ActionDefinition-Format1
-        pE2_E2SM_gNB_NRT_ActionDefinition->present = E2_E2SM_gNB_NRT_ActionDefinition_PR_actionDefinition_Format1;
-
-        struct E2_E2SM_gNB_NRT_ActionDefinition_Format1__ranParameter_List* pE2_E2SM_gNB_NRT_ActionDefinition_Format1__ranParameter_List =
-          calloc(1, sizeof(struct E2_E2SM_gNB_NRT_ActionDefinition_Format1__ranParameter_List));
-
-        uint64_t index = 0;
-        while (index <  pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterCount && index < E2_maxofRANParameters) {
-            E2_RANParameter_Item_t* pE2_RANParameter_Item = calloc(1, sizeof(E2_RANParameter_Item_t));
-            if (pE2_RANParameter_Item) {
-                pE2_RANParameter_Item->ranParameter_ID = pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterID;
-                if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueIntPresent) {
-                    pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueInt;
-                    pE2_RANParameter_Item->ranParameter_Value.choice.valueInt =
-                      pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueInt;
-                }
-                else if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueEnum) {
-                    pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueEnum;
-                    pE2_RANParameter_Item->ranParameter_Value.choice.valueEnum =
-                      pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueEnum;
-                }
-                else if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBoolPresent) {
-                    pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBool;
-                    pE2_RANParameter_Item->ranParameter_Value.choice.valueBool =
-                      pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBool;
-                }
-                else if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitSPresent) {
-                    pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBitS;
-                    pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.size =
-                      pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitS.byteLength;
-                    pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.bits_unused =
-                      pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitS.unusedBits;
-                    pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf =
-                      calloc(pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitS.byteLength, 1);
-                    if (pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf) {
-                        memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf,
-                               pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitS.data,
-                               pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitS.byteLength);
-                      }
-                      else
-                        return e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValueBitSFail;
-                }
-                else if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueOctSPresent) {
-                    pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueOctS;
-                    pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.size =
-                      pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueOctS.length;
-                      pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf =
-                      calloc(pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueOctS.length, 1);
-                      if (pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf) {
-                          memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf,
-                                 pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueOctS.data,
-                                 pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueOctS.length);
-                      }
-                      else
-                        return e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValueOctSFail;
-                }
-                else if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valuePrtSPresent) {
-                    pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valuePrtS;
-                    pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.size =
-                      pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valuePrtS.length;
-                    pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf =
-                      calloc(pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valuePrtS.length, 1);
-                    if (pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf) {
-                        memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf,
-                               pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valuePrtS.data,
-                               pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valuePrtS.length);
-                      }
-                      else
-                        return e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValuePrtsSFail;
-                }
-                else
-                    return e2err_RICSubscriptionRequestRanParameterItemNRTRanParameterValueEmptyFail;
-
-                int result;
-                if ((result = asn_set_add(pE2_E2SM_gNB_NRT_ActionDefinition_Format1__ranParameter_List, pE2_RANParameter_Item)) != 0)
-                    return e2err_RICSubscriptionRequestAsn_set_addE2_NRTRANParameter_ItemFail;
-                pE2_E2SM_gNB_NRT_ActionDefinition->choice.actionDefinition_Format1.ranParameter_List = pE2_E2SM_gNB_NRT_ActionDefinition_Format1__ranParameter_List;
-            }
-            else
-                return e2err_RICSubscriptionRequestAllocNRTRANParameter_ItemFail;
-            index++;
-        }
-    }
-    else
-        return e2err_RICSubscriptionRequestRICActionDefinitionEmptyE2_E2SM_gNB_NRT_actionDefinition;
-
-    // Debug print
-    if (debug)
-        asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, pE2_E2SM_gNB_NRT_ActionDefinition);
-
-    // Encode
-    size_t bufferSize = sizeof(pRICActionDefinitionChoice->octetString.data);
-    asn_enc_rval_t rval;
-    rval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, pE2_E2SM_gNB_NRT_ActionDefinition,
-                                pRICActionDefinitionChoice->octetString.data, bufferSize);
-    if(rval.encoded == -1) {
-        sprintf(pLogBuffer,"Serialization of %s failed", asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition.name);
-        return e2err_RICActionDefinitionChoicePackFail_1;
-    }
-    else if(rval.encoded > bufferSize) {
-       sprintf(pLogBuffer,"Buffer of size %zu is too small for %s, need %zu",bufferSize, asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition.name, rval.encoded);
-        return e2err_RICActionDefinitionChoicePackFail_2;
-    }
-    else
-    if (debug)
-           sprintf(pLogBuffer,"Successfully encoded %s. Buffer size %zu, encoded size %zu",asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition.name, bufferSize, rval.encoded);
-
-    ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, pE2_E2SM_gNB_NRT_ActionDefinition);
-
-    pRICActionDefinitionChoice->octetString.contentLength = rval.encoded;
-    return e2err_OK;
-}
 
 //////////////////////////////////////////////////////////////////////
 uint64_t packRICSubscriptionResponse(size_t* pDataBufferSize, byte* pDataBuffer, char* pLogBuffer, RICSubscriptionResponse_t* pRICSubscriptionResponse) {
@@ -1450,7 +755,7 @@
 }
 
 //////////////////////////////////////////////////////////////////////
-uint64_t getRICSubscriptionRequestData(mem_track_hdr_t * pDynMemHead, e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSubscriptionRequest_t* pRICSubscriptionRequest) {
+uint64_t getRICSubscriptionRequestData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSubscriptionRequest_t* pRICSubscriptionRequest) {
 
     E2AP_PDU_t* pE2AP_PDU = (E2AP_PDU_t*)pE2AP_PDU_pointer;
 
@@ -1491,23 +796,6 @@
         pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.octetString.contentLength = pRICeventTriggerDefinition->size;
         memcpy(pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.octetString.data, pRICeventTriggerDefinition->buf, pRICeventTriggerDefinition->size);
 
-        // Workaroud to spec problem. E2AP spec does not specify what speck (gNB-X2 or gNB-NRT) should be used when decoded EventTriggerDefinition and ActionDefinition
-        // received received. Here we know that length of gNB-NRT EventTriggerDefinition octet string is always 1 at the moment.
-        if (pRICeventTriggerDefinition->size == 1) {
-            pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBNRTEventTriggerDefinitionPresent = true;
-            pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBX2EventTriggerDefinitionPresent = false;
-        }
-        else {
-            pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBNRTEventTriggerDefinitionPresent = false;
-            pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBX2EventTriggerDefinitionPresent = true;
-        }
-
-        uint64_t returnCode;
-        if ((returnCode = getRICEventTriggerDefinitionData(&pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition)) != e2err_OK) {
-            ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
-            return returnCode;
-        }
-
         // RICactions-ToBeSetup-List
         RICaction_ToBeSetup_ItemIEs_t* pRICaction_ToBeSetup_ItemIEs;
         uint64_t index = 0;
@@ -1532,18 +820,7 @@
                        pRICaction_ToBeSetup_ItemIEs->value.choice.RICaction_ToBeSetup_Item.ricActionDefinition->buf,
                        pRICaction_ToBeSetup_ItemIEs->value.choice.RICaction_ToBeSetup_Item.ricActionDefinition->size);
 
-                // Workaroud to spec problem. E2AP spec does not specify what speck (gNB-X2 or gNB-NRT) should be used when decoded EventTriggerDefinition and ActionDefinition
-                // received received. Here we know that length of gNB-NRT EventTriggerDefinition octet string is always 1 at the moment.
-                if (pRICeventTriggerDefinition->size == 1)
-                    pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1Present = true;
-                else
-                    pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1Present = false;
-
                 pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionPresent = true;
-                if ((returnCode = getRICActionDefinitionData(pDynMemHead, &pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice)) != e2err_OK) {
-                    ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
-                    return returnCode;
-                }
             }
             else
                 pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionPresent = false;
@@ -1574,536 +851,9 @@
     return e2err_OK;
 }
 
-//////////////////////////////////////////////////////////////////////
-uint64_t getRICEventTriggerDefinitionData(RICEventTriggerDefinition_t* pRICEventTriggerDefinition) {
-
-    if (pRICEventTriggerDefinition->E2SMgNBX2EventTriggerDefinitionPresent)
-        return getRICEventTriggerDefinitionDataX2Format(pRICEventTriggerDefinition);
-    else if (pRICEventTriggerDefinition->E2SMgNBNRTEventTriggerDefinitionPresent)
-        return getRICEventTriggerDefinitionDataNRTFormat(pRICEventTriggerDefinition);
-    else
-        return e2err_RICEventTriggerDefinitionEmptyDecodeDefaultFail;
-}
 
 //////////////////////////////////////////////////////////////////////
-uint64_t getRICEventTriggerDefinitionDataX2Format(RICEventTriggerDefinition_t* pRICEventTriggerDefinition) {
 
-    E2_E2SM_gNB_X2_eventTriggerDefinition_t* pE2SM_gNB_X2_eventTriggerDefinition = 0;
-    asn_dec_rval_t rval;
-    rval = asn_decode(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, (void **)&pE2SM_gNB_X2_eventTriggerDefinition,
-                      pRICEventTriggerDefinition->octetString.data, pRICEventTriggerDefinition->octetString.contentLength);
-    switch(rval.code) {
-    case RC_OK:
-        // Debug print
-        if (debug) {
-            printf("Successfully decoded E2SM_gNB_X2_eventTriggerDefinition\n");
-            asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition);
-        }
-
-        // InterfaceID, GlobalENB-ID or GlobalGNB-ID
-        if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.present == E2_Interface_ID_PR_global_eNB_ID) {
-
-            // GlobalENB-ID
-            pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBIDPresent = true;
-
-            // PLMN-Identity
-            pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.pLMNIdentity.contentLength =
-              pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.size;
-            memcpy(pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.pLMNIdentity.pLMNIdentityVal,
-              pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf,
-              pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.pLMNIdentity.contentLength);
-
-            //  ENB-ID
-            IdOctects_t eNBOctects;
-            memset(eNBOctects.octets, 0, sizeof(eNBOctects));
-            if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present == E2_ENB_ID_PR_macro_eNB_ID) {
-                // BIT STRING, SIZE 20
-                pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits = cMacroENBIDP_20Bits;
-                memcpy(eNBOctects.octets,pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.buf,
-                  pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.size);
-                pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID = eNBOctects.nodeID;
-            }
-            else if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present == E2_ENB_ID_PR_home_eNB_ID) {
-                // BIT STRING, SIZE 28
-                pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits = cHomeENBID_28Bits;
-                memcpy(eNBOctects.octets,pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.buf,
-                  pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.size);
-                pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID = eNBOctects.nodeID;
-            }
-            else if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present == E2_ENB_ID_PR_short_Macro_eNB_ID) {
-                // BIT STRING, SIZE 18
-                pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits = cShortMacroENBID_18Bits;
-                memcpy(eNBOctects.octets,pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.buf,
-                  pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.size);
-                pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID = eNBOctects.nodeID;
-            }
-            else if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present == E2_ENB_ID_PR_long_Macro_eNB_ID) {
-                // BIT STRING, SIZE 21
-                pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits =  clongMacroENBIDP_21Bits;
-                memcpy(eNBOctects.octets,pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.buf,
-                  pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.size);
-                pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID = eNBOctects.nodeID;
-            }
-            else {
-                pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBIDPresent = false;
-                pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBIDPresent = false;
-                ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition);
-                return e2err_RICEventTriggerDefinitionIEValueFail_5;
-            }
-        }
-        else if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.present == E2_Interface_ID_PR_global_gNB_ID) {
-            // GlobalGNB-ID
-            pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBIDPresent = true;
-
-            // PLMN-Identity
-            pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.contentLength =
-              pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.size;
-            memcpy(pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.pLMNIdentityVal,
-              pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf,
-              pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.contentLength);
-
-            // GNB-ID
-            IdOctects_t gNBOctects;
-            memset(gNBOctects.octets, 0, sizeof(gNBOctects));
-            if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.present == E2_GNB_ID_PR_gNB_ID) {
-                pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.nodeID.bits = pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.size;
-                memcpy(gNBOctects.octets, pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.buf,
-                   pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.nodeID.bits);
-                pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.nodeID.nodeID = gNBOctects.nodeID;
-            }
-            else {
-                pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBIDPresent = false;
-                pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBIDPresent = false;
-                ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition);
-                return e2err_RICEventTriggerDefinitionIEValueFail_6;
-            }
-        }
-        else {
-            pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBIDPresent = false;
-            pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBIDPresent = false;
-            ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition);
-            return e2err_RICEventTriggerDefinitionIEValueFail_7;
-        }
-
-        // InterfaceDirection
-        pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceDirection = pE2SM_gNB_X2_eventTriggerDefinition->interfaceDirection;
-
-        // InterfaceMessageType
-        pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.procedureCode = pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.procedureCode;
-
-        if (pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.typeOfMessage == E2_TypeOfMessage_initiating_message)
-            pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage = cE2InitiatingMessage;
-        else if (pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.typeOfMessage == E2_TypeOfMessage_successful_outcome)
-            pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage = cE2SuccessfulOutcome;
-        else if (pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.typeOfMessage == E2_TypeOfMessage_unsuccessful_outcome)
-            pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage = cE2UnsuccessfulOutcome;
-        else {
-            ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition);
-            return e2err_RICEventTriggerDefinitionIEValueFail_8;
-        }
-        ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition);
-        return e2err_OK;
-    case RC_WMORE:
-        if (debug)
-            printf("Decode failed. More data needed. Buffer size %zu, %s, consumed %zu\n",pRICEventTriggerDefinition->octetString.contentLength,
-                   asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition.name, rval.consumed);
-
-        return e2err_RICEventTriggerDefinitionDecodeWMOREFail;
-    case RC_FAIL:
-        if (debug)
-            printf("Decode failed. Buffer size %zu, %s, consumed %zu\n",pRICEventTriggerDefinition->octetString.contentLength,
-                   asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition.name, rval.consumed);
-        return e2err_RICEventTriggerDefinitionDecodeFAIL;
-    default:
-        return e2err_RICEventTriggerDefinitionDecodeDefaultFail;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t getRICEventTriggerDefinitionDataNRTFormat(RICEventTriggerDefinition_t* pRICEventTriggerDefinition) {
-
-    E2_E2SM_gNB_NRT_EventTriggerDefinition_t* pE2_E2SM_gNB_NRT_EventTriggerDefinition = 0;
-    asn_dec_rval_t rval;
-    rval = asn_decode(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition, (void **)&pE2_E2SM_gNB_NRT_EventTriggerDefinition,
-                      pRICEventTriggerDefinition->octetString.data, pRICEventTriggerDefinition->octetString.contentLength);
-    switch(rval.code) {
-    case RC_OK:
-        // Debug print
-        if (debug) {
-            printf("Successfully decoded E2SM_gNB_X2_eventTriggerDefinition\n");
-            asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition, pE2_E2SM_gNB_NRT_EventTriggerDefinition);
-        }
-
-        // NRT-TriggerNature
-        if (pE2_E2SM_gNB_NRT_EventTriggerDefinition->present == E2_E2SM_gNB_NRT_EventTriggerDefinition_PR_eventDefinition_Format1) {
-            pRICEventTriggerDefinition->E2SMgNBNRTEventTriggerDefinitionPresent = true;
-            pRICEventTriggerDefinition->e2SMgNBNRTEventTriggerDefinition.eventDefinitionFormat1.triggerNature =
-              pE2_E2SM_gNB_NRT_EventTriggerDefinition->choice.eventDefinition_Format1.triggerNature;
-        }
-        ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition, pE2_E2SM_gNB_NRT_EventTriggerDefinition);
-        return e2err_OK;
-    case RC_WMORE:
-        if (debug)
-            printf("Decode failed. More data needed. Buffer size %zu, %s, consumed %zu\n",pRICEventTriggerDefinition->octetString.contentLength,
-                   asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition.name, rval.consumed);
-
-        return e2err_RICNRTEventTriggerDefinitionDecodeWMOREFail;
-    case RC_FAIL:
-        if (debug)
-            printf("Decode failed. Buffer size %zu, %s, consumed %zu\n",pRICEventTriggerDefinition->octetString.contentLength,
-                   asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition.name, rval.consumed);
-        return e2err_RICNRTEventTriggerDefinitionDecodeFAIL;
-    default:
-        return e2err_RICNRTEventTriggerDefinitionDecodeDefaultFail;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t getRICActionDefinitionData(mem_track_hdr_t *pDynMemHead, RICActionDefinitionChoice_t* pRICActionDefinitionChoice) {
-
-    if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1Present)
-        return getRICActionDefinitionDataNRTFormat(pDynMemHead, pRICActionDefinitionChoice);
-//    if (pRICActionDefinitionChoice->actionDefinitionX2Format1Present || pRICActionDefinitionChoice->actionDefinitionX2Format2Present)
-    else
-        return getRICActionDefinitionDataX2Format(pDynMemHead, pRICActionDefinitionChoice);
-//    else
-//        return e2err_RICActionDefinitionChoiceEmptyFAIL;
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t getRICActionDefinitionDataX2Format(mem_track_hdr_t* pDynMemHead, RICActionDefinitionChoice_t* pRICActionDefinitionChoice) {
-
-    E2_E2SM_gNB_X2_ActionDefinitionChoice_t* pE2_E2SM_gNB_X2_ActionDefinitionChoice = 0;
-    asn_dec_rval_t rval;
-    rval = asn_decode(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, (void **)&pE2_E2SM_gNB_X2_ActionDefinitionChoice,
-                      pRICActionDefinitionChoice->octetString.data, pRICActionDefinitionChoice->octetString.contentLength);
-    switch(rval.code) {
-    case RC_OK:
-        // Debug print
-        if (debug) {
-            printf("Successfully decoded E2SM_gNB_X2_ActionDefinitionChoice\n");
-            asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
-        }
-        // ActionDefinitionChoice
-        if (pE2_E2SM_gNB_X2_ActionDefinitionChoice->present == E2_E2SM_gNB_X2_ActionDefinitionChoice_PR_actionDefinition_Format1) {
-
-            // E2SM-gNB-X2-actionDefinition
-            uint64_t status;
-            if ((status = allocActionDefinitionX2Format1(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format1)) != e2err_OK)
-                return status;
-            pRICActionDefinitionChoice->actionDefinitionX2Format1Present = true;
-            pRICActionDefinitionChoice->actionDefinitionX2Format2Present = false;
-            pRICActionDefinitionChoice->actionDefinitionNRTFormat1Present = false;
-            pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterCount = 0;
-            pRICActionDefinitionChoice->actionDefinitionX2Format1->styleID = pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format1.style_ID;
-
-            uint64_t index = 0;
-            if (pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format1.actionParameter_List) {
-                while (index < pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format1.actionParameter_List->list.count) {
-                    E2_ActionParameter_Item_t* pE2_ActionParameter_Item = pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format1.actionParameter_List->list.array[index];
-                    if (pE2_ActionParameter_Item) {
-                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].parameterID = pE2_ActionParameter_Item->actionParameter_ID;
-                        if (pE2_ActionParameter_Item->actionParameter_Value.present == E2_ActionParameter_Value_PR_valueInt) {
-                            pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueIntPresent = true;
-                            pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueInt =
-                            pE2_ActionParameter_Item->actionParameter_Value.choice.valueInt;
-                        }
-                        else if (pE2_ActionParameter_Item->actionParameter_Value.present == E2_ActionParameter_Value_PR_valueEnum) {
-                            pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueEnumPresent = true;
-                            pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueIntPresent =
-                            pE2_ActionParameter_Item->actionParameter_Value.choice.valueEnum;
-                        }
-                        else if (pE2_ActionParameter_Item->actionParameter_Value.present == E2_ActionParameter_Value_PR_valueBool) {
-                            pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueBoolPresent = true;
-                            pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueBool =
-                            pE2_ActionParameter_Item->actionParameter_Value.choice.valueBool;
-                        }
-                        else if (pE2_ActionParameter_Item->actionParameter_Value.present == E2_ActionParameter_Value_PR_valueBitS) {
-                            pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueBitSPresent = true;
-                            addBitString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueBitS,
-                                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.size,
-                                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.buf,
-                                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.bits_unused);
-                        }
-                        else if (pE2_ActionParameter_Item->actionParameter_Value.present == E2_ActionParameter_Value_PR_valueOctS) {
-                            pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueOctSPresent = true;
-                            addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valueOctS,
-                                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.size,
-                                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.buf);
-                        }
-                        else if (pE2_ActionParameter_Item->actionParameter_Value.present == E2_ActionParameter_Value_PR_valuePrtS) {
-                            pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valuePrtSPresent = true;
-                            addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem[index].actionParameterValue.valuePrtS,
-                                        pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.size,
-                                        pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.buf);
-                        }
-                        else {
-                            ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
-                            return e2err_RICSubscriptionRequestActionParameterItemFail;
-                        }
-                    }
-                    index++;
-                }
-            }
-            pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterCount = index;
-        }
-        else if (pE2_E2SM_gNB_X2_ActionDefinitionChoice->present == E2_E2SM_gNB_X2_ActionDefinitionChoice_PR_actionDefinition_Format2) {
-
-            // E2SM-gNB-X2-ActionDefinition-Format2
-            uint64_t status;
-            if ((status = allocActionDefinitionX2Format2(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format2)) != e2err_OK)
-                return status;
-
-            pRICActionDefinitionChoice->actionDefinitionX2Format2Present = true;
-            pRICActionDefinitionChoice->actionDefinitionX2Format1Present = false;
-            pRICActionDefinitionChoice->actionDefinitionNRTFormat1Present = false;
-            pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupCount = 0;
-            pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem->ranUEgroupDefinition.ranUeGroupDefCount = 0;
-            pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem->ranPolicy.ranParameterCount = 0;
-
-            E2_E2SM_gNB_X2_ActionDefinition_Format2_t* pE2SM_gNB_X2_actionDefinition = &pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format2;
-            if(pE2SM_gNB_X2_actionDefinition) {
-                uint64_t index = 0;
-                if (pE2SM_gNB_X2_actionDefinition->ranUEgroup_List) {
-                    while (index < pE2SM_gNB_X2_actionDefinition->ranUEgroup_List->list.count) {
-                        E2_RANueGroup_Item_t* pE2_RANueGroup_Item = pE2SM_gNB_X2_actionDefinition->ranUEgroup_List->list.array[index];
-                        if (pE2_RANueGroup_Item) {
-                            pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupID = pE2_RANueGroup_Item->ranUEgroupID;
-                            uint64_t index2 = 0;
-                            while (index2 < pE2_RANueGroup_Item->ranUEgroupDefinition.ranUEgroupDef_List->list.count) {
-                                E2_RANueGroupDef_Item_t* pE2_RANueGroupDef_Item = pE2_RANueGroup_Item->ranUEgroupDefinition.ranUEgroupDef_List->list.array[index2];
-                                if(pE2_RANueGroupDef_Item) {
-                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterID = pE2_RANueGroupDef_Item->ranParameter_ID;
-                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterTest = pE2_RANueGroupDef_Item->ranParameter_Test;
-                                    if (pE2_RANueGroupDef_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueInt) {
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueIntPresent = true;
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueInt =
-                                          pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueInt;
-                                    }
-                                    else if (pE2_RANueGroupDef_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueEnum) {
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueEnum = true;
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueEnum =
-                                          pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueEnum;
-                                    }
-                                    else if (pE2_RANueGroupDef_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueBool) {
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBoolPresent = true;
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBool =
-                                          pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBool;
-                                    }
-                                    else if (pE2_RANueGroupDef_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueBitS) {
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitSPresent = true;
-                                        addBitString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS,
-                                                     pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.size,
-                                                     pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.buf,
-                                                     pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.bits_unused);
-                                    }
-                                    else if (pE2_RANueGroupDef_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueOctS) {
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctSPresent = true;
-                                        addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS,
-                                                     pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.size,
-                                                     pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.buf);
-                                    }
-                                    else if (pE2_RANueGroupDef_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valuePrtS) {
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtSPresent = true;
-                                        addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtS,
-                                                     pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.size,
-                                                     pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.buf);
-                                    }
-                                    else {
-                                        ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
-                                        return e2err_RICSubscriptionRequestRanranUeGroupDefItemParameterValueEmptyFail;
-                                    }
-                                }
-                                else {
-                                    ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
-                                    return e2err_RICSubscriptionRequestAllocE2_RANueGroupDef_ItemFail;
-                                }
-                                index2++;
-                            }
-                            pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefCount = index2;
-
-                            uint64_t index3 = 0;
-                            while (index3 < pE2_RANueGroup_Item->ranPolicy.ranImperativePolicy_List->list.count) {
-                                E2_RANParameter_Item_t* pE2_RANParameter_Item = pE2_RANueGroup_Item->ranPolicy.ranImperativePolicy_List->list.array[index3];
-                                if (pE2_RANParameter_Item) {
-                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterID = pE2_RANParameter_Item->ranParameter_ID;
-                                    if (pE2_RANParameter_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueInt) {
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueIntPresent = true;
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueInt =
-                                          pE2_RANParameter_Item->ranParameter_Value.choice.valueInt;
-                                    }
-                                    else if (pE2_RANParameter_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueEnum) {
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum = true;
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum =
-                                          pE2_RANParameter_Item->ranParameter_Value.choice.valueEnum;
-                                    }
-                                    else if (pE2_RANParameter_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueBool) {
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBoolPresent = true;
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBool =
-                                          pE2_RANParameter_Item->ranParameter_Value.choice.valueBool;
-                                    }
-                                    else if (pE2_RANParameter_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueBitS) {
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitSPresent = true;
-                                        addBitString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS,
-                                                     pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.size,
-                                                     pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf,
-                                                     pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.bits_unused);
-                                    }
-                                    else if (pE2_RANParameter_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueOctS) {
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctSPresent = true;
-                                        addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS,
-                                                     pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.size,
-                                                     pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf);
-                                    }
-                                    else if (pE2_RANParameter_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valuePrtS) {
-                                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtSPresent = true;
-                                        addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS,
-                                                     pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.size,
-                                                     pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf);
-                                    }
-                                    else {
-                                        ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
-                                        return e2err_RICSubscriptionRequestRanParameterItemRanParameterValueEmptyFail;
-                                    }
-                                }
-                                else {
-                                    ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
-                                    return e2err_RICSubscriptionRequestAllocActionDefinitionFail;
-                                }
-                                index3++;
-                            }
-                            pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterCount = index3;
-                        }
-                        else {
-                            ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
-                            return e2err_RICSubscriptionRequestAllocRANParameter_ItemFail;
-                        }
-                        index++;
-                    }
-               }
-               pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupCount = index;
-            }
-        }
-        ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
-        return e2err_OK;
-    case RC_WMORE:
-        if (debug)
-            printf("Decode failed. More data needed. Buffer size %zu, %s, consumed %zu\n",pRICActionDefinitionChoice->octetString.contentLength,
-                   asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice.name, rval.consumed);
-
-        return e2err_RICActionDefinitionChoiceWMOREFail;
-    case RC_FAIL:
-        if (debug)
-            printf("Decode failed. Buffer size %zu, %s, consumed %zu\n",pRICActionDefinitionChoice->octetString.contentLength,
-                   asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice.name, rval.consumed);
-
-        return e2err_RICActionDefinitionChoiceDecodeFAIL;
-    default:
-        return e2err_RICActionDefinitionChoiceDecodeDefaultFail;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t getRICActionDefinitionDataNRTFormat(mem_track_hdr_t* pDynMemHead, RICActionDefinitionChoice_t* pRICActionDefinitionChoice) {
-
-    E2_E2SM_gNB_NRT_ActionDefinition_t* pE2_E2SM_gNB_NRT_ActionDefinition = 0;
-    asn_dec_rval_t rval;
-    rval = asn_decode(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, (void **)&pE2_E2SM_gNB_NRT_ActionDefinition,
-                      pRICActionDefinitionChoice->octetString.data, pRICActionDefinitionChoice->octetString.contentLength);
-    switch(rval.code) {
-    case RC_OK:
-        // Debug print
-        if (debug) {
-            printf("Successfully decoded E2SM_gNB_NRT_ActionDefinition\n");
-            asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, pE2_E2SM_gNB_NRT_ActionDefinition);
-        }
-
-        // ActionDefinitionChoice
-        if (pE2_E2SM_gNB_NRT_ActionDefinition->present == E2_E2SM_gNB_NRT_ActionDefinition_PR_actionDefinition_Format1) {
-
-            // E2SM-gNB-NRT-actionDefinition
-            uint64_t status;
-            if ((status = allocActionDefinitionNRTFormat1(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionNRTFormat1)) != e2err_OK)
-                return status;
-
-            pRICActionDefinitionChoice->actionDefinitionNRTFormat1Present = true;
-            pRICActionDefinitionChoice->actionDefinitionX2Format1Present = false;
-            pRICActionDefinitionChoice->actionDefinitionX2Format2Present = false;
-            pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterCount = 0;
-            if (pE2_E2SM_gNB_NRT_ActionDefinition->choice.actionDefinition_Format1.ranParameter_List) {            
-                uint64_t index = 0;
-                while (index < pE2_E2SM_gNB_NRT_ActionDefinition->choice.actionDefinition_Format1.ranParameter_List->list.count) {
-                    E2_RANparameter_Item_t* pE2_RANparameter_Item = pE2_E2SM_gNB_NRT_ActionDefinition->choice.actionDefinition_Format1.ranParameter_List->list.array[index];
-                    if (pE2_RANparameter_Item) {
-                        pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterID = pE2_RANparameter_Item->ranParameter_ID;
-
-                        if (pE2_RANparameter_Item->ranParameter_Value.present == E2_RANparameter_Value_PR_valueInt) {
-                            pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueIntPresent = true;
-                            pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueInt =
-                            pE2_RANparameter_Item->ranParameter_Value.choice.valueInt;
-                        }
-                        else if (pE2_RANparameter_Item->ranParameter_Value.present == E2_RANparameter_Value_PR_valueEnum) {
-                            pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueEnumPresent = true;
-                            pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueEnum =
-                            pE2_RANparameter_Item->ranParameter_Value.choice.valueEnum;
-                        }
-                        else if (pE2_RANparameter_Item->ranParameter_Value.present == E2_RANparameter_Value_PR_valueBool) {
-                            pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBoolPresent = true;
-                            pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBool =
-                            pE2_RANparameter_Item->ranParameter_Value.choice.valueBool;
-                        }
-                        else if (pE2_RANparameter_Item->ranParameter_Value.present == E2_RANparameter_Value_PR_valueBitS) {
-                            pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitSPresent = true;
-                            addBitString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitS,
-                                        pE2_RANparameter_Item->ranParameter_Value.choice.valueBitS.size,
-                                        pE2_RANparameter_Item->ranParameter_Value.choice.valueBitS.buf,
-                                        pE2_RANparameter_Item->ranParameter_Value.choice.valueBitS.bits_unused);
-                        }
-                        else if (pE2_RANparameter_Item->ranParameter_Value.present == E2_RANparameter_Value_PR_valueOctS) {
-                            pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueOctSPresent = true;
-                            addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueOctS,
-                                        pE2_RANparameter_Item->ranParameter_Value.choice.valueOctS.size,
-                                        pE2_RANparameter_Item->ranParameter_Value.choice.valueOctS.buf);
-                        }
-                        else if (pE2_RANparameter_Item->ranParameter_Value.present == E2_RANparameter_Value_PR_valuePrtS) {
-                            pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valuePrtSPresent = true;
-                            addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valuePrtS,
-                                        pE2_RANparameter_Item->ranParameter_Value.choice.valuePrtS.size,
-                                        pE2_RANparameter_Item->ranParameter_Value.choice.valuePrtS.buf);
-                        }
-                        else {
-                            ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, pE2_E2SM_gNB_NRT_ActionDefinition);
-                            return e2err_RICSubscriptionRequestNRTRanParameterItemRanParameterValueEmptyFail;
-                        }
-                    }
-                    else {
-                        ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, pE2_E2SM_gNB_NRT_ActionDefinition);
-                        return e2err_RICSubscriptionRequestNRTAllocActionDefinitionFail;
-                    }
-                    index++;
-                }
-                pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterCount = index;
-            }
-        }
-        ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, pE2_E2SM_gNB_NRT_ActionDefinition);
-        return e2err_OK;
-    case RC_WMORE:
-        if (debug)
-            printf("Decode failed. More data needed. Buffer size %zu, %s, consumed %zu\n",pRICActionDefinitionChoice->octetString.contentLength,
-                   asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition.name, rval.consumed);
-
-        return e2err_RICNRTActionDefinitionChoiceWMOREFail;
-    case RC_FAIL:
-        if (debug)
-            printf("Decode failed. Buffer size %zu, %s, consumed %zu\n",pRICActionDefinitionChoice->octetString.contentLength,
-                   asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition.name, rval.consumed);
-
-        return e2err_RICNRTActionDefinitionChoiceDecodeFAIL;
-    default:
-        return e2err_RICNRTActionDefinitionChoiceDecodeDefaultFail;
-    }
-}
-//////////////////////////////////////////////////////////////////////
 uint64_t getRICSubscriptionResponseData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSubscriptionResponse_t* pRICSubscriptionResponse) {
 
     E2AP_PDU_t* pE2AP_PDU = (E2AP_PDU_t*)pE2AP_PDU_pointer;
@@ -2435,91 +1185,3 @@
     return e2err_OK;
 }
 
-//////////////////////////////////////////////////////////////////////
-uint64_t allocActionDefinitionX2Format1(mem_track_hdr_t* pDynMemHead, E2SMgNBX2actionDefinition_t** pActionDefinition) {
-    *pActionDefinition = mem_track_alloc(pDynMemHead, sizeof(E2SMgNBX2actionDefinition_t));
-    if(*pActionDefinition)
-        return e2err_OK;
-    else
-        return e2err_RICSubscriptionRequestAllocactionDefinitionX2Format1Fail;
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t allocActionDefinitionX2Format2(mem_track_hdr_t* pDynMemHead, E2SMgNBX2ActionDefinitionFormat2_t** pActionDefinition) {
-    *pActionDefinition = mem_track_alloc(pDynMemHead, sizeof(E2SMgNBX2ActionDefinitionFormat2_t));
-    if(*pActionDefinition)
-        return e2err_OK;
-    else
-        return e2err_RICSubscriptionRequestAllocactionDefinitionX2Format2Fail;
-}
-
-//////////////////////////////////////////////////////////////////////
-uint64_t allocActionDefinitionNRTFormat1(mem_track_hdr_t* pDynMemHead, E2SMgNBNRTActionDefinitionFormat1_t** pActionDefinition) {
-    *pActionDefinition = mem_track_alloc(pDynMemHead, sizeof(E2SMgNBNRTActionDefinitionFormat1_t));
-    if(*pActionDefinition)
-        return e2err_OK;
-    else
-        return e2err_RICSubscriptionRequestAllocactionDefinitionNRTFormat1Fail;
-}
-
-//////////////////////////////////////////////////////////////////////
-bool addOctetString(mem_track_hdr_t* pDynMemHead, DynOctetString_t* pOctetString, uint64_t bufferSize, void* pData)
-{
-    pOctetString->data = mem_track_alloc(pDynMemHead, bufferSize);
-    if (pOctetString->data) {
-        pOctetString->length = bufferSize;
-        memcpy(pOctetString->data,pData,bufferSize);
-        return true;
-    }
-    else
-        return false;
-}
-
-//////////////////////////////////////////////////////////////////////
-bool addBitString(mem_track_hdr_t* pDynMemHead, DynBitString_t* pBitString, uint64_t bufferSize, void* pData, uint8_t unusedBits)
-{
-    pBitString->data = mem_track_alloc(pDynMemHead, bufferSize);
-    if (pBitString->data) {
-        pBitString->byteLength = bufferSize;
-        pBitString->unusedBits = unusedBits; // Unused trailing bits in the last octet (0..7)
-        memcpy(pBitString->data,pData,bufferSize);
-        return true;
-    }
-    else
-        return false;
-}
-
-//////////////////////////////////////////////////////////////////////
-void mem_track_init(mem_track_hdr_t *curr)
-{
-    *curr=(mem_track_hdr_t)MEM_TRACK_HDR_INIT;
-}
-
-//////////////////////////////////////////////////////////////////////
-void* mem_track_alloc(mem_track_hdr_t *curr, size_t sz)
-{
-    mem_track_t *newentry = (mem_track_t *)malloc(sizeof(mem_track_t)+sz);
-    newentry->next=0;
-    newentry->sz=sz;
-    memset(newentry->ptr,0,newentry->sz);
-
-    if (!curr->next) {
-        curr->next = newentry;
-    } else {
-        mem_track_t *iter=curr->next;
-        for(;iter->next;iter=iter->next);
-        iter->next = newentry;
-    }
-    return newentry->ptr;
-}
-
-//////////////////////////////////////////////////////////////////////
-void mem_track_free(mem_track_hdr_t *curr)
-{
-    mem_track_t *itecurr,*itenext;
-    for(itecurr=curr->next; itecurr; itecurr=itenext){
-        itenext = itecurr->next;
-        free(itecurr);
-    }
-    mem_track_init(curr);
-}
diff --git a/e2ap/libe2ap_wrapper/E2AP_if.h b/e2ap/libe2ap_wrapper/E2AP_if.h
index 2ccea5b..aab8aaa 100644
--- a/e2ap/libe2ap_wrapper/E2AP_if.h
+++ b/e2ap/libe2ap_wrapper/E2AP_if.h
@@ -27,8 +27,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <ProcedureCode.h>
-#include <PrintableString.h>
-#include "memtrack.h"
 
 #ifdef	__cplusplus
 extern "C" {
@@ -77,93 +75,6 @@
      RICActionType_policy
 };
 
-typedef uint64_t StyleID_t;
-
-typedef uint32_t ParameterID_t;  // 0..255 (maxofActionParameters)
-
-typedef struct { // CHOICE. Only one value can be present
-    bool valueIntPresent;
-	int64_t valueInt;
-	bool valueEnumPresent;
-	int64_t valueEnum;
-    bool valueBoolPresent;
-	bool valueBool;
-    bool valueBitSPresent;
-	DynBitString_t valueBitS;
-    bool valueOctSPresent;
-	DynOctetString_t valueOctS;
-	bool valuePrtSPresent;
-	DynOctetString_t valuePrtS;
-} ActionParameterValue_t;
-
-typedef struct {
-    ParameterID_t parameterID;
-    ActionParameterValue_t actionParameterValue;
-} ActionParameterItem_t;
-
-typedef struct {
-    StyleID_t styleID;
-    uint8_t actionParameterCount;
-    ActionParameterItem_t actionParameterItem[255]; // OPTIONAL. 1..255 (maxofRANParameters)
-} E2SMgNBX2actionDefinition_t;
-
-enum RANParameterTest_t {
-	RANParameterTest_equal,
-	RANParameterTest_greaterthan,
-	RANParameterTest_lessthan,
-	RANParameterTest_contains,
-	RANParameterTest_present
-};
-
-typedef struct {
-    bool valueIntPresent;
-	int64_t valueInt;
-	bool valueEnumPresent;
-	int64_t valueEnum;
-    bool valueBoolPresent;
-	bool valueBool;
-    bool valueBitSPresent;
-	DynBitString_t valueBitS;
-    bool valueOctSPresent;
-	DynOctetString_t valueOctS;
-	bool valuePrtSPresent;
-	DynOctetString_t valuePrtS;
-} RANParameterValue_t;
-
-typedef int64_t RANueGroupID_t; // INTEGER
-typedef uint32_t RANParameterID_t; // 0..255 (maxofRANParameters)
-
-typedef struct {
-	RANParameterID_t ranParameterID;
-	RANParameterValue_t ranParameterValue;
-} RANParameterItem_t;
-
-typedef struct {
-	RANParameterID_t ranParameterID;
-	uint8_t ranParameterTest;               // This is type of enum RANParameterTest_t
-	RANParameterValue_t ranParameterValue;
-} RANueGroupDefItem_t;
-
-typedef struct {
-    uint8_t ranUeGroupDefCount;
-	RANueGroupDefItem_t ranUeGroupDefItem[255]; //OPTIONAL. 1..255 (maxofRANParameters)
-} RANueGroupDefinition_t;
-
-typedef struct {
-    uint8_t ranParameterCount;
-	RANParameterItem_t ranParameterItem[255]; //OPTIONAL. 1..255 (maxofRANParameters)
-} RANimperativePolicy_t;
-
-typedef struct {
-    RANueGroupID_t ranUEgroupID;
-	RANueGroupDefinition_t ranUEgroupDefinition;
-	RANimperativePolicy_t ranPolicy;
-} RANueGroupItem_t;
-
-typedef struct {
-    uint8_t ranUeGroupCount;
-    RANueGroupItem_t ranUeGroupItem[15]; // OPTIONAL. 1..15 (maxofUEgroup)
-} E2SMgNBX2ActionDefinitionFormat2_t;
 
 enum RICSubsequentActionType_t {
 	RICSubsequentActionType_Continue,
@@ -171,19 +82,7 @@
 };
 
 typedef struct {
-    uint8_t ranParameterCount;
-	RANParameterItem_t ranParameterList[255];	// OPTIONAL. 1..255 (maxofRANParameters)
-} E2SMgNBNRTActionDefinitionFormat1_t;
-
-typedef struct {
     OctetString_t octetString;   // This element is E2AP spec format
-    // CHOICE. Only one value can be present
-    bool actionDefinitionX2Format1Present;
-	E2SMgNBX2actionDefinition_t* actionDefinitionX2Format1; // This element is E2SM-gNB-X2 format
-	bool actionDefinitionX2Format2Present;
-	E2SMgNBX2ActionDefinitionFormat2_t* actionDefinitionX2Format2; // This element is E2SM-gNB-X2 format
-	bool actionDefinitionNRTFormat1Present;
-    E2SMgNBNRTActionDefinitionFormat1_t* actionDefinitionNRTFormat1; // This element is E2SM-gNB-NRT format
 } RICActionDefinitionChoice_t;
 
 enum RICTimeToWait_t {
@@ -263,81 +162,11 @@
 
 typedef uint8_t ProcedureCode__t;
 
-enum TypeOfMessage_t {
-    TypeOfMessage_nothing,
-    TypeOfMessage_InitiatingMessage,
-    TypeOfMessage_SuccessfulOutcome,
-    TypeOfMessage_UnsuccessfulOutcome
-};
-
-typedef struct  {
-	ProcedureCode__t procedureCode;
-	uint8_t typeOfMessage;  // This is type of enum TypeOfMessage_t
-} InterfaceMessageType_t;
-
-typedef uint32_t InterfaceProtocolIEID_t;
-
-enum InterfaceProtocolIETest_t {
-	ProtocolIEtestCondition_equal,
-	ProtocolIEtestCondition_greaterthan,
-	ProtocolIEtestCondition_lessthan,
-	ProtocolIEtestCondition_contains,
-	ProtocolIEtestCondition_present
-};
-
-typedef struct {   // CHOICE. Only one value can be present
-    bool valueIntPresent;
-	int64_t valueInt;
-	bool valueEnumPresent;
-	int64_t valueEnum;
-    bool valueBoolPresent;
-	bool valueBool;
-    bool valueBitStringPresent;
-	DynBitString_t valueBitString;
-    bool octetstringPresent;
-	DynOctetString_t octetString;
-} InterfaceProtocolIEValue_t;
-
-typedef struct {
-    InterfaceProtocolIEID_t interfaceProtocolIEID;
-    uint8_t interfaceProtocolIETest;                        // This is type of enum InterfaceProtocolIETest_t
-    InterfaceProtocolIEValue_t  interfaceProtocolIEValue;
-} InterfacProtocolIE_t;
 
 static const uint64_t cMaxofProtocolIE = 15;
 
 typedef struct {
-    InterfacProtocolIE_t InterfacProtocolIE[15]; // Table size is const cMaxofProtocolIE
-} InterfaceProtocolIEList_t;
-
-typedef struct {
-    InterfaceID_t interfaceID;
-    uint8_t interfaceDirection;  // This is type of enum InterfaceDirection_t
-    InterfaceMessageType_t interfaceMessageType;
-    bool interfaceProtocolIEListPresent;
-    InterfaceProtocolIEList_t interfaceProtocolIEList;  // OPTIONAL. Not used in RIC currently
-} E2SMgNBX2eventTriggerDefinition_t;
-
-enum NRTTriggerNature_t {
-    NRTTriggerNature_t_now,
-    NRTTriggerNature_t_onchange
-};
-
-typedef struct {
-	uint8_t triggerNature;  // This is type of enum NRTTriggerNature_t
-} E2SMgNBNRTEventTriggerDefinitionFormat1_t;
-
-typedef struct {
-    E2SMgNBNRTEventTriggerDefinitionFormat1_t eventDefinitionFormat1;
-} E2SMgNBNRTEventTriggerDefinition_t;
-
-typedef struct {
     OctetString_t octetString;   // This element is E2AP spec format
-    // CHOICE. Only one value can be present.
-    bool E2SMgNBX2EventTriggerDefinitionPresent;
-    E2SMgNBX2eventTriggerDefinition_t e2SMgNBX2eventTriggerDefinition;  // This element is E2SM-gNB-X2 spec format
-    bool E2SMgNBNRTEventTriggerDefinitionPresent;
-    E2SMgNBNRTEventTriggerDefinition_t e2SMgNBNRTEventTriggerDefinition; // This element is E2SM-gNB-NRT spec format
 } RICEventTriggerDefinition_t;
 
 typedef struct {
@@ -424,78 +253,12 @@
     e2err_RICSubscriptionRequestAllocRANfunctionIDFail,
     e2err_RICSubscriptionRequestAllocRICeventTriggerDefinitionBufFail,
     e2err_RICSubscriptionRequestAllocRICaction_ToBeSetup_ItemIEsFail,
-    e2err_RICSubscriptionRequestAllocactionParameterValueValueBitSFail,
-    e2err_RICSubscriptionRequestAllocactionParameterValueValueOctSFail,
-    e2err_RICSubscriptionRequestAllocactionParameterValueValuePrtsSFail,
-    e2err_RICSubscriptionRequestAllocactionRanParameterValueValueBitSFail,
-    e2err_RICSubscriptionRequestAllocactionRanParameterValueValueOctSFail,
-    e2err_RICSubscriptionRequestAllocactionRanParameterValueValuePrtsSFail,
-    e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValueBitSFail,
-    e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValueOctSFail,
-    e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValuePrtsSFail,
-    e2err_RICSubscriptionRequestAllocactionDefinitionX2Format1Fail,
-    e2err_RICSubscriptionRequestAllocactionDefinitionX2Format2Fail,
-    e2err_RICSubscriptionRequestAllocactionDefinitionNRTFormat1Fail,
     e2err_RICSubscriptionRequestAllocRICactionDefinitionBufFail,
     e2err_RICSubscriptionRequestAllocRICactionDefinitionFail,
-    e2err_RICSubscriptionRequestRICActionDefinitionEmpty,
-    e2err_RICSubscriptionRequestRICActionDefinitionEmptyE2_E2SM_gNB_X2_actionDefinition,
-    e2err_RICSubscriptionRequestRICActionDefinitionEmptyE2_E2SM_gNB_NRT_actionDefinition,
-    e2err_RICSubscriptionRequestActionParameterItemFail,
-    e2err_RICActionDefinitionChoicePackFail_1,
-    e2err_RICActionDefinitionChoicePackFail_2,
-    e2err_RICSubscriptionRequestAllocE2_RANueGroupDef_ItemFail,
-    e2err_RICSubscriptionRequestAllocRANParameter_ItemFail,
-    e2err_RICSubscriptionRequestRanranUeGroupDefItemParameterValueEmptyFail,
-    e2err_RICSubscriptionRequestRanParameterItemRanParameterValueEmptyFail,
-    e2err_RICSubscriptionRequestAllocActionDefinitionFail,
-    e2err_RICSubscriptionRequestAllocNRTRANParameter_ItemFail,
-    e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValueBitSFail,
-    e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValueOctSFail,
-    e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValuePrtsSFail,
-    e2err_RICSubscriptionRequestRanParameterItemNRTRanParameterValueEmptyFail,
-    e2err_RICSubscriptionRequestAsn_set_addE2_ActionParameter_ItemFail,
-    e2err_RICSubscriptionRequestAsn_set_addRANueGroupDef_ItemFail,
-    e2err_RICSubscriptionRequestAsn_set_addE2_RANParameter_ItemFail,
-    e2err_RICSubscriptionRequestAsn_set_addE2_NRTRANParameter_ItemFail,
-    e2err_RICActionDefinitionChoiceWMOREFail,
-    e2err_RICActionDefinitionChoiceDecodeFAIL,
-    e2err_RICActionDefinitionChoiceDecodeDefaultFail,
-    e2err_RICNRTActionDefinitionChoiceWMOREFail,
-    e2err_RICNRTActionDefinitionChoiceDecodeFAIL,
-    e2err_RICNRTActionDefinitionChoiceDecodeDefaultFail,
-    e2err_RICActionDefinitionChoiceEmptyFAIL,
-    e2err_RICNRTEventTriggerDefinitionDecodeWMOREFail,
-    e2err_RICNRTEventTriggerDefinitionDecodeFAIL,
-    e2err_RICNRTEventTriggerDefinitionDecodeDefaultFail,
-    e2err_RICEventTriggerDefinitionEmptyDecodeDefaultFail,
-    e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_X2_ActionDefinitionChoiceFail,
-    e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_NRT_ActionDefinitionFormat1Fail,
-    e2err_RICSubscriptionRequestNRTRanParameterItemRanParameterValueEmptyFail,
-    e2err_RICSubscriptionRequestNRTAllocActionDefinitionFail,
-    e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_NRT_ActionDefinitionFail,
     e2err_RICSubscriptionRequestAllocRICsubsequentActionFail,
     e2err_RICSubscriptionRequestAllocRICsubscriptionRequest_IEsFail,
     e2err_RICSubscriptionRequestEncodeFail,
     e2err_RICSubscriptionRequestAllocE2AP_PDUFail,
-    e2err_RICEventTriggerDefinitionIEValueFail_1,
-    e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDpLMN_IdentityBufFail,
-    e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDmacro_eNB_IDBufFail,
-    e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDhome_eNB_IDBufFail,
-    e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDshort_Macro_eNB_IDBufFail,
-    e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDlong_Macro_eNB_IDBufFail,
-    e2err_RICEventTriggerDefinitionIEValueFail_2,
-    e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_gNB_IDpLMN_IdentityBufFail,
-    e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_gNB_IDgNB_IDBufFail,
-    e2err_RICEventTriggerDefinitionIEValueFail_3,
-    e2err_RICEventTriggerDefinitionIEValueFail_4,
-    e2err_RICEventTriggerDefinitionPackFail_1,
-    e2err_RICEventTriggerDefinitionPackFail_2,
-    e2err_RICENRTventTriggerDefinitionPackFail_1,
-    e2err_RICNRTEventTriggerDefinitionPackFail_2,
-    e2err_RICEventTriggerDefinitionAllocE2SM_gNB_X2_eventTriggerDefinitionFail,
-    e2err_RICEventTriggerDefinitionAllocE2SM_gNB_NRT_eventTriggerDefinitionFail,
-    e2err_RICEventTriggerDefinitionAllocEventTriggerDefinitionEmptyFail,
     e2err_RICSubscriptionResponseAllocRICrequestIDFail,
     e2err_RICSubscriptionResponseAllocRANfunctionIDFail,
     e2err_RICSubscriptionResponseAllocRICaction_Admitted_ItemIEsFail,
@@ -509,7 +272,6 @@
     e2err_RICSubscriptionFailureAllocRICActionAdmittedListFail,
     e2err_RICSubscriptionFailureEncodeFail,
     e2err_RICSubscriptionFailureAllocE2AP_PDUFail,
-    e2err_E2SM_gNB_X2_indicationMessageAllocE2AP_PDUFail,
     e2err_RICSubscriptionDeleteRequestAllocRICrequestIDFail,
     e2err_RICSubscriptionDeleteRequestAllocRANfunctionIDFail,
     e2err_RICSubscriptionDeleteRequestEncodeFail,
@@ -526,22 +288,12 @@
     e2err_RICsubscriptionRequestRICrequestIDMissing,
     e2err_RICsubscriptionRequestRANfunctionIDMissing,
     e2err_RICsubscriptionRequestICsubscriptionMissing,
-    e2err_RICEventTriggerDefinitionIEValueFail_5,
-    e2err_RICEventTriggerDefinitionIEValueFail_6,
-    e2err_RICEventTriggerDefinitionIEValueFail_7,
-    e2err_RICEventTriggerDefinitionIEValueFail_8,
-    e2err_RICEventTriggerDefinitionDecodeWMOREFail,
-    e2err_RICEventTriggerDefinitionDecodeFAIL,
-    e2err_RICEventTriggerDefinitionDecodeDefaultFail,
     e2err_RICsubscriptionResponseRICrequestIDMissing,
     e2err_RICsubscriptionResponseRANfunctionIDMissing,
     e2err_RICsubscriptionResponseRICaction_Admitted_ListMissing,
     e2err_RICsubscriptionFailureRICrequestIDMissing,
     e2err_RICsubscriptionFailureRANfunctionIDMissing,
     e2err_RICsubscriptionFailureRICaction_NotAdmitted_ListMissing,
-    e2err_RICEventTriggerDefinitionIEValueFail_9,
-    e2err_RICEventTriggerDefinitionIEValueFail_10,
-    e2err_RICEventTriggerDefinitionIEValueFail_11,
     e2err_RICsubscriptionDeleteRequestRICrequestIDMissing,
     e2err_RICsubscriptionDeleteRequestRANfunctionIDMissing,
     e2err_RICsubscriptionDeleteResponseRICrequestIDMissing,
@@ -557,78 +309,12 @@
     "e2err_RICSubscriptionRequestAllocRANfunctionIDFail",
     "e2err_RICSubscriptionRequestAllocRICeventTriggerDefinitionBufFail",
     "e2err_RICSubscriptionRequestAllocRICaction_ToBeSetup_ItemIEsFail",
-    "e2err_RICSubscriptionRequestAllocactionParameterValueValueBitSFail",
-    "e2err_RICSubscriptionRequestAllocactionParameterValueValueOctSFail",
-    "e2err_RICSubscriptionRequestAllocactionParameterValueValuePrtsSFail",
-    "e2err_RICSubscriptionRequestAllocactionRanParameterValueValueBitSFail",
-    "e2err_RICSubscriptionRequestAllocactionRanParameterValueValueOctSFail",
-    "e2err_RICSubscriptionRequestAllocactionRanParameterValueValuePrtsSFail",
-    "e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValueBitSFail",
-    "e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValueOctSFail",
-    "e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValuePrtsSFail",
-    "e2err_RICSubscriptionRequestAllocactionDefinitionX2Format1Fail",
-    "e2err_RICSubscriptionRequestAllocactionDefinitionX2Format2Fail",
-    "e2err_RICSubscriptionRequestAllocactionDefinitionNRTFormat1Fail",
     "e2err_RICSubscriptionRequestAllocRICactionDefinitionBufFail",
     "e2err_RICSubscriptionRequestAllocRICactionDefinitionFail",
-    "e2err_RICSubscriptionRequestRICActionDefinitionEmpty",
-    "e2err_RICSubscriptionRequestRICActionDefinitionEmptyE2_E2SM_gNB_X2_actionDefinition",
-    "e2err_RICSubscriptionRequestRICActionDefinitionEmptyE2_E2SM_gNB_NRT_actionDefinition",
-    "e2err_RICSubscriptionRequestActionParameterItemFail",
-    "e2err_RICActionDefinitionChoicePackFail_1",
-    "e2err_RICActionDefinitionChoicePackFail_2",
-    "e2err_RICSubscriptionRequestAllocE2_RANueGroupDef_ItemFail",
-    "e2err_RICSubscriptionRequestAllocRANParameter_ItemFail",
-    "e2err_RICSubscriptionRequestRanranUeGroupDefItemParameterValueEmptyFail",
-    "e2err_RICSubscriptionRequestRanParameterItemRanParameterValueEmptyFail",
-    "e2err_RICSubscriptionRequestAllocActionDefinitionFail",
-    "e2err_RICSubscriptionRequestAllocNRTRANParameter_ItemFail",
-    "e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValueBitSFail",
-    "e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValueOctSFail",
-    "e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValuePrtsSFail",
-    "e2err_RICSubscriptionRequestRanParameterItemNRTRanParameterValueEmptyFail",
-    "e2err_RICSubscriptionRequestAsn_set_addE2_ActionParameter_ItemFail",
-    "e2err_RICSubscriptionRequestAsn_set_addRANueGroupDef_ItemFail",
-    "e2err_RICSubscriptionRequestAsn_set_addE2_RANParameter_ItemFail",
-    "e2err_RICSubscriptionRequestAsn_set_addE2_NRTRANParameter_ItemFail",
-    "e2err_RICActionDefinitionChoiceWMOREFail",
-    "e2err_RICActionDefinitionChoiceDecodeFAIL",
-    "e2err_RICActionDefinitionChoiceDecodeDefaultFail",
-    "e2err_RICNRTActionDefinitionChoiceWMOREFail",
-    "e2err_RICNRTActionDefinitionChoiceDecodeFAIL",
-    "e2err_RICNRTActionDefinitionChoiceDecodeDefaultFail",
-    "e2err_RICActionDefinitionChoiceEmptyFAIL",
-    "e2err_RICNRTEventTriggerDefinitionDecodeWMOREFail",
-    "e2err_RICNRTEventTriggerDefinitionDecodeFAIL",
-    "e2err_RICNRTEventTriggerDefinitionDecodeDefaultFail",
-    "e2err_RICEventTriggerDefinitionEmptyDecodeDefaultFail",
-    "e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_X2_ActionDefinitionChoiceFail",
-    "e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_NRT_ActionDefinitionFormat1Fail",
-    "e2err_RICSubscriptionRequestNRTRanParameterItemRanParameterValueEmptyFail",
-    "e2err_RICSubscriptionRequestNRTAllocActionDefinitionFail",
-    "e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_NRT_ActionDefinitionFail",
     "e2err_RICSubscriptionRequestAllocRICsubsequentActionFail",
     "e2err_RICSubscriptionRequestAllocRICsubscriptionRequest_IEsFail",
     "e2err_RICSubscriptionRequestEncodeFail",
     "e2err_RICSubscriptionRequestAllocE2AP_PDUFail",
-    "e2err_RICEventTriggerDefinitionIEValueFail_1",
-    "e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDpLMN_IdentityBufFail",
-    "e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDmacro_eNB_IDBufFail",
-    "e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDhome_eNB_IDBufFail",
-    "e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDshort_Macro_eNB_IDBufFail",
-    "e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDlong_Macro_eNB_IDBufFail",
-    "e2err_RICEventTriggerDefinitionIEValueFail_2",
-    "e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_gNB_IDpLMN_IdentityBufFail",
-    "e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_gNB_IDgNB_IDBufFail",
-    "e2err_RICEventTriggerDefinitionIEValueFail_3",
-    "e2err_RICEventTriggerDefinitionIEValueFail_4",
-    "e2err_RICEventTriggerDefinitionPackFail_1",
-    "e2err_RICEventTriggerDefinitionPackFail_2",
-    "e2err_RICENRTventTriggerDefinitionPackFail_1",
-    "e2err_RICNRTEventTriggerDefinitionPackFail_2",
-    "e2err_RICEventTriggerDefinitionAllocE2SM_gNB_X2_eventTriggerDefinitionFail",
-    "e2err_RICEventTriggerDefinitionAllocE2SM_gNB_NRT_eventTriggerDefinitionFail",
-    "e2err_RICEventTriggerDefinitionAllocEventTriggerDefinitionEmptyFail",
     "e2err_RICSubscriptionResponseAllocRICrequestIDFail",
     "e2err_RICSubscriptionResponseAllocRANfunctionIDFail",
     "e2err_RICSubscriptionResponseAllocRICaction_Admitted_ItemIEsFail",
@@ -642,7 +328,6 @@
     "e2err_RICSubscriptionFailureAllocRICActionAdmittedListFail",
     "e2err_RICSubscriptionFailureEncodeFail",
     "e2err_RICSubscriptionFailureAllocE2AP_PDUFail",
-    "e2err_E2SM_gNB_X2_indicationMessageAllocE2AP_PDUFail",
     "e2err_RICSubscriptionDeleteRequestAllocRICrequestIDFail",
     "e2err_RICSubscriptionDeleteRequestAllocRANfunctionIDFail",
     "e2err_RICSubscriptionDeleteRequestEncodeFail",
@@ -659,22 +344,12 @@
     "e2err_RICsubscriptionRequestRICrequestIDMissing",
     "e2err_RICsubscriptionRequestRANfunctionIDMissing",
     "e2err_RICsubscriptionRequestICsubscriptionMissing",
-    "e2err_RICEventTriggerDefinitionIEValueFail_5",
-    "e2err_RICEventTriggerDefinitionIEValueFail_6",
-    "e2err_RICEventTriggerDefinitionIEValueFail_7",
-    "e2err_RICEventTriggerDefinitionIEValueFail_8",
-    "e2err_RICEventTriggerDefinitionDecodeWMOREFail",
-    "e2err_RICEventTriggerDefinitionDecodeFAIL",
-    "e2err_RICEventTriggerDefinitionDecodeDefaultFail",
     "e2err_RICsubscriptionResponseRICrequestIDMissing",
     "e2err_RICsubscriptionResponseRANfunctionIDMissing",
     "e2err_RICsubscriptionResponseRICaction_Admitted_ListMissing",
     "e2err_RICsubscriptionFailureRICrequestIDMissing",
     "e2err_RICsubscriptionFailureRANfunctionIDMissing",
     "e2err_RICsubscriptionFailureRICaction_NotAdmitted_ListMissing",
-    "e2err_RICEventTriggerDefinitionIEValueFail_9",
-    "e2err_RICEventTriggerDefinitionIEValueFail_10",
-    "e2err_RICEventTriggerDefinitionIEValueFail_11",
     "e2err_RICsubscriptionDeleteRequestRICrequestIDMissing",
     "e2err_RICsubscriptionDeleteRequestRANfunctionIDMissing",
     "e2err_RICsubscriptionDeleteResponseRICrequestIDMissing",
@@ -759,12 +434,6 @@
 typedef void* e2ap_pdu_ptr_t;
 
 uint64_t packRICSubscriptionRequest(size_t*, byte*, char*,RICSubscriptionRequest_t*);
-uint64_t packRICEventTriggerDefinition(char*,RICEventTriggerDefinition_t*);
-uint64_t packRICActionDefinition(char*, RICActionDefinitionChoice_t*);
-uint64_t packRICEventTriggerDefinitionX2Format(char* pLogBuffer, RICEventTriggerDefinition_t*);
-uint64_t packRICEventTriggerDefinitionNRTFormat(char* pLogBuffer, RICEventTriggerDefinition_t*);
-uint64_t packActionDefinitionX2Format(char*, RICActionDefinitionChoice_t*);
-uint64_t packActionDefinitionNRTFormat(char*, RICActionDefinitionChoice_t*);
 uint64_t packRICSubscriptionResponse(size_t*, byte*, char*,RICSubscriptionResponse_t*);
 uint64_t packRICSubscriptionFailure(size_t*, byte*, char*,RICSubscriptionFailure_t*);
 uint64_t packRICSubscriptionDeleteRequest(size_t*, byte*, char*,RICSubscriptionDeleteRequest_t*);
@@ -772,29 +441,13 @@
 uint64_t packRICSubscriptionDeleteFailure(size_t*, byte*, char*,RICSubscriptionDeleteFailure_t*);
 
 e2ap_pdu_ptr_t* unpackE2AP_pdu(const size_t, const byte*, char*, E2MessageInfo_t*);
-uint64_t getRICSubscriptionRequestData(mem_track_hdr_t *, e2ap_pdu_ptr_t*, RICSubscriptionRequest_t*);
-uint64_t getRICEventTriggerDefinitionData(RICEventTriggerDefinition_t*);
-uint64_t getRICEventTriggerDefinitionDataX2Format(RICEventTriggerDefinition_t*);
-uint64_t getRICEventTriggerDefinitionDataNRTFormat(RICEventTriggerDefinition_t*);
-uint64_t getRICActionDefinitionData(mem_track_hdr_t *, RICActionDefinitionChoice_t*);
-uint64_t getRICActionDefinitionDataX2Format(mem_track_hdr_t*, RICActionDefinitionChoice_t*);
-uint64_t getRICActionDefinitionDataNRTFormat(mem_track_hdr_t*, RICActionDefinitionChoice_t*);
+uint64_t getRICSubscriptionRequestData(e2ap_pdu_ptr_t*, RICSubscriptionRequest_t*);
 uint64_t getRICSubscriptionResponseData(e2ap_pdu_ptr_t*, RICSubscriptionResponse_t*);
 uint64_t getRICSubscriptionFailureData(e2ap_pdu_ptr_t*, RICSubscriptionFailure_t*);
 uint64_t getRICSubscriptionDeleteRequestData(e2ap_pdu_ptr_t*, RICSubscriptionDeleteRequest_t*);
 uint64_t getRICSubscriptionDeleteResponseData(e2ap_pdu_ptr_t*, RICSubscriptionDeleteResponse_t*);
 uint64_t getRICSubscriptionDeleteFailureData(e2ap_pdu_ptr_t*, RICSubscriptionDeleteFailure_t*);
 
-void* allocDynMem(mem_track_hdr_t*, size_t);
-bool addOctetString(mem_track_hdr_t *, DynOctetString_t*, uint64_t, void*);
-bool addBitString(mem_track_hdr_t *, DynBitString_t*, uint64_t, void*, uint8_t);
-
-uint64_t allocActionDefinitionX2Format1(mem_track_hdr_t*, E2SMgNBX2actionDefinition_t**);
-uint64_t allocActionDefinitionX2Format2(mem_track_hdr_t*, E2SMgNBX2ActionDefinitionFormat2_t**);
-uint64_t allocActionDefinitionNRTFormat1(mem_track_hdr_t*, E2SMgNBNRTActionDefinitionFormat1_t**);
-
-uint64_t allocateOctetStringBuffer(DynOctetString_t*, uint64_t);
-uint64_t allocateBitStringBuffer(mem_track_hdr_t *, DynBitString_t*, uint64_t);
 
 #if DEBUG
 bool TestRICSubscriptionRequest();
diff --git a/e2ap/libe2ap_wrapper/memtrack.h b/e2ap/libe2ap_wrapper/memtrack.h
deleted file mode 100644
index 0ff1126..0000000
--- a/e2ap/libe2ap_wrapper/memtrack.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-==================================================================================
-  Copyright (c) 2019 AT&T Intellectual Property.
-  Copyright (c) 2019 Nokia
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================================
-*/
-
-#ifndef __MEMTRACK_H__
-#define __MEMTRACK_H__
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	
-/*
- *
- */
-typedef struct mem_track_s{
-    struct mem_track_s *next;
-    size_t  sz;
-    unsigned char ptr[];
-}mem_track_t;
-
-
-/*
- *
- */
-typedef struct mem_track_hdr_s{
-    struct mem_track_s *next;
-}mem_track_hdr_t;
-
-#define MEM_TRACK_HDR_INIT {0}
-
-
-/*
- *
- */
-void mem_track_init(mem_track_hdr_t *curr);
-
-void* mem_track_alloc(mem_track_hdr_t *curr, size_t sz);
-
-void mem_track_free(mem_track_hdr_t *curr);
-
-
-/*
- *
- */
-#define MEM_TRACK_ALLOC(__hdr,__id) (__id*)mem_track_alloc(__hdr,sizeof(__id))
-
-#define MEM_TRACK_ALLOC_LIST(__hdr,__id,__n) (__id**)mem_track_alloc(__hdr,sizeof(__id)*__n)
-
-#define MEM_TRACK_ALLOC_PTR_LIST(__hdr,__id,__n) (__id**)mem_track_alloc(__hdr,sizeof(__id*)*__n)
-
-#define MEM_TRACK_ALLOC_BUFFER(__hdr,__id,__n) (__id*)mem_track_alloc(__hdr,sizeof(__id)*__n)
-
-#define MEM_TRACK_ALLOC_INIT(__val, __hdr,__id,__init) __id* __val=MEM_TRACK_ALLOC(__hdr,__id); *__val=(__id)__init
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif