diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index c2aaea4717395ba230803a8bbef3f67c38e50d2b..1142b79960417fa60f3a543492b6dd234b9d3580 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -239,6 +239,7 @@ function main() {
 
   if [ "$eNB" = "1" -o "$UE" = "1" ] ; then
     # LTE softmodem compilation
+    [ "$CLEAN" = "1" ] && rm -rf $DIR/lte_build_oai/build
     mkdir -p $DIR/lte_build_oai/build
     cmake_file=$DIR/lte_build_oai/CMakeLists.txt
     echo "cmake_minimum_required(VERSION 2.8)"   >   $cmake_file
@@ -271,8 +272,10 @@ function main() {
 #      at_commands at_nas_ue \
 #      at_nas_ue $dbin/at_nas_ue
       
+    [ "$CLEAN" = "1" ] && rm -rf $DIR/nas_sim_tools/build
     mkdir -p $DIR/nas_sim_tools/build
     cd $DIR/nas_sim_tools/build
+    
     cmake ..
     compilations \
       nas_sim_tools usim \
@@ -325,6 +328,7 @@ function main() {
   # EXMIMO drivers & firmware loader
   ###############
   if [ "$HW" = "EXMIMO" -a "$UE$eNB" != "" ] ; then
+    
     echo_info "Compiling Express MIMO 2 board drivers"
     compilations \
         lte_build_oai openair_rf \
@@ -338,6 +342,7 @@ function main() {
     dconf=$OPENAIR_DIR/targets/bin
 
     echo_info "Compiling at_nas_ue"
+    [ "$CLEAN" = "1" ] && rm -rf $DIR/at_commands/build
     mkdir -p $DIR/at_commands/build
     cd $DIR/at_commands/build
     cmake ..
@@ -352,6 +357,7 @@ function main() {
     echo "set(RRC_ASN1_VERSION \"${REL}\")" >>  $cmake_file
     echo "set(ENABLE_VCD_FIFO $VCD_TIMING )" >>  $cmake_file
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
+    [ "$CLEAN" = "1" ] && rm -rf $DIR/oaisim_build_oai/build
     mkdir -p $DIR/oaisim_build_oai/build
     cd $DIR/oaisim_build_oai/build
     cmake ..
@@ -365,6 +371,7 @@ function main() {
 	  oaisim_build_oai ue_ip \
 	  CMakeFiles/ue_ip/ue_ip.ko $dbin/ue_ip.ko
 
+    [ "$CLEAN" = "1" ] && rm -rf $DIR/nas_sim_tools/build
     mkdir -p $DIR/nas_sim_tools/build
     cd $DIR/nas_sim_tools/build
     cmake ..
@@ -389,12 +396,17 @@ function main() {
     echo "set(RRC_ASN1_VERSION \"${REL}\")" >>  $cmake_file
     echo "set(ENABLE_VCD_FIFO $VCD_TIMING )" >>  $cmake_file
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
+    [ "$CLEAN" = "1" ] && rm -rf $DIR/oaisim_noS1_build_oai/build
     mkdir -p $DIR/oaisim_noS1_build_oai/build
     cd $DIR/oaisim_noS1_build_oai/build
     cmake ..
     compilations \
-	  oaisim_noS1_build_oai oaisim_nos1 \
-	  oaisim_nos1 $dbin/oaisim_nos1.$REL
+      oaisim_noS1_build_oai oaisim_nos1 \
+      oaisim_nos1 $dbin/oaisim_nos1.$REL
+
+    compilations \
+      oaisim_noS1_build_oai rb_tool \
+      rb_tool $dbin/rb_tool
 
     # nasmesh driver compilation
     compilations \
@@ -411,6 +423,7 @@ function main() {
     echo "set(RRC_ASN1_VERSION \"${REL}\")" >>  $cmake_file
     echo "set(ENABLE_VCD_FIFO $VCD_TIMING )" >>  $cmake_file
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
+    [ "$CLEAN" = "1" ] && rm -rf $DIR/oaisim_mme_build_oai/build
     mkdir -p $DIR/oaisim_mme_build_oai/build
     cd $DIR/oaisim_mme_build_oai/build
     cmake ..