diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index f9cd26cf864fc00a323f77c08658e445ebc39b07..360beab9dcbe917759b1388c15b1f23a52eded86 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -254,8 +254,6 @@ function main() {
   if [ "$INSTALL_EXTERNAL" = "1" ] ; then
     echo_info "Installing packages"
     check_install_oai_software
-    echo_info "Making X.509 certificates"
-    make_certs eur
     if [ "$HW" == "OAI_USRP" ] ; then
       echo_info "installing packages for USRP support"
       check_install_usrp_uhd_driver
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index e77ded61422bd1e07d2572f4195273a737190098..4968a420168bd05ad2cfe4e7b09cd42b485fc842 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -258,11 +258,10 @@ check_install_oai_software() {
     $SUDO update-alternatives --set liblapack.so /usr/lib/atlas-base/atlas/liblapack.so
     if [ `lsb_release -rs` = '12.04' ] ; then
         install_nettle_from_source
-	install_gnutls_from_source
+        install_gnutls_from_source
     else
         $SUDO apt-get install -y libgnutls-dev nettle-dev nettle-bin 
     fi
-    install_freediameter_from_source
     install_asn1c_from_source
 }
 
@@ -311,13 +310,11 @@ set_openair_env(){
     [ -f "/.$fullpath" ] || fullpath=`readlink -f $PWD/$fullpath`
     openair_path=${fullpath%/cmake_targets/*}
     openair_path=${openair_path%/targets/*}
-    openair_path=${openair_path%/openair3/*}
     openair_path=${openair_path%/openair[123]/*}    
     export OPENAIR_DIR=$openair_path
     export OPENAIR1_DIR=$openair_path/openair1
     export OPENAIR2_DIR=$openair_path/openair2
     export OPENAIR3_DIR=$openair_path/openair3
-    export OPENAIR3_DIR=$openair_path/openair3
     export OPENAIR_TARGETS=$openair_path/targets
 }