diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-enb-ovs.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-enb-ovs.bash
deleted file mode 100755
index d64f605757ce999a8c66db0db4bf2e8fd7d3a295..0000000000000000000000000000000000000000
--- a/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-enb-ovs.bash
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/bash
-# Author Lionel GAUTHIER 01/20/2014
-#
-# This script start ENB+UE (all in one executable, on one host) with openvswitch setting
-# MME+SP-GW executable have to be launched on the same host by your own (start_lte-epc-ovs.bash).
-#
-#                                                                           hss.eur
-#                                                                             |
-#        +-----------+          +------+              +-----------+           v   +----------+
-#        |  eNB      +------+   |  ovs | VLAN 1+------+    MME    +----+      +---+   HSS    |
-#        |           |cpenb0+------------------+cpmme0|           |    +------+   |          |
-#        |           +------+   |bridge|       +------+           +----+      +---+          |
-#        |           |upenb0+-------+  |              |           |               +----------+
-#        +-----------+------+   |   |  |              +-----------+
-#                               +---|--+                    |                   router.eur
-#                                   |                 +-----------+              |   +--------------+
-#                                   |                 |  S+P-GW   |              v   |   ROUTER     |
-#                                   |  VLAN2   +------+           +-------+     +----+              +----+
-#                                   +----------+upsgw0|           |sgi    +-...-+    |              |    +---...Internet
-#                                              +------+           +-------+     +----+              +----+
-#                                                     |           |      11 VLANS    |              |
-#                                                     +-----------+   ids=[5..15]    +--------------+
-#
-###########################################################
-# Parameters
-###########################################################
-declare MAKE_LTE_ACCESS_STRATUM_TARGET="oaisim ENABLE_ITTI=1 USE_MME=R10 NAS=1 Rel10=1"
-declare MAKE_IP_DRIVER_TARGET="ue_ip.ko"
-declare IP_DRIVER_NAME="ue_ip"
-declare LTEIF="oip1"
-declare UE_IPv4="10.0.0.8"
-declare UE_IPv6="2001:1::8"
-declare UE_IPv6_CIDR=$UE_IPv6"/64"
-declare UE_IPv4_CIDR=$UE_IPv4"/24"
-
-
-###########################################################
-THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
-source $THIS_SCRIPT_PATH/utils.bash
-###########################################################
-test_command_install_package "gccxml"   "gccxml" "--force-yes"
-test_command_install_package "vconfig"  "vlan"
-test_command_install_package "iptables" "iptables"
-test_command_install_package "iperf"    "iperf"
-test_command_install_package "ip"       "iproute"
-test_command_install_script  "ovs-vsctl" "$OPENAIRCN_DIR/SCRIPTS/install_openvswitch1.9.0.bash"
-test_command_install_package "tunctl"  "uml-utilities"
-test_command_install_lib     "/usr/lib/libconfig.so"  "libconfig-dev"
-
-
-#######################################################
-# USIM, NVRAM files
-#######################################################
-if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data ]; then
-    make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS veryveryclean
-    make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS PROCESS=UE
-fi
-if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data ]; then
-    make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS veryveryclean
-    make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS PROCESS=UE
-fi
-if [ ! -f .ue.nvram ]; then
-    # generate .ue_emm.nvram .ue.nvram
-    $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data -g
-fi
-
-if [ ! -f .usim.nvram ]; then
-    # generate .usim.nvram
-    $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data -g
-fi
-
-##################################################
-# LAUNCH eNB + UE executable
-##################################################
-echo "Bringup UE interface"
-pkill oaisim
-bash_exec "rmmod $IP_DRIVER_NAME" > /dev/null 2>&1
-
-cecho "make $MAKE_IP_DRIVER_TARGET $MAKE_LTE_ACCESS_STRATUM_TARGET ....." $green
-#bash_exec "make --directory=$OPENAIR2_DIR $MAKE_IP_DRIVER_TARGET "
-make --directory=$OPENAIR2_DIR $MAKE_IP_DRIVER_TARGET || exit 1
-#bash_exec "make --directory=$OPENAIR_TARGETS/SIMU/USER $MAKE_LTE_ACCESS_STRATUM_TARGET "
-make --directory=$OPENAIR_TARGETS/SIMU/USER $MAKE_LTE_ACCESS_STRATUM_TARGET || exit 1
-
-bash_exec "insmod  $OPENAIR2_DIR/NETWORK_DRIVER/UE_IP/$IP_DRIVER_NAME.ko"
-
-bash_exec "ip route flush cache"
-
-bash_exec "ip link set $LTEIF up"
-sleep 1
-bash_exec "ip addr add dev $LTEIF $UE_IPv4_CIDR"
-bash_exec "ip addr add dev $LTEIF $UE_IPv6_CIDR"
-
-sleep 1
-
-bash_exec "sysctl -w net.ipv4.conf.all.log_martians=1"
-assert "  `sysctl -n net.ipv4.conf.all.log_martians` -eq 1" $LINENO
-
-echo "   Disabling reverse path filtering"
-bash_exec "sysctl -w net.ipv4.conf.all.rp_filter=0"
-assert "  `sysctl -n net.ipv4.conf.all.rp_filter` -eq 0" $LINENO
-
-
-bash_exec "ip route flush cache"
-
-# Check table 200 lte in /etc/iproute2/rt_tables
-fgrep lte /etc/iproute2/rt_tables
-if [ $? -ne 0 ]; then
-    echo "200 lte " >> /etc/iproute2/rt_tables
-fi
-ip rule add fwmark 5 table lte
-ip route add default dev $LTEIF table lte
-
-ITTI_LOG_FILE=/tmp/itti_enb.$HOSTNAME.log
-rotate_log_file $ITTI_LOG_FILE
-
-
-#######################################################
-# FIND CONFIG FILE
-#######################################################
-CONFIG_FILE=$THIS_SCRIPT_PATH/CONF/all.sfr.default_vswitch.conf
-SEARCHED_CONFIG_FILE=$THIS_SCRIPT_PATH/CONF/all.sfr."$HOSTNAME"_vswitch.conf
-if [ -f $SEARCHED_CONFIG_FILE ]; then
-    CONFIG_FILE=$SEARCHED_CONFIG_FILE
-    echo_warning "config file found is now $CONFIG_FILE"
-else
-    echo_warning "config file $SEARCHED_CONFIG_FILE for host $HOSTNAME not found, trying default: $CONFIG_FILE"
-    if [ -f $CONFIG_FILE ]; then
-        echo_success "Default config file found: $CONFIG_FILE"
-    else
-        echo_error "Default config file not found, exiting"
-        exit 1
-    fi
-fi
-
-gdb --args $OPENAIR_TARGETS/SIMU/USER/oaisim -a -u1 -l7 -K $ITTI_LOG_FILE --enb-conf $CONFIG_FILE
-
-
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-enb-vlan.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-enb-vlan.bash
deleted file mode 100755
index ab70790c736659bd42d95fdce8ec8b037d1bfeb6..0000000000000000000000000000000000000000
--- a/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-enb-vlan.bash
+++ /dev/null
@@ -1,170 +0,0 @@
-#!/bin/bash
-# Author Lionel GAUTHIER 02/03/2014
-#
-# This script start ENB+UE (all in one executable, on one host) with vlan setting
-# MME+SP-GW executable have to be launched on an other host by your own (start_lte-epc-vlan.bash).
-#
-#                                                                           hss.eur
-#                                                                             |
-#        +-----------+                                +-----------+           v   +----------+
-#        |  eNB      +------+            VLAN 1+------+    MME    +----+      +---+   HSS    |
-#        |           |ethx.1+------------------+ethy.1|           |    +------+   |          |
-#        |           +------+                  +------+           +----+      +---+          |
-#        |           |ethx.2+-------+                 |           |               +----------+
-#        |           +------+       |                 +-+-------+-+
-#        |           |              |                   | s11mme|    
-#        |           |              |                   +---+---+    
-#        |           |              |             (optional)|   VLAN 3
-#        +-----------+              |                   +---+---+    
-#                                   |                   | s11sgw|            router.eur
-#                                   |                 +-+-------+-+              |   +--------------+
-#                                   |                 |  S+P-GW   |              v   |   ROUTER     |
-#                                   |  VLAN2   +------+           +-------+     +----+              +----+
-#                                   +----------+ethy.2|           |sgi    +-...-+    |              |    +---...Internet
-#                                              +------+           +-------+     +----+              +----+
-#                                                     |           |      11 VLANS    |              |
-#                                                     +-----------+   ids=[5..15]    +--------------+
-#
-###########################################################
-# Parameters
-###########################################################
-declare MAKE_LTE_ACCESS_STRATUM_TARGET="DISABLE_XER_PRINT=1 ENABLE_ITTI=1 USE_MME=R10 NAS=1 Rel10=1"
-declare MAKE_IP_DRIVER_TARGET="ue_ip.ko"
-declare IP_DRIVER_NAME="ue_ip"
-declare LTEIF="oip1"
-declare UE_IPv4="10.0.0.8"
-declare UE_IPv6="2001:1::8"
-declare UE_IPv6_CIDR=$UE_IPv6"/64"
-declare UE_IPv4_CIDR=$UE_IPv4"/24"
-
-
-###########################################################
-THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
-source $THIS_SCRIPT_PATH/utils.bash
-###########################################################
-test_command_install_package "gccxml"   "gccxml" "--force-yes"
-test_command_install_package "vconfig"  "vlan"
-test_command_install_package "iptables" "iptables"
-test_command_install_package "iperf"    "iperf"
-test_command_install_package "ip"       "iproute"
-test_command_install_package "tunctl"  "uml-utilities"
-test_command_install_lib     "/usr/lib/libconfig.so"  "libconfig-dev"
-
-#######################################################
-# FIND CONFIG FILE
-#######################################################
-CONFIG_FILE=$THIS_SCRIPT_PATH/CONF/enb.sfr.default.vlan.conf
-SEARCHED_CONFIG_FILE=$THIS_SCRIPT_PATH/CONF/enb.sfr."$HOSTNAME".vlan.conf
-if [ -f $SEARCHED_CONFIG_FILE ]; then
-    CONFIG_FILE=$SEARCHED_CONFIG_FILE
-    echo_warning "config file found is now $CONFIG_FILE"
-else
-    echo_warning "config file $SEARCHED_CONFIG_FILE for host $HOSTNAME not found, trying default: $CONFIG_FILE"
-    if [ -f $CONFIG_FILE ]; then
-        echo_success "Default config file found: $CONFIG_FILE"
-    else
-        echo_error "Default config file not found, exiting"
-        exit 1
-    fi
-fi
-
-#######################################################
-# SOURCE CONFIG FILE
-#######################################################
-rm -f /tmp/source.txt
-VARIABLES="
-           ENB_INTERFACE_NAME_FOR_S1_MME\|\
-           ENB_IPV4_ADDRESS_FOR_S1_MME\|\
-           ENB_INTERFACE_NAME_FOR_S1U\|\
-           ENB_IPV4_ADDRESS_FOR_S1U"
-
-VARIABLES=$(echo $VARIABLES | sed -e 's/\\r//g')
-VARIABLES=$(echo $VARIABLES | tr -d ' ')
-cat $CONFIG_FILE | grep -w "$VARIABLES"| tr -d " " | tr -d ";" > /tmp/source.txt
-source /tmp/source.txt
-
-declare ENB_IPV4_NETMASK_FOR_S1_MME=$(       echo $ENB_IPV4_ADDRESS_FOR_S1_MME        | cut -f2 -d '/')
-declare ENB_IPV4_NETMASK_FOR_S1U=$(       echo $ENB_IPV4_ADDRESS_FOR_S1U        | cut -f2 -d '/')
-
-ENB_IPV4_ADDRESS_FOR_S1_MME=$(               echo $ENB_IPV4_ADDRESS_FOR_S1_MME        | cut -f1 -d '/')
-ENB_IPV4_ADDRESS_FOR_S1U=$(                  echo $ENB_IPV4_ADDRESS_FOR_S1U           | cut -f1 -d '/')
-
-
-#######################################################
-# USIM, NVRAM files
-#######################################################
-if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data ]; then
-    make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS veryveryclean
-    make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS PROCESS=UE
-fi
-if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data ]; then
-    make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS veryveryclean
-    make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS PROCESS=UE
-fi
-if [ ! -f .ue.nvram ]; then
-    # generate .ue_emm.nvram .ue.nvram
-    $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data -g
-fi
-
-if [ ! -f .usim.nvram ]; then
-    # generate .usim.nvram
-    $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data -g
-fi
-
-##################################################
-# NETWORK TOPOLOGY
-##################################################
-clean_enb_vlan_network
-build_enb_vlan_network
-test_enb_vlan_network
-
-##################################################
-# LAUNCH eNB + UE executable
-##################################################
-echo "Bringup UE interface"
-pkill oaisim
-bash_exec "rmmod $IP_DRIVER_NAME" > /dev/null 2>&1
-
-cecho "make $MAKE_IP_DRIVER_TARGET $MAKE_LTE_ACCESS_STRATUM_TARGET ....." $green
-#bash_exec "make --directory=$OPENAIR2_DIR $MAKE_IP_DRIVER_TARGET "
-make --directory=$OPENAIR2_DIR $MAKE_IP_DRIVER_TARGET || exit 1
-#bash_exec "make --directory=$OPENAIR_TARGETS/SIMU/USER $MAKE_LTE_ACCESS_STRATUM_TARGET "
-make --directory=$OPENAIR_TARGETS/SIMU/USER $MAKE_LTE_ACCESS_STRATUM_TARGET -j`grep -c ^processor /proc/cpuinfo ` || exit 1
-
-bash_exec "insmod  $OPENAIR2_DIR/NETWORK_DRIVER/UE_IP/$IP_DRIVER_NAME.ko"
-
-bash_exec "ip route flush cache"
-
-bash_exec "ip link set $LTEIF up"
-sleep 1
-#bash_exec "ip addr add dev $LTEIF $UE_IPv4_CIDR"
-#bash_exec "ip addr add dev $LTEIF $UE_IPv6_CIDR"
-
-sleep 1
-
-bash_exec "sysctl -w net.ipv4.conf.all.log_martians=1"
-assert "  `sysctl -n net.ipv4.conf.all.log_martians` -eq 1" $LINENO
-
-echo "   Disabling reverse path filtering"
-bash_exec "sysctl -w net.ipv4.conf.all.rp_filter=0"
-assert "  `sysctl -n net.ipv4.conf.all.rp_filter` -eq 0" $LINENO
-
-
-bash_exec "ip route flush cache"
-
-# Check table 200 lte in /etc/iproute2/rt_tables
-fgrep lte /etc/iproute2/rt_tables  > /dev/null 
-if [ $? -ne 0 ]; then
-    echo "200 lte " >> /etc/iproute2/rt_tables
-fi
-ip rule add fwmark 5 table lte
-ip route add default dev $LTEIF table lte
-
-ITTI_LOG_FILE=./itti_enb.$HOSTNAME.log
-rotate_log_file $ITTI_LOG_FILE
-
-nohup xterm -e $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/UserProcess &
-
-gdb --args $OPENAIR_TARGETS/SIMU/USER/oaisim -a -u1 -l7 -K $ITTI_LOG_FILE --enb-conf $CONFIG_FILE
-
-
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-epc-ovs.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-epc-ovs.bash
deleted file mode 100755
index 3ab0b173f5e34ea53b3768d93da81c6628337c59..0000000000000000000000000000000000000000
--- a/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-epc-ovs.bash
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/bin/bash
-# Author Lionel GAUTHIER 01/20/2014
-#
-# This script start MME+S/P-GW (all in one executable, on one host) with openvswitch setting
-# eNB executable have to be launched on the same host by your own (start_lte-enb-ovs.bash).
-#
-#                                                                           hss.eur
-#                                                                             |
-#        +-----------+          +------+              +-----------+           v   +----------+
-#        |  eNB      +------+   |  ovs | VLAN 1+------+    MME    +----+      +---+   HSS    |
-#        |           |cpenb0+------------------+cpmme0|           |    +------+   |          |
-#        |           +------+   |bridge|       +------+           +----+      +---+          |
-#        |           |upenb0+-------+  |              |           |               +----------+
-#        +-----------+------+   |   |  |              +-+-------+-+
-#                               |   |  +----------------| s11mme|---+
-#                               |   |                   +---+---+   |
-#                               |   |             (optional)|       |
-#                               |   |                   +---+---+   |
-#                               +---|------------------ | s11sgw|---+        router.eur
-#                                   |                 +-+-------+-+              |   +--------------+
-#                                   |                 |  S+P-GW   |              v   |   ROUTER     |
-#                                   |  VLAN2   +------+           +-------+     +----+              +----+
-#                                   +----------+upsgw0|           |sgi    +-...-+    |              |    +---...Internet
-#                                              +------+           +-------+     +----+              +----+
-#                                                     |           |      11 VLANS    |              |
-#                                                     +-----------+   ids=[5..15]    +--------------+
-#
-BRIDGE="vswitch"
-
-###########################################################
-THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
-source $THIS_SCRIPT_PATH/utils.bash
-###########################################################
-
-test_command_install_package "gccxml"   "gccxml" "--force-yes"
-test_command_install_package "gcc"      "gcc"      "--force-yes"
-test_command_install_package "g++"      "g++"      "--force-yes"
-test_command_install_package "automake" "automake" "--force-yes"
-test_command_install_package "vconfig"  "vlan" "--force-yes"
-test_command_install_package "iptables" "iptables"
-test_command_install_package "iperf"    "iperf" "--force-yes"
-test_command_install_package "ip"       "iproute"
-test_command_install_script   "ovs-vsctl" "$OPENAIRCN_DIR/SCRIPTS/install_openvswitch1.9.0.bash"
-test_command_install_package  "tunctl"  "uml-utilities"
-test_command_install_package "bison"    "bison"     "--force-yes"
-test_command_install_package "flex"     "flex"      "--force-yes"
-test_command_install_package "libtool"  "libtool"   "--force-yes"
-test_command_install_lib     "/usr/lib/libconfig.so"      "libconfig-dev"  "--force-yes"
-#test_command_install_lib     "/usr/lib/libsctp-dev.so"    "libsctp-dev"    "--force-yes"
-test_command_install_lib     "/usr/lib/libsctp.so"        "libsctp1"       "--force-yes"
-#test_command_install_lib     "/usr/lib/libpthread-stubs0-dev.so" "libpthread-stubs0-dev"    "--force-yes"
-if [ ! -d /usr/local/etc/freeDiameter ]
-    then
-        cd $OPENAIRCN_DIR/S6A/freediameter && ./install_freediameter.sh
-    else
-        echo_success "freediameter is installed"
-fi
-
-test_command_install_script   "asn1c" "$OPENAIRCN_DIR/SCRIPTS/install_asn1c_0.9.24.modified.bash"
-
-# One mor check about version of asn1c
-ASN1C_COMPILER_REQUIRED_VERSION_MESSAGE="ASN.1 Compiler, v0.9.24"
-ASN1C_COMPILER_VERSION_MESSAGE=`asn1c -h 2>&1 | grep -i ASN\.1\ Compiler`
-##ASN1C_COMPILER_VERSION_MESSAGE=`trim $ASN1C_COMPILER_VERSION_MESSAGE`
-if [ "$ASN1C_COMPILER_VERSION_MESSAGE" != "$ASN1C_COMPILER_REQUIRED_VERSION_MESSAGE" ]
-then
-    diff <(echo -n "$ASN1C_COMPILER_VERSION_MESSAGE") <(echo -n "$ASN1C_COMPILER_REQUIRED_VERSION_MESSAGE")
-    echo_error "Version of asn1c is not the required one, do you want to install the required one (overwrite installation) ? (Y/n)"
-    echo_error "$ASN1C_COMPILER_VERSION_MESSAGE"
-    while read -r -n 1 -s answer; do
-        if [[ $answer = [YyNn] ]]; then
-            [[ $answer = [Yy] ]] && $OPENAIRCN_DIR/SCRIPTS/install_asn1c_0.9.24.modified.bash
-            [[ $answer = [Nn] ]] && echo_error "Version of asn1c is not the required one, exiting." && exit 1
-            break
-        fi
-    done
-fi
-
-# May we have booted on a new kernel, not the one when we build vswitch kernel module
-if [ ! -f /lib/modules/`uname -r`/extra/openvswitch.ko ]; then
-    $OPENAIRCN_DIR/SCRIPTS/install_openvswitch1.9.0.bash
-fi
-
-
-##################################
-# Get or set OBJ DIR and compile #
-##################################
-# TEST IF EXIST
-cd $OPENAIRCN_DIR
-OBJ_DIR=`find . -maxdepth 1 -type d -iname obj*`
-if [ -n "$OBJ_DIR" ]
-then
-    OBJ_DIR=`basename $OBJ_DIR`
-    if [ ! -f $OBJ_DIR/Makefile ]
-    then
-        autoreconf -i -f 
-        cd ./$OBJ_DIR
-        echo_success "Invoking configure"
-        ../configure --enable-standalone-epc --enable-raw-socket-for-sgi  LDFLAGS=-L/usr/local/lib
-    else
-        cd ./$OBJ_DIR
-    fi
-else
-    OBJ_DIR="objs"
-    bash_exec "mkdir -m 777 ./$OBJ_DIR"
-    echo_success "Created $OBJ_DIR directory"
-    echo_success "Invoking autogen"
-    bash_exec "./autogen.sh"
-    cd ./$OBJ_DIR
-    echo_success "Invoking configure"
-    ../configure --enable-standalone-epc --enable-raw-socket-for-sgi  LDFLAGS=-L/usr/local/lib
-fi
-
-pkill oai_epc
-if [ -f Makefile ]
-then
-    echo_success "Compiling..."
-    make -j `cat /proc/cpuinfo | grep processor | wc -l`
-    if [ $? -ne 0 ]; then
-        echo_error "Build failed, exiting"
-        exit 1
-    fi
-else
-    echo_error "Configure failed, exiting"
-    exit 1
-fi
-cd $OPENAIRCN_DIR
-
-
-#######################################################
-# FIND CONFIG FILE
-#######################################################
-CONFIG_FILE=$THIS_SCRIPT_PATH/CONF/epc.sfr.default.vswitch.conf
-SEARCHED_CONFIG_FILE=$THIS_SCRIPT_PATH/CONF/epc.sfr."$HOSTNAME".vswitch.conf
-if [ -f $SEARCHED_CONFIG_FILE ]; then
-    CONFIG_FILE=$SEARCHED_CONFIG_FILE
-    echo_warning "config file found is now $CONFIG_FILE"
-else
-    echo_warning "config file $SEARCHED_CONFIG_FILE for host $HOSTNAME not found, trying default: $CONFIG_FILE"
-    if [ -f $CONFIG_FILE ]; then
-        echo_success "Default config file found: $CONFIG_FILE"
-    else
-        echo_error "Default config file not found, exiting"
-        exit 1
-    fi
-fi
-
-CONFIG_FILE_ENB=$THIS_SCRIPT_PATH/CONF/enb.sfr.default.vswitch.conf
-SEARCHED_CONFIG_FILE_ENB=$THIS_SCRIPT_PATH/CONF/enb.sfr."$HOSTNAME".vswitch.conf
-if [ -f $SEARCHED_CONFIG_FILE_ENB ]; then
-    CONFIG_FILE_ENB=$SEARCHED_CONFIG_FILE_ENB
-    echo_warning "config file eNB found is now $CONFIG_FILE_ENB"
-else
-    echo_warning "config file eNB $SEARCHED_CONFIG_FILE_ENB for host $HOSTNAME not found, trying default: $CONFIG_FILE_ENB"
-    if [ -f $CONFIG_FILE_ENB ]; then
-        echo_success "Default config file eNB found: $CONFIG_FILE_ENB"
-    else
-        echo_error "Default config file eNB not found, exiting"
-        exit 1
-    fi
-fi
-
-
-
-#######################################################
-# SOURCE CONFIG FILE
-#######################################################
-rm -f /tmp/source.txt
-VARIABLES="
-           ENB_INTERFACE_NAME_FOR_S1_MME\|\
-           ENB_IPV4_ADDRESS_FOR_S1_MME\|\
-           ENB_INTERFACE_NAME_FOR_S1U\|\
-           ENB_IPV4_ADDRESS_FOR_S1U\|\
-           MME_INTERFACE_NAME_FOR_S1_MME\|\
-           MME_IPV4_ADDRESS_FOR_S1_MME\|\
-           MME_INTERFACE_NAME_FOR_S11_MME\|\
-           MME_IPV4_ADDRESS_FOR_S11_MME\|\
-           SGW_INTERFACE_NAME_FOR_S11\|\
-           SGW_IPV4_ADDRESS_FOR_S11\|\
-           SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP\|\
-           SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP\|\
-           SGW_INTERFACE_NAME_FOR_S5_S8_UP\|\
-           SGW_IPV4_ADDRESS_FOR_S5_S8_UP\|\
-           PGW_INTERFACE_NAME_FOR_S5_S8\|\
-           PGW_IPV4_ADDRESS_FOR_S5_S8\|\
-           PGW_INTERFACE_NAME_FOR_SGI\|\
-           PGW_IPV4_ADDR_FOR_SGI"
-
-VARIABLES=$(echo $VARIABLES | sed -e 's/\\r//g')
-VARIABLES=$(echo $VARIABLES | tr -d ' ')
-cat $CONFIG_FILE | grep -w "$VARIABLES"| tr -d " " | tr -d ";" > /tmp/source.txt
-cat $CONFIG_FILE_ENB | grep -w "$VARIABLES"| tr -d " " | tr -d ";" >> /tmp/source.txt
-source /tmp/source.txt
-
-declare ENB_IPV4_NETMASK_FOR_S1_MME=$(       echo $ENB_IPV4_ADDRESS_FOR_S1_MME        | cut -f2 -d '/')
-declare ENB_IPV4_NETMASK_FOR_S1U=$(          echo $ENB_IPV4_ADDRESS_FOR_S1U           | cut -f2 -d '/')
-declare MME_IPV4_NETMASK_FOR_S1_MME=$(       echo $MME_IPV4_ADDRESS_FOR_S1_MME        | cut -f2 -d '/')
-declare MME_IPV4_NETMASK_FOR_S11_MME=$(      echo $MME_IPV4_ADDRESS_FOR_S11_MME       | cut -f2 -d '/')
-declare SGW_IPV4_NETMASK_FOR_S11=$(          echo $SGW_IPV4_ADDRESS_FOR_S11           | cut -f2 -d '/')
-declare SGW_IPV4_NETMASK_FOR_S1U_S12_S4_UP=$(echo $SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP | cut -f2 -d '/')
-declare SGW_IPV4_NETMASK_FOR_S5_S8_UP=$(     echo $SGW_IPV4_ADDRESS_FOR_S5_S8_UP      | cut -f2 -d '/')
-declare PGW_IPV4_NETMASK_FOR_S5_S8=$(        echo $PGW_IPV4_ADDRESS_FOR_S5_S8         | cut -f2 -d '/')
-declare PGW_IPV4_NETMASK_FOR_SGI=$(          echo $PGW_IPV4_ADDR_FOR_SGI              | cut -f2 -d '/')
-
-ENB_IPV4_ADDRESS_FOR_S1_MME=$(               echo $ENB_IPV4_ADDRESS_FOR_S1_MME        | cut -f1 -d '/')
-ENB_IPV4_ADDRESS_FOR_S1U=$(                  echo $ENB_IPV4_ADDRESS_FOR_S1U           | cut -f1 -d '/')
-MME_IPV4_ADDRESS_FOR_S1_MME=$(               echo $MME_IPV4_ADDRESS_FOR_S1_MME        | cut -f1 -d '/')
-MME_IPV4_ADDRESS_FOR_S11_MME=$(              echo $MME_IPV4_ADDRESS_FOR_S11_MME       | cut -f1 -d '/')
-SGW_IPV4_ADDRESS_FOR_S11=$(                  echo $SGW_IPV4_ADDRESS_FOR_S11           | cut -f1 -d '/')
-SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP=$(        echo $SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP | cut -f1 -d '/')
-SGW_IPV4_ADDRESS_FOR_S5_S8_UP=$(             echo $SGW_IPV4_ADDRESS_FOR_S5_S8_UP      | cut -f1 -d '/')
-PGW_IPV4_ADDRESS_FOR_S5_S8=$(                echo $PGW_IPV4_ADDRESS_FOR_S5_S8         | cut -f1 -d '/')
-PGW_IPV4_ADDR_FOR_SGI=$(                     echo $PGW_IPV4_ADDR_FOR_SGI              | cut -f1 -d '/')
-
-if [ `is_openvswitch_interface $ENB_INTERFACE_NAME_FOR_S1_MME` -eq 1 ] && \
-   [ `is_openvswitch_interface $ENB_INTERFACE_NAME_FOR_S1U` -eq 1 ] && \
-   [ `is_openvswitch_interface $MME_INTERFACE_NAME_FOR_S1_MME` -eq 1 ] && \
-   [ `is_openvswitch_interface $SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP` -eq 1 ]; then 
-   ovs_setting=1
-   vlan_setting=0
-   echo_success "Found open-vswitch network configuration"
-   clean_epc_ovs_network
-   build_epc_ovs_network
-   test_epc_ovs_network
-else
-    if [ `is_vlan_interface $MME_INTERFACE_NAME_FOR_S1_MME` -eq 1 ] || \
-       [ `is_vlan_interface $SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP` -eq 1 ]; then
-        echo_success "Found open vswitch network configuration"
-        ovs_setting=0
-        vlan_setting=1
-        clean_epc_vlan_network
-        build_mme_spgw_vlan_network
-    else
-        echo_error "Cannot find open-vswitch network configuration or VLAN network configuration"
-        exit 1
-    fi 
-fi
-
-##################################################..
-
-# LAUNCH MME + S+P-GW executable
-##################################################
-
-cd $OPENAIRCN_DIR/$OBJ_DIR
-
-ITTI_LOG_FILE=./itti_mme.log
-rotate_log_file $ITTI_LOG_FILE
-STDOUT_LOG_FILE=./stdout_mme.log
-rotate_log_file $STDOUT_LOG_FILE
-
-$OPENAIRCN_DIR/$OBJ_DIR/OAI_EPC/oai_epc -K $ITTI_LOG_FILE -c $CONFIG_FILE | tee $STDOUT_LOG_FILE 2>&1
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-epc-vlan.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-epc-vlan.bash
deleted file mode 100755
index fe9e88ce7d8a52488bb4e1480630e6cc0ed07b6d..0000000000000000000000000000000000000000
--- a/targets/PROJECTS/GENERIC-LTE-EPC/start_lte-epc-vlan.bash
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/bin/bash
-# Author Lionel GAUTHIER 01/20/2014
-#
-# This script start MME+S/P-GW (all in one executable, on one host) with openvswitch setting
-# eNB executable have to be launched on the same host by your own (start_lte-enb-ovs.bash).
-#
-#                                                                           hss.eur
-#                                                                             |
-#        +-----------+                                +-----------+           v   +----------+
-#        |  eNB      +------+            VLAN 1+------+    MME    +----+      +---+   HSS    |
-#        |           |ethx.1+------------------+ethy.1|           |    +------+   |          |
-#        |           +------+                  +------+           +----+      +---+          |
-#        |           |ethx.2+-------+                 |           |               +----------+
-#        |           +------+       |                 +-+-------+-+
-#        |           |              |                   | s11mme|    
-#        |           |              |                   +---+---+    
-#        |           |              |             (optional)|   VLAN 3
-#        +-----------+              |                   +---+---+    
-#                                   |                   | s11sgw|            router.eur
-#                                   |                 +-+-------+-+              |   +--------------+
-#                                   |                 |  S+P-GW   |              v   |   ROUTER     |
-#                                   |  VLAN2   +------+           +-------+     +----+              +----+
-#                                   +----------+ethy.2|           |sgi    +-...-+    |              |    +---...Internet
-#                                              +------+           +-------+     +----+              +----+
-#                                                     |           |      11 VLANS    |              |
-#                                                     +-----------+   ids=[5..15]    +--------------+
-
-###########################################################
-THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
-source $THIS_SCRIPT_PATH/utils.bash
-###########################################################
-
-test_command_install_package "gccxml"   "gccxml"   "--force-yes"
-test_command_install_package "gcc"      "gcc"      "--force-yes"
-test_command_install_package "g++"      "g++"      "--force-yes"
-test_command_install_package "automake" "automake" "--force-yes"
-test_command_install_package "vconfig"  "vlan"     "--force-yes"
-test_command_install_package "iptables" "iptables"
-test_command_install_package "iperf"    "iperf"    "--force-yes"
-test_command_install_package "ip"       "iproute"
-test_command_install_package "tunctl"   "uml-utilities"
-test_command_install_package "bison"    "bison"     "--force-yes"
-test_command_install_package "flex"     "flex"      "--force-yes"
-test_command_install_package "libtool"  "libtool"   "--force-yes"
-test_command_install_lib     "/usr/lib/libconfig.so"      "libconfig-dev"  "--force-yes"
-#test_command_install_lib     "/usr/lib/libsctp-dev.so"    "libsctp-dev"    "--force-yes"
-test_command_install_lib     "/usr/lib/libsctp.so"        "libsctp1"       "--force-yes"
-#test_command_install_lib     "/usr/lib/libpthread-stubs0-dev.so" "libpthread-stubs0-dev"    "--force-yes"
-
-if [ ! -d /usr/local/etc/freeDiameter ]
-    then
-        cd $OPENAIRCN_DIR/S6A/freediameter && ./install_freediameter.sh
-    else
-        echo_success "freediameter is installed"
-fi
-
-test_command_install_script   "asn1c" "$OPENAIRCN_DIR/SCRIPTS/install_asn1c_0.9.24.modified.bash"
-
-# One mor check about version of asn1c
-ASN1C_COMPILER_REQUIRED_VERSION_MESSAGE="ASN.1 Compiler, v0.9.24"
-ASN1C_COMPILER_VERSION_MESSAGE=`asn1c -h 2>&1 | grep -i ASN\.1\ Compiler`
-##ASN1C_COMPILER_VERSION_MESSAGE=`trim $ASN1C_COMPILER_VERSION_MESSAGE`
-if [ "$ASN1C_COMPILER_VERSION_MESSAGE" != "$ASN1C_COMPILER_REQUIRED_VERSION_MESSAGE" ]
-then
-    diff <(echo -n "$ASN1C_COMPILER_VERSION_MESSAGE") <(echo -n "$ASN1C_COMPILER_REQUIRED_VERSION_MESSAGE")
-    echo_error "Version of asn1c is not the required one, do you want to install the required one (overwrite installation) ? (Y/n)"
-    echo_error "$ASN1C_COMPILER_VERSION_MESSAGE"
-    while read -r -n 1 -s answer; do
-        if [[ $answer = [YyNn] ]]; then
-            [[ $answer = [Yy] ]] && $OPENAIRCN_DIR/SCRIPTS/install_asn1c_0.9.24.modified.bash
-            [[ $answer = [Nn] ]] && echo_error "Version of asn1c is not the required one, exiting." && exit 1
-            break
-        fi
-    done
-fi
-
-# May we have booted on a new kernel, not the one when we build vswitch kernel module
-if [ ! -f /lib/modules/`uname -r`/extra/openvswitch.ko ]; then
-    $OPENAIRCN_DIR/SCRIPTS/install_openvswitch1.9.0.bash
-fi
-
-
-##################################
-# Get or set OBJ DIR and compile #
-##################################
-# TEST IF EXIST
-cd $OPENAIRCN_DIR
-OBJ_DIR=`find . -maxdepth 1 -type d -iname obj*`
-if [ -n "$OBJ_DIR" ]
-then
-    OBJ_DIR=`basename $OBJ_DIR`
-    if [ ! -f $OBJ_DIR/Makefile ]
-    then
-        autoreconf -i -f 
-        cd ./$OBJ_DIR
-        echo_success "Invoking configure"
-        ../configure --enable-standalone-epc --enable-raw-socket-for-sgi --disable-s11 LDFLAGS=-L/usr/local/lib
-    else
-        cd ./$OBJ_DIR
-    fi
-else
-    OBJ_DIR="objs"
-    bash_exec "mkdir -m 777 ./$OBJ_DIR"
-    echo_success "Created $OBJ_DIR directory"
-    echo_success "Invoking autogen"
-    bash_exec "./autogen.sh"
-    cd ./$OBJ_DIR
-    echo_success "Invoking configure"
-    ../configure --enable-standalone-epc --enable-raw-socket-for-sgi --disable-s11  LDFLAGS=-L/usr/local/lib
-fi
-
-pkill oai_epc
-if [ -f Makefile ]
-then
-    echo_success "Compiling..."
-    make CODE_PDN_WITHOUT_S11=1 -j `cat /proc/cpuinfo | grep processor | wc -l`
-    if [ $? -ne 0 ]; then
-        echo_error "Build failed, exiting"
-        exit 1
-    fi
-else
-    echo_error "Configure failed, exiting"
-    exit 1
-fi
-cd $OPENAIRCN_DIR
-
-
-#######################################################
-# FIND CONFIG FILE
-#######################################################
-CONFIG_FILE=$THIS_SCRIPT_PATH/CONF/epc.sfr.default.vlan.conf
-SEARCHED_CONFIG_FILE=$THIS_SCRIPT_PATH/CONF/epc.sfr."$HOSTNAME".vlan.conf
-if [ -f $SEARCHED_CONFIG_FILE ]; then
-    CONFIG_FILE=$SEARCHED_CONFIG_FILE
-    echo_warning "config file found is now $CONFIG_FILE"
-else
-    echo_warning "config file $SEARCHED_CONFIG_FILE for host $HOSTNAME not found, trying default: $CONFIG_FILE"
-    if [ -f $CONFIG_FILE ]; then
-        echo_success "Default config file found: $CONFIG_FILE"
-    else
-        echo_error "Default config file not found, exiting"
-        exit 1
-    fi
-fi
-#######################################################
-# SOURCE CONFIG FILE
-#######################################################
-rm -f /tmp/source.txt
-VARIABLES="
-           MME_INTERFACE_NAME_FOR_S1_MME\|\
-           MME_IPV4_ADDRESS_FOR_S1_MME\|\
-           MME_INTERFACE_NAME_FOR_S11_MME\|\
-           MME_IPV4_ADDRESS_FOR_S11_MME\|\
-           SGW_INTERFACE_NAME_FOR_S11\|\
-           SGW_IPV4_ADDRESS_FOR_S11\|\
-           SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP\|\
-           SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP\|\
-           SGW_INTERFACE_NAME_FOR_S5_S8_UP\|\
-           SGW_IPV4_ADDRESS_FOR_S5_S8_UP\|\
-           PGW_INTERFACE_NAME_FOR_S5_S8\|\
-           PGW_IPV4_ADDRESS_FOR_S5_S8\|\
-           PGW_INTERFACE_NAME_FOR_SGI\|\
-           PGW_IPV4_ADDR_FOR_SGI"
-
-VARIABLES=$(echo $VARIABLES | sed -e 's/\\r//g')
-VARIABLES=$(echo $VARIABLES | tr -d ' ')
-cat $CONFIG_FILE | grep -w "$VARIABLES"| tr -d " " | tr -d ";" > /tmp/source.txt
-source /tmp/source.txt
-
-declare MME_IPV4_NETMASK_FOR_S1_MME=$(       echo $MME_IPV4_ADDRESS_FOR_S1_MME        | cut -f2 -d '/')
-#declare MME_IPV4_NETMASK_FOR_S11_MME=$(      echo $MME_IPV4_ADDRESS_FOR_S11_MME       | cut -f2 -d '/')
-#declare SGW_IPV4_NETMASK_FOR_S11=$(          echo $SGW_IPV4_ADDRESS_FOR_S11           | cut -f2 -d '/')
-declare SGW_IPV4_NETMASK_FOR_S1U_S12_S4_UP=$(echo $SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP | cut -f2 -d '/')
-#declare SGW_IPV4_NETMASK_FOR_S5_S8_UP=$(     echo $SGW_IPV4_ADDRESS_FOR_S5_S8_UP      | cut -f2 -d '/')
-#declare PGW_IPV4_NETMASK_FOR_S5_S8=$(        echo $PGW_IPV4_ADDRESS_FOR_S5_S8         | cut -f2 -d '/')
-declare PGW_IPV4_NETMASK_FOR_SGI=$(          echo $PGW_IPV4_ADDR_FOR_SGI              | cut -f2 -d '/')
-
-#ENB_IPV4_ADDRESS_FOR_S1_MME=$(               echo $ENB_IPV4_ADDRESS_FOR_S1_MME        | cut -f1 -d '/')
-#ENB_IPV4_ADDRESS_FOR_S1U=$(                  echo $ENB_IPV4_ADDRESS_FOR_S1U           | cut -f1 -d '/')
-MME_IPV4_ADDRESS_FOR_S1_MME=$(               echo $MME_IPV4_ADDRESS_FOR_S1_MME        | cut -f1 -d '/')
-#MME_IPV4_ADDRESS_FOR_S11_MME=$(              echo $MME_IPV4_ADDRESS_FOR_S11_MME       | cut -f1 -d '/')
-#SGW_IPV4_ADDRESS_FOR_S11=$(                  echo $SGW_IPV4_ADDRESS_FOR_S11           | cut -f1 -d '/')
-SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP=$(        echo $SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP | cut -f1 -d '/')
-#SGW_IPV4_ADDRESS_FOR_S5_S8_UP=$(             echo $SGW_IPV4_ADDRESS_FOR_S5_S8_UP      | cut -f1 -d '/')
-#PGW_IPV4_ADDRESS_FOR_S5_S8=$(                echo $PGW_IPV4_ADDRESS_FOR_S5_S8         | cut -f1 -d '/')
-PGW_IPV4_ADDR_FOR_SGI=$(                     echo $PGW_IPV4_ADDR_FOR_SGI              | cut -f1 -d '/')
-
-clean_epc_vlan_network
-build_mme_spgw_vlan_network
-#test_epc_vlan_network
-
-##################################################..
-
-# LAUNCH MME + S+P-GW executable
-##################################################
-
-cd $OPENAIRCN_DIR/$OBJ_DIR
-
-ITTI_LOG_FILE=./itti_mme.log
-rotate_log_file $ITTI_LOG_FILE
-STDOUT_LOG_FILE=./stdout_mme.log
-rotate_log_file $STDOUT_LOG_FILE
-
-$OPENAIRCN_DIR/$OBJ_DIR/OAI_EPC/oai_epc -K $ITTI_LOG_FILE -c $CONFIG_FILE | tee $STDOUT_LOG_FILE 2>&1