diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/artifactory/ArtifactoryTrigger.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/artifactory/ArtifactoryTrigger.tsx
index 7725b741e15..4074951fc9d 100644
--- a/app/scripts/modules/core/src/pipeline/config/triggers/artifactory/ArtifactoryTrigger.tsx
+++ b/app/scripts/modules/core/src/pipeline/config/triggers/artifactory/ArtifactoryTrigger.tsx
@@ -6,7 +6,7 @@ import { Observable, Subject } from 'rxjs';
 import { IArtifactoryTrigger } from 'core/domain/ITrigger';
 import { BaseTrigger } from 'core/pipeline';
 import { ArtifactoryReaderService } from './artifactoryReader.service';
-import { Application } from '@spinnaker/core';
+import { Application } from 'core/application';
 
 export interface IArtifactoryTriggerConfigProps {
   trigger: IArtifactoryTrigger;
@@ -40,7 +40,7 @@ export class ArtifactoryTrigger extends React.Component<
       });
   }
 
-  public componentWillUnmount(): void {
+  public componentWillUnmount() {
     this.destroy$.next();
   }
 
diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/baseBuild/BaseBuildTrigger.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/baseBuild/BaseBuildTrigger.tsx
index d6fad92b068..a713f6bb50a 100644
--- a/app/scripts/modules/core/src/pipeline/config/triggers/baseBuild/BaseBuildTrigger.tsx
+++ b/app/scripts/modules/core/src/pipeline/config/triggers/baseBuild/BaseBuildTrigger.tsx
@@ -39,9 +39,13 @@ export class BaseBuildTrigger extends React.Component<IBaseBuildTriggerConfigPro
     };
   }
 
-  public componentDidMount = () => {
+  public componentDidMount() {
     this.initializeMasters();
-  };
+  }
+
+  public componentWillUnmount() {
+    this.destroy$.next();
+  }
 
   private refreshMasters = () => {
     this.setState({
diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/concourse/ConcourseTrigger.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/concourse/ConcourseTrigger.tsx
index c9ffaad0961..131cb22ef6c 100644
--- a/app/scripts/modules/core/src/pipeline/config/triggers/concourse/ConcourseTrigger.tsx
+++ b/app/scripts/modules/core/src/pipeline/config/triggers/concourse/ConcourseTrigger.tsx
@@ -34,7 +34,7 @@ export class ConcourseTrigger extends React.Component<IConcourseTriggerConfigPro
     };
   }
 
-  public componentDidMount(): void {
+  public componentDidMount() {
     Observable.fromPromise(IgorService.listMasters(BuildServiceType.Concourse))
       .takeUntil(this.destroy$)
       .subscribe((masters: string[]) => {
diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/git/GitTrigger.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/git/GitTrigger.tsx
index f679f01e757..4021f1dc526 100644
--- a/app/scripts/modules/core/src/pipeline/config/triggers/git/GitTrigger.tsx
+++ b/app/scripts/modules/core/src/pipeline/config/triggers/git/GitTrigger.tsx
@@ -49,7 +49,7 @@ export class GitTrigger extends React.Component<IGitTriggerConfigProps> {
     this.state = {};
   }
 
-  public componentDidMount = () => {
+  public componentDidMount() {
     const trigger = { ...this.props.trigger };
     const { attributes } = this.props.application;
 
@@ -63,7 +63,7 @@ export class GitTrigger extends React.Component<IGitTriggerConfigProps> {
     }
 
     this.props.triggerUpdated && this.props.triggerUpdated(trigger);
-  };
+  }
 
   private onUpdateTrigger = (update: any) => {
     this.props.triggerUpdated &&
diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/pubsub/PubsubTrigger.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/pubsub/PubsubTrigger.tsx
index be84d21a12d..51c0733a66a 100644
--- a/app/scripts/modules/core/src/pipeline/config/triggers/pubsub/PubsubTrigger.tsx
+++ b/app/scripts/modules/core/src/pipeline/config/triggers/pubsub/PubsubTrigger.tsx
@@ -33,7 +33,7 @@ export class PubsubTrigger extends React.Component<IPubsubTriggerProps, IPubsubT
     };
   }
 
-  public componentDidMount(): void {
+  public componentDidMount() {
     Observable.fromPromise(PubsubSubscriptionReader.getPubsubSubscriptions())
       .takeUntil(this.destroy$)
       .subscribe(
@@ -52,6 +52,10 @@ export class PubsubTrigger extends React.Component<IPubsubTriggerProps, IPubsubT
       );
   }
 
+  public componentWillUnmount() {
+    this.destroy$.next();
+  }
+
   private onUpdateTrigger = (update: any) => {
     this.props.triggerUpdated &&
       this.props.triggerUpdated({
@@ -60,7 +64,7 @@ export class PubsubTrigger extends React.Component<IPubsubTriggerProps, IPubsubT
       });
   };
 
-  public PubSubTriggerContents() {
+  public PubSubTriggerContents = () => {
     const { pubsubSubscriptions, subscriptionsLoaded } = this.state;
     const { trigger } = this.props;
     const a = trigger.attributeConstraints || {};
@@ -136,7 +140,7 @@ export class PubsubTrigger extends React.Component<IPubsubTriggerProps, IPubsubT
         </div>
       );
     }
-  }
+  };
 
   public render() {
     const { PubSubTriggerContents } = this;
diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/wercker/WerckerTrigger.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/wercker/WerckerTrigger.tsx
index 4428f5234e4..8144768c07e 100644
--- a/app/scripts/modules/core/src/pipeline/config/triggers/wercker/WerckerTrigger.tsx
+++ b/app/scripts/modules/core/src/pipeline/config/triggers/wercker/WerckerTrigger.tsx
@@ -39,10 +39,14 @@ export class WerckerTrigger extends React.Component<IWerckerTriggerConfigProps,
     };
   }
 
-  public componentDidMount = () => {
+  public componentDidMount() {
     this.initializeMasters();
     this.updateJob(this.props.trigger.pipeline);
-  };
+  }
+
+  public componentWillUnmount() {
+    this.destroy$.next();
+  }
 
   private initializeMasters = () => {
     Observable.fromPromise(IgorService.listMasters(BuildServiceType.Wercker))
@@ -189,7 +193,7 @@ export class WerckerTrigger extends React.Component<IWerckerTriggerConfigProps,
       });
   };
 
-  public WerkerTriggerContents() {
+  public WerkerTriggerContents = () => {
     const { app, master, pipeline } = this.props.trigger;
     const { jobsRefreshing, masters, mastersRefreshing, pipelines } = this.state;
     return (
@@ -250,7 +254,7 @@ export class WerckerTrigger extends React.Component<IWerckerTriggerConfigProps,
         </div>
       </>
     );
-  }
+  };
 
   public render() {
     const { WerkerTriggerContents } = this;