diff --git a/common/config/config_load_configmodule.c b/common/config/config_load_configmodule.c
index a6682f6eea..7bd3ea6951 100644
--- a/common/config/config_load_configmodule.c
+++ b/common/config/config_load_configmodule.c
@@ -45,8 +45,6 @@
 #define CONFIG_SHAREDLIBFORMAT "libparams_%s.so"
 #include "nfapi/oai_integration/vendor_ext.h"
 
-extern uint8_t nfapi_mode;
-
 int load_config_sharedlib(configmodule_interface_t *cfgptr) {
   void *lib_handle;
   char fname[128];
@@ -215,16 +213,6 @@ configmodule_interface_t *load_configmodule(int argc,
       tmpflags = CONFIG_HELP;
     }
 
-    // if( strcmp(argv[i], "--vnf") == 0 ){
-    //   printf("\nVNF ENABLED\n");
-    //   nfapi_mode = NFAPI_MODE_VNF;
-    // }
-
-    //  if( strcmp(argv[i], "--pnf") == 0 ){
-    //   printf("\nPNF ENABLED\n");
-    //   nfapi_mode = NFAPI_MODE_PNF;
-    // }
-
   }
 
   /* look for the OAI_CONFIGMODULE environment variable */
diff --git a/doc/testing_gnb_w_cots_ue_resources/gnb.conf b/doc/testing_gnb_w_cots_ue_resources/gnb.conf
index 3f697a08b0..c4a8d512b8 100755
--- a/doc/testing_gnb_w_cots_ue_resources/gnb.conf
+++ b/doc/testing_gnb_w_cots_ue_resources/gnb.conf
@@ -212,11 +212,8 @@ gNBs =
     enable_x2 = "yes";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
-<<<<<<< HEAD
-=======
     t_dc_prep         = 1000;      /* unit: millisecond */
     t_dc_overall      = 2000;      /* unit: millisecond */
->>>>>>> fork_develop_new
     target_enb_x2_ip_address      = (
                                      { ipv4       = "192.168.18.199";
                                        ipv6       = "192:168:30::17";
diff --git a/executables/ocp-gnb.c b/executables/ocp-gnb.c
index 64e8b60a2a..67f68f43e3 100644
--- a/executables/ocp-gnb.c
+++ b/executables/ocp-gnb.c
@@ -955,7 +955,7 @@ int main( int argc, char **argv ) {
   AssertFatal(nfapi_mode < 3,"");
   printf("NFAPI MODE:%s\n", nfapi_mode_str[nfapi_mode]);
 
-  if (nfapi_mode==2) // VNF
+  if (nfapi_mode==NFAPI_MODE_VNF) // VNF
     wait_nfapi_init("main?");
 
   for (int i=0; i<RC.nb_nr_L1_inst; i++)
@@ -964,7 +964,7 @@ int main( int argc, char **argv ) {
   printf("About to Init RU threads RC.nb_RU:%d\n", RC.nb_RU);
   config_sync_var=0;
 
-  if (nfapi_mode==1) { // PNF
+  if (nfapi_mode==NFAPI_MODE_PNF) { // PNF
     wait_nfapi_init("main?");
   }
 
diff --git a/nfapi/oai_integration/nfapi_pnf.c b/nfapi/oai_integration/nfapi_pnf.c
index c9589c19c8..82a16819c4 100644
--- a/nfapi/oai_integration/nfapi_pnf.c
+++ b/nfapi/oai_integration/nfapi_pnf.c
@@ -2305,10 +2305,7 @@ void *pnf_nr_start_thread(void *ptr) {
 
 void configure_nr_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_addr, int pnf_p7_port, int vnf_p7_port) {
   printf("%s() PNF\n\n\n\n\n\n", __FUNCTION__);
-
-  if(NFAPI_MODE!=NFAPI_UE_STUB_PNF) {
     nfapi_setmode(NFAPI_MODE_PNF);  // PNF!
-  }
 
   nfapi_pnf_config_t *config = nfapi_pnf_config_create();
   config->vnf_ip_addr = vnf_ip_addr;
diff --git a/openair1/SCHED_NR/fapi_nr_l1.c b/openair1/SCHED_NR/fapi_nr_l1.c
index b03a6b2e17..2c7f7d82d5 100644
--- a/openair1/SCHED_NR/fapi_nr_l1.c
+++ b/openair1/SCHED_NR/fapi_nr_l1.c
@@ -242,7 +242,7 @@ if(NFAPI_MODE != NFAPI_MODE_VNF)
 //  if (NFAPI_MODE != NFAPI_MONOLITHIC && Sched_INFO->UL_dci_req->numPdus!=0)
 //   {
 //     oai_nfapi_ul_dci_req(Sched_INFO->UL_dci_req);
-//   }//Only DL
+//   }//Only DL in nFAPI mode
  
   if (NFAPI_MODE != NFAPI_MONOLITHIC) 
   { if(Sched_INFO->DL_req->dl_tti_request_body.nPDUs>0)
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
index 674c6f30e6..3b460c4bec 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
@@ -362,7 +362,7 @@ gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
     nr_rrc_trigger(&ctxt, 0 /*CC_id*/, frame, slot >> *scc->ssbSubcarrierSpacing);
   }
 
-  const uint64_t dlsch_in_slot_bitmap = (1 << 1) | (1 << 3);
+  const uint64_t dlsch_in_slot_bitmap = (1 << 1) | (1 << 3);//In nFAPI mode dlsch needs to be scheduled in even slots
   const uint64_t ulsch_in_slot_bitmap = (1 << 8);
 
   memset(RC.nrmac[module_idP]->cce_list[bwp_id][0],0,MAX_NUM_CCE*sizeof(int)); // coreset0
@@ -378,7 +378,8 @@ gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
     const int last_slot = (slot + num_slots - 1) % num_slots;
     uint16_t *vrb_map_UL = cc[CC_id].vrb_map_UL;
     memset(&vrb_map_UL[last_slot * 275], 0, sizeof(uint16_t) * 275);
-
+    if(NFAPI_MODE == NFAPI_MODE_VNF)
+    memset(&vrb_map_UL[8 * 275],0,sizeof(uint16_t) * 275);// vrb_map_UL is not getting cleared for even slots in nFAPI mode
     clear_nr_nfapi_information(RC.nrmac[module_idP], CC_id, frame, slot);
   }
   
@@ -423,6 +424,7 @@ gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
   if (slot < 10) {
      if(NFAPI_MODE == NFAPI_MODE_VNF){
     gNB->UL_tti_req_ahead[0][8].SFN = frame;//Added to set the UL_tti_req_ahead SFN in VNF mode
+    gNB->UL_tti_req[0] = &gNB->UL_tti_req_ahead[0][slot];
     }
     nr_schedule_ulsch(module_idP, frame, slot, num_slots_per_tdd, nr_ulmix_slots, ulsch_in_slot_bitmap);
   }