diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf
index d8d96e83b2..8a51cfdc57 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf
@@ -15,12 +15,6 @@ MME :
     VERBOSITY                      = "none";
     
     
-    DEFAULT_APN   = "www.eurecom.fr";
-    EMERGENCY_APN = "www.eurecom_sos.fr";
-    KASME         = "CAFECAFECAFECAFECAFECAFECAFECAFE";
-    AUTH_RAND     = ( 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04 );
-    AUTH_AUTN     = ( 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x05, 0x04, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00 );
-    AUTH_XRES     = ( 0x67, 0x70, 0x3a, 0x31, 0xf2, 0x2a, 0x2d, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 );
     IP_CAPABILITY = "IPV4V6";
     
     
@@ -76,6 +70,14 @@ MME :
         );
     };
     
+    NAS :
+    {
+        # 3GPP TS 33.401 section 7.2.4.3 Procedures for NAS algorithm selection
+        # TODO
+        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA2" , "EIA1" ];
+        ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA2" , "EEA1" ];
+    };
+    
     NETWORK_INTERFACES : 
     {
         MME_INTERFACE_NAME_FOR_S1_MME         = "eth0";
@@ -123,11 +125,6 @@ P-GW =
                       "2014:02:26::0/120"
                     );
     };
-    
-    APN :
-    {
-    
-    }
 };