diff --git a/bsp_hosted/scheduling.cpp b/bsp_hosted/scheduling.cpp
index 469d7f38..ba393e3a 100644
--- a/bsp_hosted/scheduling.cpp
+++ b/bsp_hosted/scheduling.cpp
@@ -185,14 +185,10 @@ void scheduling::initTasks() {
   }
 #endif /* OBSW_ADD_TEST_CODE == 1 */
 
-<<<<<<< HEAD
-  PeriodicTaskIF* tcsTask = factory->createPeriodicTask(
-      "TCS_TASK", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.5, missedDeadlineFunc);
-  scheduling::scheduleTmpTempSensors(tcsTask);
-  scheduling::scheduleRtdSensors(tcsTask);
-=======
   PeriodicTaskIF* dummyTask = factory->createPeriodicTask(
 		  "DUMMY_TASK", 30, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, missedDeadlineFunc);
+  scheduling::scheduleTmpTempSensors(dummyTask);
+  scheduling::scheduleRtdSensors(dummyTask);
   dummyTask->addComponent(objects::SUS_0_N_LOC_XFYFZM_PT_XF);
   dummyTask->addComponent(objects::SUS_1_N_LOC_XBYFZM_PT_XB);
   dummyTask->addComponent(objects::SUS_2_N_LOC_XFYBZB_PT_YB);
@@ -205,23 +201,6 @@ void scheduling::initTasks() {
   dummyTask->addComponent(objects::SUS_9_R_LOC_XBYBZB_PT_YF);
   dummyTask->addComponent(objects::SUS_10_N_LOC_XMYBZF_PT_ZF);
   dummyTask->addComponent(objects::SUS_11_R_LOC_XBYMZB_PT_ZB);
-  dummyTask->addComponent(objects::RTD_0_IC3_PLOC_HEATSPREADER);
-  dummyTask->addComponent(objects::RTD_1_IC4_PLOC_MISSIONBOARD);
-  dummyTask->addComponent(objects::RTD_2_IC5_4K_CAMERA);
-  dummyTask->addComponent(objects::RTD_3_IC6_DAC_HEATSPREADER);
-  dummyTask->addComponent(objects::RTD_4_IC7_STARTRACKER);
-  dummyTask->addComponent(objects::RTD_5_IC8_RW1_MX_MY);
-  dummyTask->addComponent(objects::RTD_6_IC9_DRO);
-  dummyTask->addComponent(objects::RTD_7_IC10_SCEX);
-  dummyTask->addComponent(objects::RTD_8_IC11_X8);
-  dummyTask->addComponent(objects::RTD_9_IC12_HPA);
-  dummyTask->addComponent(objects::RTD_10_IC13_PL_TX);
-  dummyTask->addComponent(objects::RTD_11_IC14_MPA);
-  dummyTask->addComponent(objects::RTD_12_IC15_ACU);
-  dummyTask->addComponent(objects::RTD_13_IC16_PLPCDU_HEATSPREADER);
-  dummyTask->addComponent(objects::RTD_14_IC17_TCS_BOARD);
-  dummyTask->addComponent(objects::RTD_15_IC18_IMTQ);
->>>>>>> origin/develop
 
   sif::info << "Starting tasks.." << std::endl;
   tmtcDistributor->startTask();
@@ -236,11 +215,7 @@ void scheduling::initTasks() {
 
   pstTask->startTask();
   thermalTask->startTask();
-<<<<<<< HEAD
-  tcsTask->startTask();
-=======
   dummyTask->startTask();
->>>>>>> origin/develop
 #if OBSW_ADD_PLOC_SUPERVISOR == 1
   supvHelperTask->startTask();
 #endif