diff --git a/doc/README.md b/doc/README.md
index 91101d18badaf15bf4f1fd96df30d399b2513de2..6abca52f0b4b296d714beaca6031c6200fc58de0 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -36,7 +36,6 @@ There is some general information in the [OpenAirInterface Gitlab Wiki](https://
* (5G) Using SDAP and custom DRBs
* IF setups and arbitrary frequencies
* MIMO
-- [How to run a 5G-SA setup](./TESTING_5GSA_setup.md)
- [How to run a 5G-NSA setup](./TESTING_GNB_W_COTS_UE.md)
- [How to run a 4G setup using L1 simulator](./L1SIM.md) _Note: we recommend the RFsimulator_
- [How to use the L2 simulator](./L2NFAPI.md)
diff --git a/doc/TESTING_5GSA_setup.md b/doc/TESTING_5GSA_setup.md
deleted file mode 100644
index 736005803d0093fb516b9bd425de51d033ab786a..0000000000000000000000000000000000000000
--- a/doc/TESTING_5GSA_setup.md
+++ /dev/null
@@ -1,230 +0,0 @@
-<table style="border-collapse: collapse; border: none;">
- <tr style="border-collapse: collapse; border: none;">
- <td style="border-collapse: collapse; border: none;">
- <a href="http://www.openairinterface.org/">
- <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
- </img>
- </a>
- </td>
- <td style="border-collapse: collapse; border: none; vertical-align: center;">
- <b><font size = "5">OAI 5G SA tutorial</font></b>
- </td>
- </tr>
-</table>
-
-**Table of Contents**
-
-[[_TOC_]]
-
-In the following tutorial we describe how to deploy configure and test the two SA OAI setups:
-
- - SA setup with OAI gNB and COTS UE
- - SA setup with OAI gNB and OAI UE
-
-The operating system and hardware requirements to support OAI 5G NR are described [here](https://gitlab.eurecom.fr/oai/openairinterface5g/-/wikis/5g-nr-development-and-setup).
-
-# 1. SA setup with COTS UE
-At the moment of writing this document interoperability with the following COTS UE devices is being tested:
-
- - [Quectel RM500Q-GL](https://www.quectel.com/product/5g-rm500q-gl/)
- - [Simcom SIMCOM8200EA](https://www.simcom.com/product/SIM8200EA_M2.html)
- - Huawei Mate 30 Pro
- - Oneplus 8
- - Google Pixel 5
-
- End-to-end control plane signaling to achieve a 5G SA connection, UE registration and PDU session establishment with the CN, as well as some basic user-plane traffic tests have been validated so far using SIMCOM/Quectel modules and Huawei Mate 30 pro. In terms of interoperability with different 5G Core Networks, so far this setup has been tested with:
-
-
- - [OAI CN](https://openairinterface.org/oai-5g-core-network-project/)
- - Nokia SA Box
- - [Free CN](https://www.free5gc.org/)
-
-
-## 1.1 gNB build and configuration
-To get the code and build the gNB executable:
-
-### Build gNB
-```bash
- git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git
- git checkout develop
- cd openairinterface5g/
- source oaienv
- cd cmake_targets/
- ./build_oai -I -w USRP #For OAI first time installation only to install software dependencies
- ./build_oai --gNB -w USRP
-```
-
-A reference configuration file for the **monolithic** gNB is provided [here](https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf).
-
-
-In the following, we highlight the fields of the file that have to be configured according to the configuration and interfaces of the Core Network. First, the PLMN section has to be filled with the proper values that match the configuration of the AMF and the UE USIM.
-```bash
- // Tracking area code, 0x0000 and 0xfffe are reserved values
- tracking_area_code = 1;
- plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });
-```
-Then, the source and destination IP interfaces for the communication with
-the Core Network also need to be set as shown below.
-
-```bash
- ////////// AMF parameters:
- amf_ip_address = ( { ipv4 = "192.168.70.132";
- ipv6 = "192:168:30::17";
- active = "yes";
- preference = "ipv4";
- }
- );
-
-
- NETWORK_INTERFACES :
- {
- GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai";
- GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24";
- GNB_INTERFACE_NAME_FOR_NGU = "demo-oai";
- GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24";
- GNB_PORT_FOR_S1U = 2152; # Spec 2152
- };
-```
-In the first part (*amf_ip_address*) we specify the IP of the AMF and in the second part (*NETWORK_INTERFACES*) we specify the gNB local interface with AMF (N2 interface) and the UPF (N3 interface).
-
-**CAUTION:** the `192.168.70.132` AMF IF address is the OAI-CN5G `AMF` Container IP address. You certainly will need to do some networking manipulations for the `gNB` server to be able to see this AMF container.
-
-Please read [CN5G tutorial for more details](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/blob/master/README.md).
-
-### gNB configuration in F1 (CU/DU split mode)
-
-For the configuration of the gNB in CU and DU blocks, the following sample configuration files are provided for the [CU](https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf) and the [DU](https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf) entities respectively. These configuration files have to be updated with the IP addresses of the CU and the DU over the F1 interface. For example, in the following section from the DU configuration file, *local_n_address* corresponds to the DU address and *remote_n_address* corresponds to the CU address:
-
-```bash
-MACRLCs = (
- {
- num_cc = 1;
- tr_s_preference = "local_L1";
- tr_n_preference = "f1";
- local_n_if_name = "lo";
- local_n_address = "127.0.0.3";
- remote_n_address = "127.0.0.4";
- local_n_portc = 601;
- local_n_portd = 2152;
- remote_n_portc = 600;
- remote_n_portd = 2152;
-
- }
-);
-```
-
-At the point of writing this document the control-plane exchanges between the CU and the DU over *F1-C* interface, as well as some IP traffic tests over *F1-U* have been validated using the OAI gNB/nrUE in RFSIMULATOR mode.
-
-### gNB configuration with F1 and E1
-
-Please refer to [E1-design](E1-design) for more information.
-
-## 1.2 OAI 5G Core Network installation and configuration
-The instructions for the installation of OAI CN components (AMF, SMF, NRF, UPF) using `docker-compose` can be found [here](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/blob/master/README.md).
-
-## 1.3 Execution of SA scenario
-
-After having configured the gNB, we can start the individual components in the following sequence:
-
- - Launch 5G Core Network
- - Launch gNB
- - Launch COTS UE (disable airplane mode)
-
-The execution command to start the gNB (in monolithic mode) is the following:
-```bash
-cd cmake_targets/ran_build/build
-sudo ./nr-softmodem -E --sa -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
-```
-
-# 2. SA Setup with OAI NR UE Softmodem
-The SA setup with OAI UE has been validated with **RFSIMULATOR**. Both control plane and user plane for the successful UE registration and PDU Session establishment has been verified with OAI and Nokia SA Box CNs.
-
-In the following, we provide the instructions on how to build, configure and execute this SA setup.
-
-As another option, if you do not want to build anything and instead deploy the OAI RAN (RFSIMULATOR) and Core Network components directly using docker images and docker-compose, please have a look at [this tutorial](https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/ci-scripts/yaml_files/5g_rfsimulator/README.md).
-
-### NAS configuration for the OAI UE
-The NAS configuration parameters of the OAI UE can be set as input parameters, configuration file or can be hardcoded. More specifically:
-- SUCI (*Subscription Concealed Identifier*)
-- USIM_API_K and OPc keys
-- NSSAI (*Network Slice Assistance Information*)
-- DNN (*Data Network Name*)
-
-Below is a sample configuration file that can be parsed through the execution command ([section 2.3](#23-execution-of-sa-scenario)).
-
-```bash
-uicc0 = {
-imsi = "208990000007487";
-key = "fec86ba6eb707ed08905757b1bb44b8f";
-opc= "C42449363BBAD02B66D16BC975D77CC1";
-dnn= "oai";
-nssai_sst=1;
-nssai_sd=1;
-}
-```
-
-For interoperability with OAI or other CNs, it should be ensured that the configuration of the aforementioned parameters match the configuration of the corresponding subscribed user at the core network.
-
-
-## 2.1 Build and configuration
-To build the gNB and OAI UE executables:
-
-```bash
- cd cmake_targets
- # Note: For OAI first time installation please install software dependencies as described in 1.1.
- ./build_oai --gNB --nrUE -w SIMU
-```
-The gNB configuration can be performed according to what is described in [section 1.1](#11--gnb-build-and-configuration), using the same reference configuration file as with the RF scenario.
-
-## 2.2 OAI 5G Core Network installation and configuration
-The instructions for the installation of OAI CN components (AMF, SMF, NRF, UPF) using `docker-compose` can be found [here](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/blob/master/README.md).
-
-
-## 2.3 Execution of SA scenario
-
-The order of starting the different components should be the same as the one described in [section 1.3](#13--execution-of-sa-scenario).
-
-the gNB can be launched in 2 modes:
-
-- To launch the gNB in `monolithic` mode:
- ```bash
- sudo RFSIMULATOR=server ./nr-softmodem --rfsim --sa \
- -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
- ```
-- To launch the gNB in `CU/DU split` mode:
-
- 1. Launch the CU component:
- ```bash
- sudo RFSIMULATOR=server ./nr-softmodem --rfsim --sa \
- -O ../../../ci-scripts/conf_files/gNB_SA_CU.conf
- ```
- 2. Launch the DU component:
- ```bash
- sudo RFSIMULATOR=server ./nr-softmodem --rfsim --sa \
- -O ../../../ci-scripts/conf_files/gNB_SA_DU.conf
- ```
-
-- To launch the OAI UE (valid in `monolithic` gNB and `CU/DU split` gNB):
- ```bash
-sudo RFSIMULATOR=127.0.0.1 ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 \
- --rfsim --sa -O <PATH_TO_UE_CONF_FILE>
-```
-
-If you get the following error:
-
-```bash
-Assertion (k2 >= ((5))) failed!
-In get_k2() /home/mir/workspace/openairinterface5g/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c:147
-Slot offset K2 (2) cannot be less than DURATION_RX_TO_TX (5). K2 set according to min_rxtxtime in config file.
-```
-
-Add the following parameter (i.e., min_rxtxtime) in the gNB configuration file, just after nr_cellid.
-
-```bash
-nr_cellid = 12345678L;
-min_rxtxtime=6;
-```
-or --gNBs.[0].min_rxtxtime 6 to the gNB command line
-
-
-The IP address at the execution command of the OAI UE corresponds to the target IP of the gNB host that the RFSIMULATOR at the UE will connect to. In the above example, we assume that the gNB and UE are running on the same host so the specified address (127.0.0.1) is the one of the loopback interface.
diff --git a/radio/rfsimulator/README.md b/radio/rfsimulator/README.md
index e3070538daaeac971873653b7b675181f984a3d9..357e70e5a6909fc7925d8c18efd980fcac222ab0 100644
--- a/radio/rfsimulator/README.md
+++ b/radio/rfsimulator/README.md
@@ -136,7 +136,7 @@ Notes:
* `scp usera@machineA:/the/path/where/you/launched/nr-softmodem/r*config.raw userb@machineB:/the/path/where/you/will/launch/nr-uesoftmodem/`
* Obviously this operation SHALL be done before launching the `nr-uesoftmodem` executable.
4. To enable the noS1 mode, `--noS1` option should be added to the command line.
-5. To operate the gNB/UE with a 5GC, start them using the `--sa` option. More information can be found [here](../../../doc/TESTING_5GSA_setup.md#2-sa-setup-with-oai-nr-ue-softmodem).
+5. To operate the gNB/UE with a 5GC, start them using the `--sa` option. More information can be found [here](../../../doc/NR_SA_Tutorial_OAI_CN5G.md).
In the UE, you can add `-d` option to get the softscope.