diff --git a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts
index f56852c97e..f8d904e900 100644
--- a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts
+++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts
@@ -17,7 +17,7 @@ export class GeneratePasswordToClipboardCommand {
     private autofillSettingsService: AutofillSettingsServiceAbstraction,
     private taskSchedulerService?: BrowserTaskSchedulerService,
   ) {
-    void this.taskSchedulerService?.registerTaskHandler(
+    this.taskSchedulerService?.registerTaskHandler(
       ScheduledTaskNames.generatePasswordClearClipboardTimeout,
       () => ClearClipboard.run(),
     );
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 9488ad0153..9a347ae747 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -516,7 +516,7 @@ export default class MainBackground {
         this.logService,
         this.stateProvider,
       );
-      void this.taskSchedulerService.registerTaskHandler(
+      this.taskSchedulerService.registerTaskHandler(
         ScheduledTaskNames.scheduleNextSyncInterval,
         () => this.fullSync(),
       );
diff --git a/apps/browser/src/platform/services/browser-task-scheduler.service.ts b/apps/browser/src/platform/services/browser-task-scheduler.service.ts
index 6f7945b95e..1ea024521f 100644
--- a/apps/browser/src/platform/services/browser-task-scheduler.service.ts
+++ b/apps/browser/src/platform/services/browser-task-scheduler.service.ts
@@ -29,8 +29,11 @@ export class BrowserTaskSchedulerServiceImplementation
   private activeAlarmsState: GlobalState<ActiveAlarm[]>;
   readonly activeAlarms$: Observable<ActiveAlarm[]>;
 
-  constructor(logService: LogService, stateProvider: StateProvider) {
-    super(logService, stateProvider);
+  constructor(
+    logService: LogService,
+    private stateProvider: StateProvider,
+  ) {
+    super(logService);
 
     this.activeAlarmsState = this.stateProvider.getGlobal(ACTIVE_ALARMS);
     this.activeAlarms$ = this.activeAlarmsState.state$.pipe(
@@ -420,7 +423,7 @@ export class BrowserTaskSchedulerServiceImplementation
    *
    * @param alarmName - The name of the alarm to get.
    */
-  private async getAlarm(alarmName: string): Promise<chrome.alarms.Alarm> {
+  private getAlarm(alarmName: string): Promise<chrome.alarms.Alarm> {
     if (this.isNonChromeEnvironment()) {
       return browser.alarms.get(alarmName);
     }
diff --git a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
index 23591b0c55..9c706b6762 100644
--- a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
+++ b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
@@ -121,7 +121,7 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
     this.authRequestPushNotificationState = this.stateProvider.get(
       AUTH_REQUEST_PUSH_NOTIFICATION_KEY,
     );
-    void this.taskSchedulerService?.registerTaskHandler(
+    this.taskSchedulerService?.registerTaskHandler(
       ScheduledTaskNames.loginStrategySessionTimeout,
       () => this.clearCache(),
     );
diff --git a/libs/common/src/platform/abstractions/task-scheduler.service.ts b/libs/common/src/platform/abstractions/task-scheduler.service.ts
index de3bead0e0..2aef19200c 100644
--- a/libs/common/src/platform/abstractions/task-scheduler.service.ts
+++ b/libs/common/src/platform/abstractions/task-scheduler.service.ts
@@ -1,7 +1,4 @@
 import { ScheduledTaskName } from "../enums/scheduled-task-name.enum";
-import { StateProvider } from "../state";
-
-import { LogService } from "./log.service";
 
 export type TaskIdentifier = {
   taskName?: ScheduledTaskName;
@@ -10,10 +7,6 @@ export type TaskIdentifier = {
 };
 
 export abstract class TaskSchedulerService {
-  constructor(
-    protected logService: LogService,
-    protected stateProvider: StateProvider,
-  ) {}
   protected taskHandlers: Map<string, () => void>;
   abstract setTimeout(
     taskName: ScheduledTaskName,
diff --git a/libs/common/src/platform/services/default-task-scheduler.service.ts b/libs/common/src/platform/services/default-task-scheduler.service.ts
index 12c45489f2..9ad7bdbda4 100644
--- a/libs/common/src/platform/services/default-task-scheduler.service.ts
+++ b/libs/common/src/platform/services/default-task-scheduler.service.ts
@@ -1,11 +1,10 @@
 import { LogService } from "../abstractions/log.service";
 import { TaskIdentifier, TaskSchedulerService } from "../abstractions/task-scheduler.service";
 import { ScheduledTaskName } from "../enums/scheduled-task-name.enum";
-import { StateProvider } from "../state";
 
 export class DefaultTaskSchedulerService extends TaskSchedulerService {
-  constructor(logService: LogService, stateProvider: StateProvider) {
-    super(logService, stateProvider);
+  constructor(protected logService: LogService) {
+    super();
 
     this.taskHandlers = new Map();
   }
diff --git a/libs/common/src/platform/services/system.service.ts b/libs/common/src/platform/services/system.service.ts
index d7cf79cc38..f0c67ce61a 100644
--- a/libs/common/src/platform/services/system.service.ts
+++ b/libs/common/src/platform/services/system.service.ts
@@ -32,7 +32,7 @@ export class SystemService implements SystemServiceAbstraction {
     private accountService: AccountService,
     private taskSchedulerService?: TaskSchedulerService,
   ) {
-    void this.taskSchedulerService?.registerTaskHandler(
+    this.taskSchedulerService?.registerTaskHandler(
       ScheduledTaskNames.systemClearClipboardTimeout,
       () => this.clearPendingClipboard(),
     );
diff --git a/libs/common/src/services/event/event-upload.service.ts b/libs/common/src/services/event/event-upload.service.ts
index 504a4c0717..afbeb04123 100644
--- a/libs/common/src/services/event/event-upload.service.ts
+++ b/libs/common/src/services/event/event-upload.service.ts
@@ -23,9 +23,8 @@ export class EventUploadService implements EventUploadServiceAbstraction {
     private authService: AuthService,
     private taskSchedulerService?: TaskSchedulerService,
   ) {
-    void this.taskSchedulerService?.registerTaskHandler(
-      ScheduledTaskNames.eventUploadsInterval,
-      () => this.uploadEvents(),
+    this.taskSchedulerService?.registerTaskHandler(ScheduledTaskNames.eventUploadsInterval, () =>
+      this.uploadEvents(),
     );
   }
 
diff --git a/libs/common/src/services/notifications.service.ts b/libs/common/src/services/notifications.service.ts
index fa28ba6737..bbfe82c33a 100644
--- a/libs/common/src/services/notifications.service.ts
+++ b/libs/common/src/services/notifications.service.ts
@@ -46,7 +46,7 @@ export class NotificationsService implements NotificationsServiceAbstraction {
     private messagingService: MessagingService,
     private taskSchedulerService?: TaskSchedulerService,
   ) {
-    void this.taskSchedulerService?.registerTaskHandler(
+    this.taskSchedulerService?.registerTaskHandler(
       ScheduledTaskNames.notificationsReconnectTimeout,
       () => this.reconnect(this.isSyncingOnReconnect),
     );
diff --git a/libs/common/src/services/vault-timeout/vault-timeout.service.ts b/libs/common/src/services/vault-timeout/vault-timeout.service.ts
index 1930648257..e385fbe949 100644
--- a/libs/common/src/services/vault-timeout/vault-timeout.service.ts
+++ b/libs/common/src/services/vault-timeout/vault-timeout.service.ts
@@ -40,7 +40,7 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
     private loggedOutCallback: (expired: boolean, userId?: string) => Promise<void> = null,
     private taskSchedulerService?: TaskSchedulerService,
   ) {
-    void this.taskSchedulerService?.registerTaskHandler(
+    this.taskSchedulerService?.registerTaskHandler(
       ScheduledTaskNames.vaultTimeoutCheckInterval,
       () => this.checkVaultTimeout(),
     );
diff --git a/libs/common/src/vault/services/fido2/fido2-client.service.ts b/libs/common/src/vault/services/fido2/fido2-client.service.ts
index 228ceddc2d..052d4ee9b4 100644
--- a/libs/common/src/vault/services/fido2/fido2-client.service.ts
+++ b/libs/common/src/vault/services/fido2/fido2-client.service.ts
@@ -63,9 +63,8 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction {
     private taskSchedulerService?: TaskSchedulerService,
     private logService?: LogService,
   ) {
-    void this.taskSchedulerService?.registerTaskHandler(
-      ScheduledTaskNames.fido2ClientAbortTimeout,
-      () => this.timeoutAbortController?.abort(),
+    this.taskSchedulerService?.registerTaskHandler(ScheduledTaskNames.fido2ClientAbortTimeout, () =>
+      this.timeoutAbortController?.abort(),
     );
   }