diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index 48be9ec905..3447bc6941 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -164,9 +164,6 @@ clean_all_files() {
  set_openair_env
  dir=$OPENAIR_DIR/cmake_targets
  rm -rf $dir/ran_build $dir/ran_build_noLOG
- rm -rf $dir/lte-simulators/build 
- rm -rf $dir/oaisim_build_oai/build $dir/oaisim_build_oai/CMakeLists.txt
- rm -rf $dir/autotests/bin $dir/autotests/log $dir/autotests/*/build
 }
 
 ############################################
diff --git a/common/utils/LOG/README.txt b/common/utils/LOG/README.txt
index d56c5a2661..2e95fa68ae 100644
--- a/common/utils/LOG/README.txt
+++ b/common/utils/LOG/README.txt
@@ -5,7 +5,6 @@ Signals may have two types:
 - Variables to dump the state of a variable (range 0..2^64 - 1).
 - Functions to log function usage (implies two call to VCD API: IN and OUT)
 
-This module is always built in, but is only used when -V oaisim option is added.
 The VCD file generated is called openair_vcd_dump.vcd and is located in the execution folder.
 
 Usage:
diff --git a/common/utils/T/DOC/T/basic.md b/common/utils/T/DOC/T/basic.md
index 5f1c977044..318bf157c3 100644
--- a/common/utils/T/DOC/T/basic.md
+++ b/common/utils/T/DOC/T/basic.md
@@ -56,9 +56,7 @@ softmodem to wait for a tracer. The default port is 2021.
 The option `--T_dont_fork` allows one to use gdb to debug problems
 with the softmodem. Note that you then may have some "zombie"
 processes after crashes, in which case you can run
-`sudo killall -9 lte-softmodem` to get rid of them (`lte-softmodem`
-to be replaced by the program you trace, like `lte-softmodem-nos1`
-or `oaisim`).
+`sudo killall -9 lte-softmodem` to get rid of them.
 
 The option `--T_stdout` also accepts values 0 (to disable output
 on the terminal and only use the T tracer) and 1 (to disable
diff --git a/common/utils/T/DOC/T/record.md b/common/utils/T/DOC/T/record.md
index c2e58e1e20..67782a0c10 100644
--- a/common/utils/T/DOC/T/record.md
+++ b/common/utils/T/DOC/T/record.md
@@ -11,7 +11,7 @@ to activate/deactivate specific traces):
 ./record -d ../T_messages.txt -o record.raw -ON -off VCD -off HEAVY -off LEGACY_GROUP_TRACE -off LEGACY_GROUP_DEBUG
 ```
 
-And then you run the program to trace (`lte-softmodem`, `oaisim`, whatever)
+And then you run the program to trace (`lte-softmodem`, `nr-softmodem`, whatever)
 as explained in [basic usage](./basic.md).
 
 To stop the recording, you simply press `control+c` to end `record`.
diff --git a/common/utils/T/DOC/T/replay.md b/common/utils/T/DOC/T/replay.md
index 2390d177f6..c1af2321e2 100644
--- a/common/utils/T/DOC/T/replay.md
+++ b/common/utils/T/DOC/T/replay.md
@@ -5,7 +5,7 @@ First, read the [basic usage](./basic.md) to compile things.
 Then, read [record](./record.md) to know how to record a trace.
 
 To replay, you use the `replay` program. It will act
-as a *tracee* (`lte-softmodem`, `oaisim`, etc.).
+as a *tracee* (`lte-softmodem`, `nr-softmodem`, etc.).
 
 Then you use your usual tracer, eg. `enb` or `textlog`.
 
diff --git a/doc/L1SIM.md b/doc/L1SIM.md
index eef27540fa..bbe527cd29 100644
--- a/doc/L1SIM.md
+++ b/doc/L1SIM.md
@@ -4,12 +4,8 @@
 Rather, you are probably looking for the
 [RFsimulator](../radio/rfsimulator/README.md)!**
 
-oaisim has been scraped and replaced by the same programs that are used for the
-real-time operation, `lte-softmodem` and `lte-uesoftmodem`. This uses the IF4p5
-fronthaul protocol to achieve the communication.
-
-> Context: oaisim used to be a simulation mode inside OAI to emulate an eNB and
-multiple UEs.
+`lte-softmodem` and `lte-uesoftmodem` can use the IF4p5 fronthaul protocol to
+communicate with each other.
 
 [[_TOC_]]
 
@@ -50,7 +46,7 @@ $ cd ../ran_build/build
 $ sudo ./lte-uesoftmodem -O XXX.conf -r 25 --siml1 --noS1
 ```
 
-That should give you equivalent functionality to what you had with oaisim including noise and RF channel emulation (path loss / fading, etc.). You should also be able to run multiple UEs. 
+That should give you functionality to do noise and RF channel emulation (path loss / fading, etc.). You should also be able to run multiple UEs.
 
 ## How to ping an eNB from a UE and vice versa (with the noS1 option)
 
diff --git a/openair3/NAS/UE/UEprocess.c b/openair3/NAS/UE/UEprocess.c
index 2a38c6a461..41ac5d5dde 100644
--- a/openair3/NAS/UE/UEprocess.c
+++ b/openair3/NAS/UE/UEprocess.c
@@ -393,7 +393,6 @@ static void _nas_clean(user_api_id_t *user_api_id, int net_fd)
 
   LOG_TRACE (INFO, "UE-MAIN   - Perform EMM and ESM cleanup");
   // FIXME nas_network_cleanup depends on nas_user_t
-  // Why this program should interfere like that with oaisim ?
   //nas_network_cleanup ();
 
   LOG_TRACE (INFO, "UE-MAIN   - "