diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0df727291619c4e74d88c2b30e882c7a7ea1ead7..9482f081f3da7d52f19cd2215f3b450160951bbe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,9 @@ variables:
   SHORT_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"
   LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm"
   TEST_SUITE: ""
+  DISABLE_HRTF_MODEL_TESTS: ""
+  # DISABLE_HRTF_MODEL_TESTS: "-k not model" #enable this declaration to disable HRTF model from file tests
+
   # These path variables are used by the pytest calls.
   # They can be overwritten in the job templates to e.g. only test encoder or decoder in the chain
   DUT_ENCODER_PATH: "./IVAS_cod"
@@ -29,7 +32,7 @@ variables:
   MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_merge_target"
   LEVEL_SCALING: "1.0"
   IVAS_PIPELINE_NAME: ''
-  BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"
+  BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch-pc"
   PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"
   TESTCASE_TIMEOUT_STV: 900
   TESTCASE_TIMEOUT_LTV: 2400
@@ -272,15 +275,12 @@ stages:
   - cd $SCRIPTS_DIR
   - sed -i '/fetch/d' .git/config # Remove all fetch lines to clean out dead links
   - git remote set-branches --add origin $BASOP_CI_BRANCH_PC_REPO # Add currently used branch
-  - git remote set-branches --add origin main # Add main to be able to load new format HRTFs
   - git fetch
   - git restore --staged . # Needed if HRTF model files were updated.
   - git restore . # Just as a precaution
   - git checkout $BASOP_CI_BRANCH_PC_REPO
   - git pull origin $BASOP_CI_BRANCH_PC_REPO
-# Restore new format of HRTF binary
-  - git fetch origin main
-  - git checkout 78154d0b3f1b2c6c8ff8a234f3f7cf865d467d35 -- scripts/binauralRenderer_interface/binaural_renderers_hrtf_data
+
   - cd -
   - cp -r $SCRIPTS_DIR/ci .
   - cp -r $SCRIPTS_DIR/scripts .
@@ -693,11 +693,11 @@ stages:
     - *check-up-to-date-in-comparison-jobs
 
     - exit_code_target=0
-    - python3 -m pytest $TEST_SUITE -v --update_ref 1 --create_ref -n auto --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -k "not model" > $PYTEST_LOG_TARGET_BRANCH || exit_code_target=$?
+    - python3 -m pytest $TEST_SUITE -v --update_ref 1 --create_ref -n auto --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH $DISABLE_HRTF_MODEL_TESTS > $PYTEST_LOG_TARGET_BRANCH || exit_code_target=$?
 
     - exit_code=0
     - rm -rf .pytest_cache || true
-    - python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT --self-contained-html --junit-xml=$XML_REPORT --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout -k "not model" > pytest_log.txt || exit_code=$?
+    - python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT --self-contained-html --junit-xml=$XML_REPORT --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout $DISABLE_HRTF_MODEL_TESTS > pytest_log.txt || exit_code=$?
 
     - if [ $exit_code -ne 0 ]; then
     -   exit_code=$EXIT_CODE_NON_BE
@@ -2214,7 +2214,7 @@ ivas-pytest-on-merge-request:
 
     ### prepare pytest
     # create references
-    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 -k "not model"
+    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 $DISABLE_HRTF_MODEL_TESTS
 
     ### Run test using branch scripts and input
     - if [ $ref_using_target == 1 ]; then git checkout $source_branch_commit_sha; fi
@@ -2222,7 +2222,7 @@ ivas-pytest-on-merge-request:
     ### run pytest
     - exit_code=0
     - testcase_timeout=600
-    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout -k "not model" || exit_code=$?
+    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout $DISABLE_HRTF_MODEL_TESTS || exit_code=$?
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
 
     - *merge-request-comparison-check
