diff --git a/web-app/admin/src/ng1/app.js b/web-app/admin/src/ng1/app.js
index 29f0c03d5..82dba0e5f 100644
--- a/web-app/admin/src/ng1/app.js
+++ b/web-app/admin/src/ng1/app.js
@@ -1,6 +1,5 @@
 import _ from 'underscore';
 import angular from 'angular';
-import mage from './mage/mage.component';
 import fileUpload from './file-upload/file.upload.component';
 import fileBrowser from './file-upload/file.browser.component';
 import uiRouter from "@uirouter/angularjs";
@@ -82,7 +81,6 @@ app
   .directive('adminEventFormPreview', downgradeComponent({ component: AdminEventFormPreviewComponent }));
 
 app
-  .component('mage', mage)
   .component('navbar', require('./navbar/navbar.component'))
   .component('dateTime', require('./datetime/datetime.component'))
   .component('fileUpload', fileUpload)
diff --git a/web-app/admin/src/ng1/mage/mage.component.js b/web-app/admin/src/ng1/mage/mage.component.js
deleted file mode 100644
index 059474f49..000000000
--- a/web-app/admin/src/ng1/mage/mage.component.js
+++ /dev/null
@@ -1,192 +0,0 @@
-import _ from 'underscore';
-
-class MageController {
-  constructor($animate, $document, $timeout, $uibModal, UserService, PollingService, FilterService, EventService, MapService, ObservationService, Location, Observation, Event) {
-    this.$animate = $animate;
-    this.$document = $document;
-    this.$timeout = $timeout;
-    this.$uibModal = $uibModal;
-    this.UserService = UserService;
-    this.PollingService = PollingService;
-    this.FilterService = FilterService;
-    this.EventService = EventService;
-    this.MapService = MapService;
-    this.ObservationService = ObservationService;
-    this.Event = Event;
-    this.Location = Location;
-    this.Observation = Observation;
-    this.Event = Event;
-
-    this.hideFeed = false;
-    this.feedChangedUsers = {};
-
-    this.filteredEvent = FilterService.getEvent();
-    this.filteredInterval = FilterService.getIntervalChoice().label;
-  }
-
-  $onInit() {
-    this.$animate.on('addClass', this.$document.find('.feed'), ($mapPane, animationPhase) => {
-      this.resolveMapAfterFeaturesPaneTransition(animationPhase);
-    });
-    this.$animate.on('removeClass', this.$document.find('.feed'), ($mapPane, animationPhase) => {
-      this.resolveMapAfterFeaturesPaneTransition(animationPhase);
-    });
-
-    this.MapService.initialize();
-
-    this.filterChangedListener = {
-      onFilterChanged: filter => {
-        this.onFilterChanged(filter);
-      }
-    };
-    this.FilterService.addListener(this.filterChangedListener);
-
-    const locationListener = {
-      onLocation: location => {
-        this.onLocation(location);
-      },
-      onBroadcastLocation: callback => {
-        this.onBroadcastLocation(callback);
-      }
-    };
-    this.MapService.addListener(locationListener);
-
-    this.Event.query(events => {
-      const recentEventId = this.UserService.getRecentEventId();
-      const recentEvent = _.find(events, event => { return event.id === recentEventId; });
-      if (recentEvent) {
-        this.FilterService.setFilter({ event: recentEvent });
-        this.PollingService.setPollingInterval(this.PollingService.getPollingInterval());
-      } else if (events.length > 0) {
-        // TODO 'welcome to MAGE dialog'
-        this.FilterService.setFilter({ event: events[0] });
-        this.PollingService.setPollingInterval(this.PollingService.getPollingInterval());
-      } else {
-        // TODO welcome to mage, sorry you have no events
-      }
-    });
-  }
-
-  $onChanges(changes) {
-    if (changes.toggleFeed && !changes.toggleFeed.isFirstChange()) {
-      this.hideFeed = !this.hideFeed;
-    }
-  }
-
-  $onDestroy() {
-    this.FilterService.removeListener(this.filterChangedListener);
-    this.FilterService.removeFilters();
-
-    this.PollingService.setPollingInterval(0);
-
-    this.MapService.destroy();
-
-    this.EventService.destroy();
-  }
-
-  resolveMapAfterFeaturesPaneTransition(animationPhase) {
-    if (animationPhase === 'close') {
-      this.MapService.hideFeed(this.hideFeed);
-    }
-  }
-
-  onMap($event) {
-    this.map = $event.map;
-  }
-
-  onFilterChanged(filter) {
-    this.feedChangedUsers = {};
-
-    if (filter.event) {
-      this.filteredEvent = this.FilterService.getEvent();
-
-      // Stop broadcasting location if the event switches
-      this.MapService.onLocationStop();
-    }
-
-    if (filter.teams) this.filteredTeams = _.map(this.FilterService.getTeams(), t => { return t.name; }).join(', ');
-    if (filter.timeInterval) {
-      const intervalChoice = this.FilterService.getIntervalChoice();
-      if (intervalChoice.filter !== 'all') {
-        if (intervalChoice.filter === 'custom') {
-          // TODO format custom time interval
-          this.filteredInterval = 'Custom time interval';
-        } else {
-          this.filteredInterval = intervalChoice.label;
-        }
-      } else {
-        this.filteredInterval = null;
-      }
-    }
-  }
-
-  onToggleFeed($event) {
-    this.hideFeed = $event.hidden;
-  }
-
-  showFeed() {
-    this.hideFeed = false;
-  }
-
-  onAddObservation($event) {
-    // This is coming from Angular component, outside of AngularJS lifecycle
-    // need to run this code on next digest cycle.  Can remove $timeout when we no longer
-    // have a hybrid application
-    this.$timeout(() => {
-      if (this.hideFeed) {
-        this.showFeed();
-      }
-
-      this.newObservation = $event;
-    });
-  }
-
-  onLocation(location) {
-    const event = this.FilterService.getEvent();
-    this.Location.create({
-      eventId: event.id,
-      geometry: {
-        type: 'Point',
-        coordinates: [location.longitude, location.latitude]
-      },
-      properties: {
-        timestamp: new Date().valueOf(),
-        accuracy: location.accuracy,
-        altitude: location.altitude,
-        altitudeAccuracy: location.altitudeAccuracy,
-        heading: location.heading,
-        speed: location.speed
-      }
-    });
-  }
-
-  onBroadcastLocation(callback) {
-    if (!this.EventService.isUserInEvent(this.UserService.myself, this.FilterService.getEvent())) {
-      // TODO make a component
-      this.$uibModal.open({
-        template: require('../error/not.in.event.html'),
-        controller: 'NotInEventController',
-        resolve: {
-          title: function() {
-            return 'Cannot Broadcast Location';
-          }
-        }
-      });
-
-      callback(false);
-    } else {
-      callback(true);
-    }
-  }
-}
-
-MageController.$inject = ['$animate', '$document', '$timeout', '$uibModal', 'UserService', 'PollingService', 'FilterService', 'EventService', 'MapService', 'ObservationService', 'Location', 'Observation', 'Event'];
-
-export default {
-  template: require('./mage.html'),
-  bindings: {
-    user: '<',
-    toggleFeed: '<'
-  },
-  controller: MageController
-};
\ No newline at end of file
diff --git a/web-app/admin/src/ng1/mage/mage.html b/web-app/admin/src/ng1/mage/mage.html
deleted file mode 100644
index 33918df4d..000000000
--- a/web-app/admin/src/ng1/mage/mage.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="filter-banner hidden-xs">
-  <div class="filter-text">
-    <div class="col-xs-12 text-center">
-      <span class="filter-event">{{$ctrl.filteredEvent.name}}</span>
-      <span ng-if="$ctrl.filteredTeams" class="filter-teams"><span> > {{$ctrl.filteredTeams}}</span></span>
-      <span ng-if="$ctrl.filteredInterval" class="filter-interval"> {{$ctrl.filteredInterval}}</span>
-    </div>
-  </div>
-</div>
-
-<div class="main-container">
-  <feed-panel class="feed ng-animatable"
-    ng-hide="$ctrl.hideFeed"
-    [event]="$ctrl.filteredEvent"
-    [observation-location]="$ctrl.newObservation"
-    (toggle)="$ctrl.onToggleFeed($event)"></feed-panel>
-
-  <div class="map">
-    <map-leaflet (on-map-available)="$ctrl.onMapAvailable($event)" (on-add-observation)="$ctrl.onAddObservation($event)" (on-add-layer)="$ctrl.onAddLayer($event)" (on-remove-layer)="$ctrl.onRemoveLayer($event)"></map-leaflet>
-  </div>
-</div>