diff --git a/huxley/www/js/components/AdvisorRosterView.js b/huxley/www/js/components/AdvisorRosterView.js
index fcbbafbc..e965b7ef 100644
--- a/huxley/www/js/components/AdvisorRosterView.js
+++ b/huxley/www/js/components/AdvisorRosterView.js
@@ -58,11 +58,8 @@ class AdvisorRosterView extends React.Component {
     };
   }
 
-  UNSAFE_componentWillMount() {
-    Modal.setAppElement("body");
-  }
-
   componentDidMount() {
+    Modal.setAppElement("body");
     var schoolID = CurrentUserStore.getCurrentUser().school.id;
     var conferenceID = global.conference.session;
     this._registrationToken = RegistrationStore.addListener(() => {
diff --git a/huxley/www/js/components/AdvisorZoomLinkView.js b/huxley/www/js/components/AdvisorZoomLinkView.js
index 979d4bba..05f9800f 100644
--- a/huxley/www/js/components/AdvisorZoomLinkView.js
+++ b/huxley/www/js/components/AdvisorZoomLinkView.js
@@ -6,17 +6,11 @@
 "use strict";
 
 import React from "react";
-import { history } from "utils/history";
 
-var { AssignmentStore } = require("stores/AssignmentStore");
 const { Button } = require("components/core/Button");
-var { CountryStore } = require("stores/CountryStore");
 var { CommitteeStore } = require("stores/CommitteeStore");
-var { CurrentUserStore } = require("stores/CurrentUserStore");
-var { DelegateStore } = require("stores/DelegateStore");
 var { InnerView } = require("components/InnerView");
 var { TextTemplate } = require("components/core/TextTemplate");
-var { User } = require("utils/User");
 
 require("css/Table.less");
 var AdvisorZoomLinkViewText = require("text/AdvisorZoomLinkViewText.md");
@@ -31,13 +25,6 @@ class AdvisorZoomLinkView extends React.Component {
     };
   }
 
-  UNSAFE_componentWillMount() {
-    var user = CurrentUserStore.getCurrentUser();
-    if (!User.isAdvisor(user)) {
-      history.redirect("/");
-    }
-  }
-
   componentDidMount() {
     this._committeesToken = CommitteeStore.addListener(() => {
       var committees = Object.values(CommitteeStore.getCommittees());
diff --git a/huxley/www/js/components/ChairAttendanceView.js b/huxley/www/js/components/ChairAttendanceView.js
index e86dc504..d4bd039f 100644
--- a/huxley/www/js/components/ChairAttendanceView.js
+++ b/huxley/www/js/components/ChairAttendanceView.js
@@ -46,13 +46,6 @@ class ChairAttendanceView extends React.Component {
     };
   }
 
-  UNSAFE_componentWillMount() {
-    var user = CurrentUserStore.getCurrentUser();
-    if (!User.isChair(user)) {
-      history.redirect("/");
-    }
-  }
-
   componentDidMount() {
     var user = CurrentUserStore.getCurrentUser();
     var attendance = this.state.attendance;
diff --git a/huxley/www/js/components/ChairCommitteeFeedbackView.js b/huxley/www/js/components/ChairCommitteeFeedbackView.js
index 1145d666..1866aa3d 100644
--- a/huxley/www/js/components/ChairCommitteeFeedbackView.js
+++ b/huxley/www/js/components/ChairCommitteeFeedbackView.js
@@ -13,7 +13,6 @@ const { CurrentUserStore } = require("stores/CurrentUserStore");
 const { InnerView } = require("components/InnerView");
 const { Table } = require("components/core/Table");
 const { TextTemplate } = require("components/core/TextTemplate");
-const { User } = require("utils/User");
 
 require("css/Table.less");
 const ChairCommitteeFeedbackViewText = require("text/ChairCommitteeFeedbackViewText.md");
@@ -36,13 +35,6 @@ class ChairCommitteeFeedbackView extends React.Component {
     });
   }
 
-  UNSAFE_componentWillMount() {
-    var user = CurrentUserStore.getCurrentUser();
-    if (!User.isChair(user)) {
-      history.redirect("/");
-    }
-  }
-
   componentsWillUnmount() {
     this._committeeFeedbackToken && this._committeeFeedbackToken.remove();
   }
diff --git a/huxley/www/js/components/ChairDelegateEmailView.js b/huxley/www/js/components/ChairDelegateEmailView.js
index 69ba8e0d..682a7da9 100644
--- a/huxley/www/js/components/ChairDelegateEmailView.js
+++ b/huxley/www/js/components/ChairDelegateEmailView.js
@@ -40,13 +40,6 @@ class ChairDelegateEmailView extends React.Component {
     };
   }
 
-  UNSAFE_componentWillMount() {
-    var user = CurrentUserStore.getCurrentUser();
-    if (!User.isChair(user)) {
-      history.redirect("/");
-    }
-  }
-
   componentDidMount() {
     var user = CurrentUserStore.getCurrentUser();
 
diff --git a/huxley/www/js/components/ChairFeedView.js b/huxley/www/js/components/ChairFeedView.js
index 52f46757..6cbe6fb9 100644
--- a/huxley/www/js/components/ChairFeedView.js
+++ b/huxley/www/js/components/ChairFeedView.js
@@ -9,7 +9,7 @@
 
 import React from "react";
 import { history } from "utils/history";
-import type { Assignment, Committee, Note } from "utils/types";
+import type { Assignment, Note } from "utils/types";
 import { NoteFeedBox } from "./notes/NoteFeedBox";
 
 const { AssignmentStore } = require("stores/AssignmentStore");
@@ -79,13 +79,6 @@ class ChairFeedView extends React.Component<{}, ChairFeedViewState> {
     };
   }
 
-  UNSAFE_componentWillMount() {
-    var user = CurrentUserStore.getCurrentUser();
-    if (!User.isChair(user)) {
-      history.redirect("/");
-    }
-  }
-
   componentDidMount() {
     this._conversationToken = NoteStore.addListener(() => {
       this.setState({
diff --git a/huxley/www/js/components/ChairNoteView.js b/huxley/www/js/components/ChairNoteView.js
index 30729d4a..2d9c1d6d 100644
--- a/huxley/www/js/components/ChairNoteView.js
+++ b/huxley/www/js/components/ChairNoteView.js
@@ -82,13 +82,6 @@ class ChairNoteView extends React.Component<{}, ChairNoteViewState> {
     };
   }
 
-  UNSAFE_componentWillMount() {
-    var user = CurrentUserStore.getCurrentUser();
-    if (!User.isChair(user)) {
-      history.redirect("/");
-    }
-  }
-
   componentDidMount() {
     this._conversationToken = NoteStore.addListener(() => {
       this.setState({
diff --git a/huxley/www/js/components/ChairPapersView.js b/huxley/www/js/components/ChairPapersView.js
index acff6792..183f728d 100644
--- a/huxley/www/js/components/ChairPapersView.js
+++ b/huxley/www/js/components/ChairPapersView.js
@@ -65,12 +65,6 @@ class ChairPapersView extends React.Component {
     };
   }
 
-  UNSAFE_componentWillMount() {
-    var user = CurrentUserStore.getCurrentUser();
-    if (!User.isChair(user)) {
-      history.redirect("/");
-    }
-  }
 
   componentDidMount() {
     var user = CurrentUserStore.getCurrentUser();
diff --git a/huxley/www/js/components/ChairRubricView.js b/huxley/www/js/components/ChairRubricView.js
index b4ab5c53..6c90ed45 100644
--- a/huxley/www/js/components/ChairRubricView.js
+++ b/huxley/www/js/components/ChairRubricView.js
@@ -41,13 +41,6 @@ class ChairRubricView extends React.Component {
     };
   }
 
-  UNSAFE_componentWillMount() {
-    var user = CurrentUserStore.getCurrentUser();
-    if (!User.isChair(user)) {
-      history.redirect("/");
-    }
-  }
-
   componentDidMount() {
     this._committeesToken = CommitteeStore.addListener(() => {
       var user = CurrentUserStore.getCurrentUser();
diff --git a/huxley/www/js/components/ChairSummaryView.js b/huxley/www/js/components/ChairSummaryView.js
index 755e607f..23d1a58d 100644
--- a/huxley/www/js/components/ChairSummaryView.js
+++ b/huxley/www/js/components/ChairSummaryView.js
@@ -51,13 +51,6 @@ class ChairSummaryView extends React.Component {
     };
   }
 
-  UNSAFE_componentWillMount() {
-    var user = CurrentUserStore.getCurrentUser();
-    if (!User.isChair(user)) {
-      history.redirect("/");
-    }
-  }
-
   componentDidMount() {
     var user = CurrentUserStore.getCurrentUser();
 
diff --git a/huxley/www/js/components/DelegateCommitteeFeedbackView.js b/huxley/www/js/components/DelegateCommitteeFeedbackView.js
index 1ea974e9..bfd29a5b 100644
--- a/huxley/www/js/components/DelegateCommitteeFeedbackView.js
+++ b/huxley/www/js/components/DelegateCommitteeFeedbackView.js
@@ -108,13 +108,6 @@ class DelegateCommitteeFeedbackView extends React.Component {
     });
   }
 
-  UNSAFE_componentWillMount() {
-    var user = CurrentUserStore.getCurrentUser();
-    if (!User.isDelegate(user)) {
-      history.redirect("/");
-    }
-  }
-
   componentWillUnmount() {
     this._committeeFeedbackToken && this._committeeFeedbackToken.remove();
     this._secretariatMembersToken && this._secretariatMembersToken.remove();
diff --git a/huxley/www/js/components/DelegateNoteView.js b/huxley/www/js/components/DelegateNoteView.js
index b3fd8f13..3682ea62 100644
--- a/huxley/www/js/components/DelegateNoteView.js
+++ b/huxley/www/js/components/DelegateNoteView.js
@@ -3,7 +3,7 @@
  * Use of this source code is governed by a BSD License (see LICENSE).
  +*/
 
-//@flow
+// @flow
 
 "use strict";
 
@@ -91,13 +91,6 @@ class DelegateNoteView extends React.Component<{}, DelegateNoteViewState> {
     };
   }
 
-  UNSAFE_componentWillMount() {
-    var user = CurrentUserStore.getCurrentUser();
-    if (!User.isDelegate(user)) {
-      history.redirect("/");
-    }
-  }
-
   componentDidMount() {
     this._conversationToken = NoteStore.addListener(() => {
       this.setState({
diff --git a/huxley/www/js/components/DelegatePaperView.js b/huxley/www/js/components/DelegatePaperView.js
index 1ed783d8..e1135106 100644
--- a/huxley/www/js/components/DelegatePaperView.js
+++ b/huxley/www/js/components/DelegatePaperView.js
@@ -48,13 +48,6 @@ class DelegatePaperView extends React.Component {
     };
   }
 
-  UNSAFE_componentWillMount() {
-    var user = CurrentUserStore.getCurrentUser();
-    if (!User.isDelegate(user)) {
-      history.redirect("/");
-    }
-  }
-
   componentDidMount() {
     this._papersToken = PositionPaperStore.addListener(() => {
       this.setState({
diff --git a/huxley/www/js/components/DelegateProfileView.js b/huxley/www/js/components/DelegateProfileView.js
index 28ddfff1..2f20f73a 100644
--- a/huxley/www/js/components/DelegateProfileView.js
+++ b/huxley/www/js/components/DelegateProfileView.js
@@ -34,13 +34,6 @@ class DelegateProfileView extends React.Component {
     };
   }
 
-  UNSAFE_componentWillMount() {
-    var user = CurrentUserStore.getCurrentUser();
-    if (!User.isDelegate(user)) {
-      history.redirect("/");
-    }
-  }
-
   render() {
     var user = CurrentUserStore.getCurrentUser();
     var delegate = this.state.delegate;
diff --git a/huxley/www/js/components/Huxley.js b/huxley/www/js/components/Huxley.js
index 5e45631b..48ae2666 100644
--- a/huxley/www/js/components/Huxley.js
+++ b/huxley/www/js/components/Huxley.js
@@ -58,7 +58,8 @@ require("css/JSWarning.less");
 require("css/IEWarning.less");
 
 class Huxley extends React.Component {
-  UNSAFE_componentWillMount() {
+
+  componentDidMount() {
     CurrentUserStore.addListener(() => {
       var user = CurrentUserStore.getCurrentUser();
       if (User.isAnonymous(user)) {
@@ -72,7 +73,7 @@ class Huxley extends React.Component {
       }
     });
   }
-
+  
   render() {
     var user = CurrentUserStore.getCurrentUser();
     if (User.isAnonymous(user)) {
diff --git a/huxley/www/js/components/LoginView.js b/huxley/www/js/components/LoginView.js
index d80de489..d82c306c 100644
--- a/huxley/www/js/components/LoginView.js
+++ b/huxley/www/js/components/LoginView.js
@@ -36,16 +36,6 @@ class LoginView extends React.Component {
     };
   }
 
-  UNSAFE_componentWillMount() {
-    var user = CurrentUserStore.getCurrentUser();
-    if (User.isAnonymous(user)) {
-      return;
-    }
-    if (User.isAdvisor(user)) {
-      history.redirect("/advisor/profile");
-    }
-  }
-
   render() {
     return (
       <OuterView header={this.renderHeader()}>