diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB_AND_MME.HSS/enb.calisson.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB_AND_MME.HSS/enb.calisson.conf
deleted file mode 100755
index fc1b834abd3cdcd1414afe7867da2864d050666a..0000000000000000000000000000000000000000
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB_AND_MME.HSS/enb.calisson.conf
+++ /dev/null
@@ -1,141 +0,0 @@
-Active_eNBs = ( "eNB_Eurecom_0");
-
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-
-eNBs =
-(
- {
-    ////////// Identification parameters:
-    # real_time choice in {rtai, linux-kernel, emulation}
-    real_time       =  "linux-kernel";
-    eNB_ID          =  0xe00;
-    cell_type       =  "CELL_MACRO_ENB";
-    eNB_name        =  "eNB_Eurecom_0";
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  "1";
-    mobile_country_code =  "208";
-    mobile_network_code =  "92";
-    
-    
-    ////////// Physical parameters:
-    component_carriers = (
-                     {
-               frame_type                             = "FDD";  
-               tdd_config                             = 3;
-               tdd_config_s                           = 0;
-               prefix_type                            = "NORMAL";
-               eutra_band                             = 7;
-               downlink_frequency                     = 2660000000L;
-               uplink_frequency_offset                = -120000000;
-               Nid_cell                               = 0;
-               N_RB_DL                                = 25;
-               Nid_cell_mbsfn                         = 0;
-               nb_antennas_tx                         = 1;
-               nb_antennas_rx                         = 1; 
-               tx_gain                                = 20;
-               rx_gain                                = 20;
-               prach_root                             = 22;
-               prach_config_index                     = 3;
-               prach_high_speed                       = "DISABLE";
-               prach_zero_correlation                 = 0;
-               prach_freq_offset                      = 0;
-               pucch_delta_shift                      = 1;
-               pucch_nRB_CQI                          = 1;
-               pucch_nCS_AN                           = 0;
-               pucch_n1_AN                            = 32;
-               pdsch_referenceSignalPower             = -24;
-               pdsch_p_b                              = 0;
-               pusch_n_SB                             = 1; 
-               pusch_enable64QAM                      = "DISABLE";
-               pusch_hoppingMode                      = "interSubFrame";
-               pusch_hoppingOffset                    = 4;
-               pusch_groupHoppingEnabled              = "DISABLE";
-               pusch_groupAssignment                  = 0;
-               pusch_sequenceHoppingEnabled           = "DISABLE";
-               pusch_nDMRS1                           = 1;
-               phich_duration                         = "NORMAL";
-               phich_resource                         = "ONESIXTH";
-               srs_enable                             = "DISABLE";
-           /*  srs_BandwidthConfig                    =;
-               srs_SubframeConfig                     =;
-               srs_ackNackST                          =;
-               srs_MaxUpPts                           =;  */
-
-               pusch_p0_Nominal                       = -95; 
-               pusch_alpha                            = "AL08";
-               pucch_p0_Nominal                       = -117;
-               msg3_delta_Preamble                    = 6;
-               pucch_deltaF_Format1                   = "deltaF2";
-               pucch_deltaF_Format1b                  = "deltaF3";
-               pucch_deltaF_Format2                   = "deltaF0";
-               pucch_deltaF_Format2a                  = "deltaF0";
-               pucch_deltaF_Format2b                  = "deltaF0";
-    
-               rach_numberOfRA_Preambles              = 52;
-               rach_preamblesGroupAConfig             = "DISABLE";
-/*
-               rach_sizeOfRA_PreamblesGroupA          = ;
-               rach_messageSizeGroupA                 = ;
-               rach_messagePowerOffsetGroupB          = ; 
-*/
-               rach_powerRampingStep                  = 2;
-               rach_preambleInitialReceivedTargetPower= -104;
-               rach_preambleTransMax                  = 6;
-               rach_raResponseWindowSize              = 10;
-               rach_macContentionResolutionTimer      = 48;
-               rach_maxHARQ_Msg3Tx                    = 4;
-
-               pcch_default_PagingCycle               = 128;
-               pcch_nB                                = "oneT";
-               bcch_modificationPeriodCoeff           = 2;
-               ue_TimersAndConstants_t300             = 1000;
-               ue_TimersAndConstants_t301             = 1000;
-               ue_TimersAndConstants_t310             = 1000;
-               ue_TimersAndConstants_t311             = 10000;
-               ue_TimersAndConstants_n310             = 20;
-               ue_TimersAndConstants_n311             = 1;
-             }
-             );
-
-
-    #mme_ip_address      = ( { ipv4       = "192.168.13.175"; # 175 for MME CENTOS 178 FOR MME EURECOM
-    mme_ip_address      = ( { ipv4       = "127.0.0.1";
-                              ipv6       = "2192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-                          
-    NETWORK_INTERFACES : 
-    {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "lo";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "127.0.0.1/24";
-
-        ENB_INTERFACE_NAME_FOR_S1U               = "lo";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "127.0.0.1/24";
-        ENB_PORT_FOR_S1U                         = 2252; # Spec 2152
-    };
-    
-    # available options for level:   error, warn, notice, info, debug, trace
-    # available options for verbosity: none, low, medium, high, full
-    log_config : 
-    {
-        global_log_level                      ="info"; 
-        global_log_verbosity                  ="medium";
-        hw_log_level                          ="info"; 
-        hw_log_verbosity                      ="medium";
-        phy_log_level                         ="info"; 
-        phy_log_verbosity                     ="medium";
-        mac_log_level                         ="info"; 
-        mac_log_verbosity                     ="high";
-        rlc_log_level                         ="info"; 
-        rlc_log_verbosity                     ="medium";
-        pdcp_log_level                        ="info"; 
-        pdcp_log_verbosity                    ="medium";
-        rrc_log_level                         ="info"; 
-        rrc_log_verbosity                     ="medium";
-    };
-  }
-);
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB_AND_MME.HSS/epc.mme0.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB_AND_MME.HSS/epc.mme0.conf
deleted file mode 100755
index 349b813f78571093a2becf2ac7ddad9110238402..0000000000000000000000000000000000000000
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT_ENB_AND_MME.HSS/epc.mme0.conf
+++ /dev/null
@@ -1,213 +0,0 @@
-#             INTERNET GW 192.168.12.100      
-#                                  |
-#                                  |
-#                 192.168.12.17/24 | 
-# +-----------+----------------+---+--+---------------------------------------+
-# | ROUTER    |                | eth1 |                                       |
-# +-----------+                +---+--+                                       |
-# |  "yang"                        |                                          |
-# |                                |                                          |
-# |                          +-----+------+                                   |
-# |                          |MASQUERADING|                                   | 192.168.13.17
-# |                          +-----+------+                                   +----+
-# |                                |                                          |eth2+--x disconnected
-# |                                |                                          +----+
-# |                                |                                          |
-# |                                |                                          |
-# |                                |                                          |
-# |                            +---+--+                                       |
-# |                            | eth3 |                                       |
-# +----------------------------+---+--+---------------------------------------+
-#                192.168.14.17/24  |
-#                                  |
-#                                  |                            x disconnected
-#                192.168.14.175/24 |           192.168.12.175/24|
-# +-----------+----------------+---+--+---------------------+---+--+----------+
-# | COMPUTER 2|                | eth2 |                     | eth0 |          |
-# +-----------+                +----+-+                     +------+          |
-# |                                 |192.168.14.177   +-----------+           |
-# |                                 |          +------+           |           |
-# |                                 +----------+ eth1 |           |           |
-# |                                            +------+    HSS    |           |
-# |                                 +----------+ eth0 |   (VM)    |           |
-# |                                 |          +------+           |           |
-# |                                 |192.168.13.177   |           |           |
-# |                                 |                 +-----------+           |
-# |                                 |                                         |
-# |                                 |                                         |
-# |                                 | 'HOST_BRIDGED_IF_NAME'                  |
-# |                            +----+-+                                       |
-# |                            | eth1 |                                       |
-# +----------------------------+---+--+---------------------------------------+
-#                    192.168.13.175|
-#                                  |
-#                                  |
-#                    192.168.13.82 |
-# +-----------------+----------+---+--+---------------------------------------+
-# |nearly all in one|          | eth0 |                                       |
-# +-----------------+          +----+-+                                       |
-# |  "calisson"                     |                                         |
-# |                                 +---------------+                         |
-# |                                                 |                         |
-# |                                                 |                         |
-# |                                                 | S6A                     |
-# |   +---------------+                         +---+-------------+           |
-# |   |    eNB        | S1-C            S1-C    |     MME         |           |
-# |   |               +-----------+ +-----------+     S+P/GW      |           |
-# |   |               |           | |           |     (VM)        |           |
-# |   |               |           | |           |                 |           |
-# |   |               | S1-U      | |      S1-U |                 |           |
-# |   |               +---------+ | | +---------+                 |           |
-# |   |               |         | | | |         |                 |           |
-# |   +---------------+         | | | |         +-----------------+           |
-# |                             | | | |                                       |
-# |                             | | | |                                       |
-# |                             | | | |                                       |
-# |                             | | | |                                       |
-# |                             | | | |                                       |
-# |                             | | | |                                       |
-# |                            ++-+-+-++                                      |
-# |                            | eth1  |                                      |
-# +----------------------------+---+---+--------------------------------------+
-#             internet via router  | 192.168.12.82
-MME : 
-{
-
-    GNU_DEBUGGER                   = "no";
-    REALM                          = "eur";
-    # Define the limits of the system in terms of served eNB and served UE.
-    # When the limits will be reached, overload procedure will take place.
-    MAXENB                         = 10;
-    MAXUE                          = 100;
-    RELATIVE_CAPACITY              = 10;
-    # Display statistics about whole system (expressed in seconds)
-    MME_STATISTIC_TIMER            = 10;
-    EMERGENCY_ATTACH_SUPPORTED     = "no";
-    UNAUTHENTICATED_IMSI_SUPPORTED = "no";
-    # VERBOSITY: none, info, annoying
-    VERBOSITY                      = "none";
-    
-    
-    IP_CAPABILITY = "IPV4V6";
-    
-    
-    INTERTASK_INTERFACE :
-    {
-        # max queue size per task
-        ITTI_QUEUE_SIZE            = 2000000;
-    };
-
-    S6A :
-    {
-        # pwd=$OPENAIR_CN/objs
-        S6A_CONF                   = "./UTILS/CONF/s6a.conf";
-    };
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS = 32;
-        SCTP_OUTSTREAMS = 32;
-    };
-
-    # ------- S1AP definitions
-    S1AP : 
-    {
-        # outcome drop timer value (seconds)
-        S1AP_OUTCOME_TIMER = 10;
-        S1AP_PORT          = 36412;
-    };
-
-    # ------- MME served GUMMEI
-    GUMMEI :
-    {
-        # MME code DEFAULT = 0
-        # size = 8 bits
-        # maximum of 256 values, comma separated
-        MME_CODE = [ 29, 30 , 31, 32, 33, 34, 35, 36, 56 , 1 , 8 ];
-
-        # MME GROUP ID DEFAULT = 0
-        # size = 16 bits
-        # maximum of 65535 values, comma separated
-        MME_GID = [ 3 , 4 , 5 , 30 , 8 , 9 , 50021 ];
-
-        # TA (mcc.mnc:tracking area code) DEFAULT = 208.34:0
-        # max values = 999.999:65535
-        # maximum of 32 values, comma separated
-        PLMN = ( 
-             {MCC="208" ; MNC="92";  TAC = "1"; },
-             {MCC="208" ; MNC="10";  TAC = "1"; },
-             {MCC="209" ; MNC="130"; TAC = "4"; },
-             {MCC="209" ; MNC="012"; TAC = "2"; },
-             {MCC="208" ; MNC="35";  TAC = "8"; }
-        );
-    };
-    
-    NAS :
-    {
-        # 3GPP TS 33.401 section 7.2.4.3 Procedures for NAS algorithm selection
-        # decreasing preference goes from left to right
-        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA2" , "EIA1" , "EIA0" ];
-        ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
-    };
-    
-    NETWORK_INTERFACES : 
-    {
-        MME_INTERFACE_NAME_FOR_S1_MME         = "lo";
-        MME_IPV4_ADDRESS_FOR_S1_MME           = "127.0.0.1/24";
-
-        MME_INTERFACE_NAME_FOR_S11_MME        = "none";
-        MME_IPV4_ADDRESS_FOR_S11_MME          = "0.0.0.0/24";
-    };
-};
-
-S-GW : 
-{
-    NETWORK_INTERFACES : 
-    {
-        SGW_INTERFACE_NAME_FOR_S11              = "none";
-        SGW_IPV4_ADDRESS_FOR_S11                = "0.0.0.0/24";
-
-        SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP    = "lo";
-        SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP      = "127.0.0.1/24";
-        SGW_IPV4_PORT_FOR_S1U_S12_S4_UP         =  2152; # SPEC 2152
-
-        SGW_INTERFACE_NAME_FOR_S5_S8_UP         = "none";
-        SGW_IPV4_ADDRESS_FOR_S5_S8_UP           = "0.0.0.0/24";
-    };
-};
-
-P-GW = 
-{
-    NETWORK_INTERFACES : 
-    {
-        PGW_INTERFACE_NAME_FOR_S5_S8          = "none";
-        PGW_IPV4_ADDRESS_FOR_S5_S8            = "0.0.0.0/24";
-
-        PGW_INTERFACE_NAME_FOR_SGI            = "eth0";
-        PGW_IPV4_ADDRESS_FOR_SGI              = "192.168.13.82/24";
-    };
-    
-    IP_ADDRESS_POOL :
-    {
-        IPV4_LIST = (
-                      "192.168.2.60",
-                      "192.168.88.0/24",
-                      "192.168.90.0/24"
-                    );
-        IPV6_LIST = (
-                      "2014:02:26::0/120"
-                    );
-    };
-};
-
-HSS = 
-{
-    NETWORK_INTERFACES : 
-    {
-        HSS_INTERFACE_NAME_FOR_S6A          = "none";
-        HSS_IPV4_ADDRESS_FOR_S6A            = "192.168.13.175/24";
-    };
-};
-