diff --git a/desktop/app/src/devices/BaseDevice.tsx b/desktop/app/src/devices/BaseDevice.tsx
index 59fcff3f2..27833d25f 100644
--- a/desktop/app/src/devices/BaseDevice.tsx
+++ b/desktop/app/src/devices/BaseDevice.tsx
@@ -126,12 +126,6 @@ export default class BaseDevice {
     };
   }
 
-  teardown() {
-    for (const instance of this.sandyPluginStates.values()) {
-      instance.destroy();
-    }
-  }
-
   addLogListener(callback: DeviceLogListener): Symbol {
     const id = Symbol();
     this.logListeners.set(id, callback);
diff --git a/desktop/app/src/reducers/connections.tsx b/desktop/app/src/reducers/connections.tsx
index beb96e740..2ea1d1339 100644
--- a/desktop/app/src/reducers/connections.tsx
+++ b/desktop/app/src/reducers/connections.tsx
@@ -218,7 +218,7 @@ export default (state: State = INITAL_STATE, action: Actions): State => {
             if (!deviceSerials.has(device.serial)) {
               return true;
             } else {
-              device.teardown();
+              device.destroy();
               return false;
             }
           });
diff --git a/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx b/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx
index 099c7235f..b5ee23cf2 100644
--- a/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx
+++ b/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx
@@ -31,7 +31,6 @@ import Client from '../../Client';
 import {State} from '../../reducers';
 import {brandColors, brandIcons, colors} from '../../ui/components/colors';
 import {showEmulatorLauncher} from './LaunchEmulator';
-import ArchivedDevice from '../../devices/ArchivedDevice';
 
 const {Text, Link, Title} = Typography;