diff --git a/apps/decoder.c b/apps/decoder.c
index 0ed86b187178773158c1d143f160beb15bbc7e52..746564eb4b7feee588d6e29833fa81bc2a2853da 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -576,32 +576,8 @@ int main(
         {
             if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
             {
-#ifdef FIX_OLD_BINARY_FORMAT
-                hrtfFileReader_close( &hrtfReader );
-                strcat( arg.hrtfFileName, "new" );
-
-                if ( hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) != IVAS_ERR_OK )
-                {
-                    fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
-                    goto cleanup;
-                }
-
-                if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
-                {
-                    if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
-                    {
-                        fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
-                        goto cleanup;
-                    }
-                    else
-                    {
-                        destroy_td_hrtf( hHrtfTD );
-                    }
-                }
-#else
                 fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
                 goto cleanup;
-#endif
             }
             else
             {
@@ -627,29 +603,6 @@ int main(
 
         if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
         {
-#ifdef FIX_OLD_BINARY_FORMAT
-            cleanup_SetOfHRTF( hSetOfHRTF );
-            hrtfFileReader_close( &hrtfReader );
-            strcat( arg.hrtfFileName, "new" );
-
-            if ( hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) != IVAS_ERR_OK )
-            {
-                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
-                goto cleanup;
-            }
-            if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
-            {
-                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
-                {
-                    fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
-                    goto cleanup;
-                }
-                else
-                {
-                    destroy_SetOfHRTF( hSetOfHRTF );
-                }
-            }
-#else
             if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
             {
                 fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
@@ -659,7 +612,6 @@ int main(
             {
                 destroy_SetOfHRTF( hSetOfHRTF );
             }
-#endif
         }
 
         IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
diff --git a/apps/renderer.c b/apps/renderer.c
index b2e732c6f78307dd5a3bfc1a4f1659632942bc61..b1b7e225828518e41069557381c7aed092d73a61 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -980,30 +980,8 @@ int main(
             {
                 if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
                 {
-#ifdef FIX_OLD_BINARY_FORMAT
-                    hrtfFileReader_close( &hrtfFileReader );
-                    strcat( args.customHrtfFilePath, "new" );
-                    if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
-                    {
-                        fprintf( stderr, "\nError in loading HRTF binary file %s: %s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
-                        goto cleanup;
-                    }
-                    if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )
-                    {
-                        if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
-                        {
-                            fprintf( stderr, "\nError in loading HRTF binary file %s: %s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
-                            goto cleanup;
-                        }
-                        else
-                        {
-                            destroy_td_hrtf( hHrtfTD );
-                        }
-                    }
-#else
                     fprintf( stderr, "\nError in loading HRTF binary file %s: %s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
                     goto cleanup;
-#endif
                 }
                 else
                 {
@@ -1030,28 +1008,6 @@ int main(
 
             if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )
             {
-#ifdef FIX_OLD_BINARY_FORMAT
-                cleanup_SetOfHRTF( hSetOfHRTF );
-                hrtfFileReader_close( &hrtfFileReader );
-                strcat( args.customHrtfFilePath, "new" );
-                if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
-                {
-                    fprintf( stderr, "\nError in loading HRTF binary file %s: %s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
-                    goto cleanup;
-                }
-                if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )
-                {
-                    if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
-                    {
-                        fprintf( stderr, "\nError in loading HRTF binary file %s:%s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
-                        goto cleanup;
-                    }
-                    else
-                    {
-                        destroy_SetOfHRTF( hSetOfHRTF );
-                    }
-                }
-#else
                 if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
                 {
                     fprintf( stderr, "\nError in loading HRTF binary file %s:%s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
@@ -1061,7 +1017,6 @@ int main(
                 {
                     destroy_SetOfHRTF( hSetOfHRTF );
                 }
-#endif
             }
 
             if ( ( error = IVAS_REND_GetHrtfFastConvHandle( hIvasRend, &hHrtfFastConv ) ) != IVAS_ERR_OK )
diff --git a/lib_com/options.h b/lib_com/options.h
index 78a494c61edfc207e72b41383fd0e51d33f33bcb..662fb2be24f4d2c00ea8eb1fe427adfd80728b46 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -111,7 +111,6 @@
 
 #define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */
 #ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
-#define FIX_OLD_BINARY_FORMAT                           /* Orange: trick to make tests succesful when changing hrtf binary format between ref and new branch*/      
 //#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES			  /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers	*/
 #endif
 
diff --git a/lib_util/hrtf_file_reader.c b/lib_util/hrtf_file_reader.c
index c6d1d48ec938291cfe7542effce09b54f3b9ccfc..0d4dd8619291c615dd59c260ae0c7597e3c891e6 100644
--- a/lib_util/hrtf_file_reader.c
+++ b/lib_util/hrtf_file_reader.c
@@ -2311,29 +2311,6 @@ static void destroy_HRTF(
     return;
 }
 
-#ifdef FIX_OLD_BINARY_FORMAT
-/*---------------------------------------------------------------------*
- * cleanup_SetOfHRTF()
- *
- * Destroy the HRTF data set.
- *---------------------------------------------------------------------*/
-
-void cleanup_SetOfHRTF(
-    HRTFS_CREND_HANDLE *hSetOfHRTF /* i/o: Set of HRTF CRend handle */
-)
-{
-    if ( ( hSetOfHRTF != NULL ) && ( *hSetOfHRTF != NULL ) )
-    {
-        destroy_HRTF( &( ( *hSetOfHRTF )->hHRTF_hrir_combined ) );
-        destroy_HRTF( &( ( *hSetOfHRTF )->hHRTF_hrir_hoa3 ) );
-        destroy_HRTF( &( ( *hSetOfHRTF )->hHRTF_hrir_hoa2 ) );
-        destroy_HRTF( &( ( *hSetOfHRTF )->hHRTF_hrir_foa ) );
-        destroy_HRTF( &( ( *hSetOfHRTF )->hHRTF_brir_combined ) );
-    }
-
-    return;
-}
-#endif
 
 /*---------------------------------------------------------------------*
  * destroy_SetOfHRTF()
diff --git a/lib_util/hrtf_file_reader.h b/lib_util/hrtf_file_reader.h
index ca8e8b135484c986bcac727fa235414a9f7b00db..91e68b35823f2e16b9794b3843ccf13a49b9e23a 100644
--- a/lib_util/hrtf_file_reader.h
+++ b/lib_util/hrtf_file_reader.h
@@ -120,17 +120,6 @@ ivas_error create_SetOfHRTF_from_binary(
     int32_t output_Fs                      /* i  : Output sampling frequency            */
 );
 
-#ifdef FIX_OLD_BINARY_FORMAT
-/*---------------------------------------------------------------------*
- * cleanup_SetOfHRTF()
- *
- * Destroy the HRTF data set.
- *---------------------------------------------------------------------*/
-
-void cleanup_SetOfHRTF(
-    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF /* i/o: Set of HRTF CRend handle */
-);
-#endif
 
 /*---------------------------------------------------------------------*
  * destroy_SetOfHRTF()