diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index c6d1276e88..44ed349594 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -38,7 +38,6 @@ conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
 
 HW=""
 BUILD_DIR=ran_build
-DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 CMAKE_CMD="$CMAKE"
 OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_cuda ldpc_aal ldpc_xdma websrv oai_iqplayer imscope imscope_record"
@@ -328,10 +327,6 @@ function main() {
             CMAKE_CMD="$CMAKE_CMD -DT_TRACER=False"
             echo_info "Disabling the T tracer"
             shift 1;;
-       --disable-hardware-dependency)
-            echo_info "Disabling hardware dependency for compiling software"
-            DISABLE_HARDWARE_DEPENDENCY="True"
-            shift 1;;
        --ue-trace)
             CMAKE_CMD="$CMAKE_CMD -DUE_DEBUG_TRACE=False"
             echo_info "Enabling UE trace for debug"
@@ -427,23 +422,17 @@ function main() {
     if [ "$HW" == "OAI_USRP" ] ; then
       echo_info "installing packages for USRP support"
       check_install_usrp_uhd_driver
-      if [ ! -v BUILD_UHD_FROM_SOURCE ] && [ ! "$DISABLE_HARDWARE_DEPENDENCY" == "True" ]; then
+      if [ ! -v BUILD_UHD_FROM_SOURCE ]; then
         install_usrp_uhd_driver $UHD_IMAGES_DIR
       fi
     fi
     if [ "$HW" == "OAI_BLADERF" ] ; then
       echo_info "installing packages for BLADERF support"
       check_install_bladerf_driver
-      if [ ! "$DISABLE_HARDWARE_DEPENDENCY" == "True" ]; then
-        flash_firmware_bladerf
-      fi
     fi
     if [ "$HW" == "OAI_IRIS" ] ; then
       echo_info "installing packages for IRIS support"
       check_install_soapy
-      #if [ ! "$DISABLE_HARDWARE_DEPENDENCY" == "True" ]; then
-      #  flash_firmware_iris
-      #fi
     fi
   fi
 
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index 3443d06c43..5301af660d 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -368,10 +368,6 @@ check_install_bladerf_driver(){
    fi
 }
 
-flash_firmware_bladerf() {
-	$SUDO bladeRF-cli --flash-firmware /usr/share/Nuand/bladeRF/bladeRF_fw.img
-}
-
 check_install_lmssdr_driver(){
 	if ( [ -d "/usr/local/include/lime" ] &&
              [ -f "/usr/local/include/lime/LimeSuite.h" ] )