diff --git a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/server/master/scheduler/ResourceClusterAwareSchedulerActor.java b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/server/master/scheduler/ResourceClusterAwareSchedulerActor.java
index 70d6e5fea..9e164466b 100644
--- a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/server/master/scheduler/ResourceClusterAwareSchedulerActor.java
+++ b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/server/master/scheduler/ResourceClusterAwareSchedulerActor.java
@@ -133,19 +133,6 @@ public Receive createReceive() {
             .build();
     }
 
-    /**
-     *
-     *
-     *
-     *
-     *
-     *
-     * BATCH
-     *
-     *
-     *
-     *
-     */
     private void onBatchScheduleRequestEvent(BatchScheduleRequestEvent event) {
         log.info("[fdc-91] onBatchScheduleRequestEvent! Event: {}", event);
 
@@ -195,20 +182,6 @@ private void onFailedToBatchScheduleRequestEvent(FailedToBatchScheduleRequestEve
         }
     }
 
-    /**
-     *
-     *
-     *
-     *
-     *
-     *
-     * SINGLE
-     *
-     *
-     *
-     *
-     *
-     */
     private void onScheduleRequestEvent(ScheduleRequestEvent event) {
         if (event.isRetry()) {
             log.info("Retrying Schedule Request {}, attempt {}", event.getRequest(),
@@ -223,7 +196,6 @@ private void onScheduleRequestEvent(ScheduleRequestEvent event) {
                 .<Object>thenApply(event::onAssignment)
                 .exceptionally(event::onFailure);
 
-        // TODO: not sure if the List<AssignedScheduleRequestEvent> will work honestly...
         pipe(assignedFuture, getContext().getDispatcher()).to(self());
     }
 
@@ -490,14 +462,6 @@ FailedToScheduleRequestEvent onFailure(Throwable throwable) {
         AssignedScheduleRequestEvent onAssignment(TaskExecutorID taskExecutorID) {
             return new AssignedScheduleRequestEvent(this, taskExecutorID);
         }
-
-//        List<TaskExecutorAllocationRequest> getTaskExecutorAllocationRequests() {
-//            return request
-//                .getScheduleRequests()
-//                .stream()
-//                .map(req -> TaskExecutorAllocationRequest.of(req.getWorkerId(), req.getMachineDefinition(), req.getJobMetadata(), req.getStageNum()))
-//                .collect(Collectors.toList());
-//        }
     }
 
     @Value
@@ -522,12 +486,6 @@ private ScheduleRequestEvent onRetry() {
         }
     }
 
-    @Value
-    private static class AssignmentScheduleRequest {
-        public ScheduleRequest scheduleRequest;
-        public TaskExecutorID taskExecutorID;
-    }
-
     @Value
     private static class AssignedBatchScheduleRequestEvent {
 
@@ -575,7 +533,6 @@ private static class FailedToSubmitScheduleRequestEvent {
 
     @Value
     static class CancelRequestEvent {
-        // TODO: understand if we need a batch cancel...
 
         WorkerId workerId;
         int attempt;
@@ -605,15 +562,6 @@ static CancelBatchRequestEvent of(String jobId) {
 //        }
     }
 
-    @Value
-    static class MarkJobAsStartedRequestEvent {
-        String jobId;
-
-        static MarkJobAsStartedRequestEvent of(String jobId) {
-            return new MarkJobAsStartedRequestEvent(jobId);
-        }
-    }
-
     @Value
     private static class RetryCancelRequestEvent {