diff --git a/src/accessories/controlUnit.ts b/src/accessories/controlUnit.ts
index 219ea31..f6def08 100644
--- a/src/accessories/controlUnit.ts
+++ b/src/accessories/controlUnit.ts
@@ -1,4 +1,4 @@
-import { PlatformAccessory, RemoteController, Service } from "homebridge";
+import { PlatformAccessory, Service } from "homebridge";
 import { IActivity } from "../models/config";
 import { Platform } from "../platform";
 import { ActivityService } from "../services/activityService";
diff --git a/src/dataProviders/harmonyDataProvider.ts b/src/dataProviders/harmonyDataProvider.ts
index b88a169..17ae67f 100644
--- a/src/dataProviders/harmonyDataProvider.ts
+++ b/src/dataProviders/harmonyDataProvider.ts
@@ -6,7 +6,6 @@ import { IDeviceConfig } from "../models/config/deviceConfig";
 import { IHub } from "../models/config/hub";
 import { HarmonyDevice } from "../models/harmonyDevice";
 import { HarmonyHub } from "../models/harmonyHub";
-import { sleep } from "../util";
 
 @injectable()
 export class HarmonyDataProvider {
diff --git a/src/dataProviders/stateDataProvider.ts b/src/dataProviders/stateDataProvider.ts
index e00860b..f4d89b8 100644
--- a/src/dataProviders/stateDataProvider.ts
+++ b/src/dataProviders/stateDataProvider.ts
@@ -1,4 +1,4 @@
-import { inject, injectable } from "tsyringe";
+import { injectable } from "tsyringe";
 import { IActivityState } from "../models/activityState";
 import { IActivity } from "../models/config";
 
diff --git a/src/services/activityService.ts b/src/services/activityService.ts
index 4dca0fb..8549684 100644
--- a/src/services/activityService.ts
+++ b/src/services/activityService.ts
@@ -100,19 +100,21 @@ export class ActivityService {
       let currentOtherState: IActivityState =
         this._stateDataProvider.states[controlUnitKey]!;
 
-      if (currentOtherState) {
-        currentOtherState.currentActivity.DeviceSetupList.forEach(
-          (value: IDeviceSetupItem) => {
-            //there are devices to remove
-            if (devicesToTurnOn.some((e) => e && e.name === value.DeviceName)) {
-              let deviceToRemove: HarmonyDevice = devicesToTurnOn.filter(
-                (i) => i.name === value.DeviceName
-              )[0];
-              delete devicesToTurnOn[devicesToTurnOn.indexOf(deviceToRemove)];
-            }
-          }
-        );
+      if (!currentOtherState) {
+        return devicesToTurnOn;
       }
+
+      currentOtherState.currentActivity.DeviceSetupList.forEach(
+        (value: IDeviceSetupItem) => {
+          //there are devices to remove
+          if (devicesToTurnOn.some((e) => e && e.name === value.DeviceName)) {
+            let deviceToRemove: HarmonyDevice = devicesToTurnOn.filter(
+              (i) => i.name === value.DeviceName
+            )[0];
+            delete devicesToTurnOn[devicesToTurnOn.indexOf(deviceToRemove)];
+          }
+        }
+      );
     }
 
     return devicesToTurnOn;