diff --git a/api/src/main/java/org/openmrs/module/ipd/api/scheduler/tasks/RollOverNonMedicationTasks.java b/api/src/main/java/org/openmrs/module/ipd/api/scheduler/tasks/RollOverNonMedicationTasks.java
index 3d6952a..ed8c586 100644
--- a/api/src/main/java/org/openmrs/module/ipd/api/scheduler/tasks/RollOverNonMedicationTasks.java
+++ b/api/src/main/java/org/openmrs/module/ipd/api/scheduler/tasks/RollOverNonMedicationTasks.java
@@ -1,21 +1,17 @@
 package org.openmrs.module.ipd.api.scheduler.tasks;
 
+import org.openmrs.api.context.Context;
 import org.openmrs.module.ipd.api.events.IPDEventManager;
 import org.openmrs.module.ipd.api.events.model.IPDEvent;
 import org.openmrs.module.ipd.api.events.model.IPDEventType;
 import org.openmrs.scheduler.tasks.AbstractTask;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
 
 
-public class RollOverNonMedicationTasks extends AbstractTask implements ApplicationContextAware {
-
-    private static ApplicationContext context;
+public class RollOverNonMedicationTasks extends AbstractTask {
 
     @Override
     public void execute() {
-        IPDEventManager eventManager = context.getBean(IPDEventManager.class);
+        IPDEventManager eventManager = Context.getRegisteredComponents(IPDEventManager.class).get(0);
         IPDEventType eventType = eventManager.getEventTypeForEncounter(String.valueOf(IPDEventType.ROLLOVER_TASK));
         if (eventType != null) {
             IPDEvent ipdEvent = new IPDEvent(null, null, eventType);
@@ -23,8 +19,4 @@ public void execute() {
         }
     }
 
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) {
-        this.context = applicationContext;
-    }
 }
diff --git a/api/src/main/java/org/openmrs/module/ipd/api/scheduler/tasks/ShiftStartTasks.java b/api/src/main/java/org/openmrs/module/ipd/api/scheduler/tasks/ShiftStartTasks.java
index 0a72fe7..0010a2c 100644
--- a/api/src/main/java/org/openmrs/module/ipd/api/scheduler/tasks/ShiftStartTasks.java
+++ b/api/src/main/java/org/openmrs/module/ipd/api/scheduler/tasks/ShiftStartTasks.java
@@ -1,20 +1,17 @@
 package org.openmrs.module.ipd.api.scheduler.tasks;
 
+import org.openmrs.api.context.Context;
 import org.openmrs.module.ipd.api.events.IPDEventManager;
 import org.openmrs.module.ipd.api.events.model.IPDEvent;
 import org.openmrs.module.ipd.api.events.model.IPDEventType;
 import org.openmrs.scheduler.tasks.AbstractTask;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
 
 
-public class ShiftStartTasks extends AbstractTask implements ApplicationContextAware {
+public class ShiftStartTasks extends AbstractTask {
 
-    private static ApplicationContext context;
     @Override
     public void execute() {
-        IPDEventManager eventManager = context.getBean(IPDEventManager.class);
+        IPDEventManager eventManager = Context.getRegisteredComponents(IPDEventManager.class).get(0);
         IPDEventType eventType = eventManager.getEventTypeForEncounter(String.valueOf(IPDEventType.SHIFT_START_TASK));
         if (eventType != null) {
             IPDEvent ipdEvent = new IPDEvent(null, null, eventType);
@@ -22,8 +19,4 @@ public void execute() {
         }
     }
 
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) {
-        this.context = applicationContext;
-    }
 }