diff --git a/ui/src/app/shared/services/extensions-service.ts b/ui/src/app/shared/services/extensions-service.ts
index 24362aab2d989..91758503c6af4 100644
--- a/ui/src/app/shared/services/extensions-service.ts
+++ b/ui/src/app/shared/services/extensions-service.ts
@@ -1,14 +1,12 @@
 import * as React from 'react';
 import * as minimatch from 'minimatch';
 
-import {Application, ApplicationSet, ApplicationTree, State} from '../models';
+import {AbstractApplicationTree, Application, ApplicationSet, ApplicationTree, State} from '../models';
 
 const extensions = {
     resourceExtentions: new Array<ResourceTabExtension>(),
-    // appSetResourceExtentions: new Array<AppSetResourceTabExtension>(),
     systemLevelExtensions: new Array<SystemLevelExtension>(),
     appViewExtensions: new Array<AppViewExtension>(),
-    // appSetViewExtensions: new Array<AppSetViewExtension>(),
     statusPanelExtensions: new Array<StatusPanelExtension>()
 };
 
@@ -24,10 +22,6 @@ function registerAppViewExtension(component: ExtensionComponent, title: string,
     extensions.appViewExtensions.push({component, title, icon});
 }
 
-// function registerAppSetViewExtension(component: AppSetExtensionComponent, title: string, icon: string) {
-//     extensions.appSetViewExtensions.push({component, title, icon});
-// }
-
 function registerStatusPanelExtension(component: StatusPanelExtensionComponent, title: string, id: string, flyout?: ExtensionComponent) {
     extensions.statusPanelExtensions.push({component, flyout, title, id});
 }
@@ -54,14 +48,6 @@ export interface ResourceTabExtension {
     icon?: string;
 }
 
-// export interface AppSetResourceTabExtension {
-//     title: string;
-//     group: string;
-//     kind: string;
-//     component: AppSetExtensionComponent;
-//     icon?: string;
-// }
-
 export interface SystemLevelExtension {
     title: string;
     component: SystemExtensionComponent;
@@ -75,12 +61,6 @@ export interface AppViewExtension {
     icon?: string;
 }
 
-// export interface AppSetViewExtension {
-//     component: AppSetViewExtensionComponent;
-//     title: string;
-//     icon?: string;
-// }
-
 export interface StatusPanelExtension {
     component: StatusPanelExtensionComponent;
     flyout?: StatusPanelExtensionFlyoutComponent;
@@ -89,10 +69,8 @@ export interface StatusPanelExtension {
 }
 
 export type ExtensionComponent = React.ComponentType<AbstractExtensionComponentProps>;
-// export type AppSetExtensionComponent = React.ComponentType<AppSetExtensionComponentProps>;
 export type SystemExtensionComponent = React.ComponentType;
 export type AppViewExtensionComponent = React.ComponentType<AbstractViewComponentProps>;
-// export type AppSetViewExtensionComponent = React.ComponentType<AppSetViewComponentProps>;
 export type StatusPanelExtensionComponent = React.ComponentType<StatusPanelComponentProps>;
 export type StatusPanelExtensionFlyoutComponent = React.ComponentType<StatusPanelFlyoutProps>;
 
@@ -100,10 +78,6 @@ export interface Extension {
     component: ExtensionComponent;
 }
 
-// export interface AppSetExtension {
-//     component: AppSetExtensionComponent;
-// }
-
 export interface AbstractExtensionComponentProps {
     resource: State;
     tree: ApplicationTree;
@@ -138,7 +112,7 @@ export interface StatusPanelComponentProps {
 
 export interface StatusPanelFlyoutProps {
     application: ApplicationSet | Application;
-    tree: ApplicationTree;
+    tree: AbstractApplicationTree;
 }
 
 export class ExtensionsService {
@@ -148,12 +122,6 @@ export class ExtensionsService {
         return items.sort((a, b) => a.title.localeCompare(b.title));
     }
 
-    // public getAppSetResourceTabs(group: string, kind: string): AppSetResourceTabExtension[] {
-    //     initLegacyExtensions();
-    //     const items = extensions.appSetResourceExtentions.filter(extension => minimatch(group, extension.group) && minimatch(kind, extension.kind)).slice();
-    //     return items.sort((a, b) => a.title.localeCompare(b.title));
-    // }
-
     public getSystemExtensions(): SystemLevelExtension[] {
         return extensions.systemLevelExtensions.slice();
     }
@@ -162,10 +130,6 @@ export class ExtensionsService {
         return extensions.appViewExtensions.slice();
     }
 
-    // public getAppSetViewExtensions(): AppSetViewExtension[] {
-    //     return extensions.appSetViewExtensions.slice();
-    // }
-
     public getStatusPanelExtensions(): StatusPanelExtension[] {
         return extensions.statusPanelExtensions.slice();
     }