diff --git a/src/extension.ts b/src/extension.ts
index 23df9ae2..dc9bbbf8 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -1,11 +1,6 @@
 import * as vscode from 'vscode';
 import * as prettyBytes from 'pretty-bytes';
-<<<<<<< Updated upstream
 import { extensions } from 'vscode';
-=======
-import { DiagnosticCollection, extensions } from 'vscode';
-import * as rta from 'roku-test-automation';
->>>>>>> Stashed changes
 import * as path from 'path';
 import * as fsExtra from 'fs-extra';
 import { util } from './util';
@@ -27,19 +22,11 @@ import { languageServerManager } from './LanguageServerManager';
 import { TelemetryManager } from './managers/TelemetryManager';
 import { RemoteControlManager } from './managers/RemoteControlManager';
 import { WhatsNewManager } from './managers/WhatsNewManager';
-<<<<<<< Updated upstream
 import { isChannelPublishedEvent, isChanperfEvent, isDiagnosticsEvent, isDebugServerLogOutputEvent, isLaunchStartEvent, isRendezvousEvent } from 'roku-debug';
 import { RtaManager } from './managers/RtaManager';
 import { WebviewViewProviderManager } from './managers/WebviewViewProviderManager';
 import { ViewProviderId } from './viewProviders/ViewProviderId';
-=======
-import { SceneGraphInspectorViewProvider } from './viewProviders/SceneGraphInspectorViewProvider';
-import { RokuCommandsViewProvider } from './viewProviders/RokuCommandsViewProvider';
-import { RokuRegistryViewProvider } from './viewProviders/RokuRegistryViewProvider';
-import type { BSDebugDiagnostic } from 'roku-debug';
-import { isChannelPublishedEvent, isChanperfEvent, isDiagnosticsEvent, isDebugServerLogOutputEvent, isLaunchStartEvent, isRendezvousEvent } from 'roku-debug';
 import { DiagnosticManager } from './managers/DiagnosticManager';
->>>>>>> Stashed changes
 
 const EXTENSION_ID = 'RokuCommunity.brightscript';
 
@@ -56,26 +43,10 @@ export class Extension {
     private telemetryManager: TelemetryManager;
     private remoteControlManager: RemoteControlManager;
     private brightScriptCommands: BrightScriptCommands;
-<<<<<<< Updated upstream
     private rtaManager: RtaManager;
     private webviewViewProviderManager: WebviewViewProviderManager;
-=======
     private diagnosticManager = new DiagnosticManager();
 
-    public odc?: rta.OnDeviceComponent;
-
-    private webviews = [{
-        constructor: SceneGraphInspectorViewProvider,
-        provider: undefined as SceneGraphInspectorViewProvider
-    }, {
-        constructor: RokuRegistryViewProvider,
-        provider: undefined as RokuRegistryViewProvider
-    }, {
-        constructor: RokuCommandsViewProvider,
-        provider: undefined as RokuCommandsViewProvider
-    }];
->>>>>>> Stashed changes
-
     public async activate(context: vscode.ExtensionContext) {
         const currentExtensionVersion = extensions.getExtension(EXTENSION_ID)?.packageJSON.version as string;
 
@@ -287,7 +258,7 @@ export class Extension {
             }
             for (const path in errorsByPath) {
                 if (errorsByPath.hasOwnProperty(path)) {
-                    await this.diagnosticManager.addDiagnosticForError(path, errorsByPath[path]).catch(() => {});
+                    await this.diagnosticManager.addDiagnosticForError(path, errorsByPath[path]).catch(() => { });
                 }
             }
         }