diff --git a/js/modules/attachment_downloads.js b/js/modules/attachment_downloads.js
index a0ece355a..2c2a99085 100644
--- a/js/modules/attachment_downloads.js
+++ b/js/modules/attachment_downloads.js
@@ -1,4 +1,4 @@
-/* global Signal, setTimeout, clearTimeout, getMessageController, NewReceiver */
+/* global Signal, setTimeout, clearTimeout, getMessageController, NewReceiver, models */
 
 const { isNumber, omit } = require('lodash');
 const getGuid = require('uuid/v4');
@@ -143,7 +143,7 @@ async function _runJob(job) {
     }
 
     const found = await getMessageById(messageId, {
-      Message: window.models.Message.MessageModel,
+      Message: models.Message.MessageModel,
     });
     if (!found) {
       logger.error('_runJob: Source message not found, deleting job');
@@ -227,7 +227,7 @@ async function _runJob(job) {
 async function _finishJob(message, id) {
   if (message) {
     await saveMessage(message.attributes, {
-      Message: window.models.Message.MessageModel,
+      Message: models.Message.MessageModel,
     });
     const conversation = message.getConversation();
     if (conversation) {
diff --git a/js/modules/backup.js b/js/modules/backup.js
index 833e80f91..6c8344469 100644
--- a/js/modules/backup.js
+++ b/js/modules/backup.js
@@ -1,7 +1,5 @@
 /* global Signal: false */
-/* global Whisper: false */
 /* global _: false */
-/* global textsecure: false */
 /* global i18n: false */
 
 /* eslint-env browser */
diff --git a/js/modules/data.js b/js/modules/data.js
index 2d6ce7cd5..2ebb9a8de 100644
--- a/js/modules/data.js
+++ b/js/modules/data.js
@@ -879,7 +879,7 @@ async function saveSeenMessageHash(data) {
   await channels.saveSeenMessageHash(_cleanData(data));
 }
 
-async function saveMessage(data, { forceSave, Message } = {}) {
+async function saveMessage(data, { forceSave } = {}) {
   const id = await channels.saveMessage(_cleanData(data), { forceSave });
   window.Whisper.ExpiringMessagesListener.update();
   return id;
diff --git a/js/modules/types/message.js b/js/modules/types/message.js
index 926dab87d..fdb220908 100644
--- a/js/modules/types/message.js
+++ b/js/modules/types/message.js
@@ -6,7 +6,6 @@ const SchemaVersion = require('./schema_version');
 const {
   initializeAttachmentMetadata,
 } = require('../../../ts/types/message/initializeAttachmentMetadata');
-const MessageTS = require('../../../ts/types/Message');
 const Contact = require('./contact');
 
 const GROUP = 'group';
diff --git a/js/views/update_group_dialog_view.js b/js/views/update_group_dialog_view.js
index cf6bb56f0..813c1c813 100644
--- a/js/views/update_group_dialog_view.js
+++ b/js/views/update_group_dialog_view.js
@@ -1,4 +1,4 @@
-/* global Whisper, i18n, textsecure, _ */
+/* global Whisper, i18n, _ */
 
 // eslint-disable-next-line func-names
 (function() {
diff --git a/libtextsecure/account_manager.js b/libtextsecure/account_manager.js
index 4c2f5da7e..49739aa2a 100644
--- a/libtextsecure/account_manager.js
+++ b/libtextsecure/account_manager.js
@@ -9,7 +9,6 @@
   dcodeIO,
   StringView,
   Event,
-  Whisper
 */
 
 /* eslint-disable more/no-then */
diff --git a/test/backup_test.js b/test/backup_test.js
index 97d8eeff5..2625491fe 100644
--- a/test/backup_test.js
+++ b/test/backup_test.js
@@ -1,4 +1,4 @@
-/* global Signal, Whisper, assert, textsecure, _, libsignal */
+/* global Signal, assert, textsecure, _, libsignal */
 
 /* eslint-disable no-console */
 
diff --git a/test/models/messages_test.js b/test/models/messages_test.js
index 8fa8a8652..3add5067d 100644
--- a/test/models/messages_test.js
+++ b/test/models/messages_test.js
@@ -1,5 +1,3 @@
-/* global Whisper */
-
 'use strict';
 
 const attributes = {
@@ -16,6 +14,8 @@ describe('MessageCollection', () => {
   before(async () => {
     await clearDatabase();
     window.getConversationController().reset();
+    window.textsecure.storage.user.getNumber = () =>
+      '051111111111111111111111111111111111111111111111111111111111111111';
     await window.getConversationController().load();
   });
   after(() => {
diff --git a/ts/components/session/ActionsPanel.tsx b/ts/components/session/ActionsPanel.tsx
index eec18a63f..93a5f8829 100644
--- a/ts/components/session/ActionsPanel.tsx
+++ b/ts/components/session/ActionsPanel.tsx
@@ -148,7 +148,16 @@ class ActionsPanelPrivate extends React.Component<Props> {
   }
 
   public render(): JSX.Element {
-    const { selectedSection, unreadMessageCount } = this.props;
+    const {
+      selectedSection,
+      unreadMessageCount,
+      ourPrimaryConversation,
+    } = this.props;
+
+    if (!ourPrimaryConversation) {
+      window.log.warn('ActionsPanel: ourPrimaryConversation is not set');
+      return <></>;
+    }
 
     const isProfilePageSelected = selectedSection === SectionType.Profile;
     const isMessagePageSelected = selectedSection === SectionType.Message;
@@ -160,7 +169,7 @@ class ActionsPanelPrivate extends React.Component<Props> {
       <div className="module-left-pane__sections-container">
         <this.Section
           type={SectionType.Profile}
-          avatarPath={this.props.ourPrimaryConversation.avatarPath}
+          avatarPath={ourPrimaryConversation.avatarPath}
           isSelected={isProfilePageSelected}
           onSelect={this.handleSectionSelect}
         />
diff --git a/ts/components/session/usingClosedConversationDetails.tsx b/ts/components/session/usingClosedConversationDetails.tsx
index dc0d06098..0043a9fa2 100644
--- a/ts/components/session/usingClosedConversationDetails.tsx
+++ b/ts/components/session/usingClosedConversationDetails.tsx
@@ -55,7 +55,7 @@ export function usingClosedConversationDetails(WrappedComponent: any) {
         (conversationType === 'group' || type === 'group' || isGroup)
       ) {
         const groupId = id || phoneNumber;
-        const ourPrimary = await UserUtils.getOurPubKeyFromCache();
+        const ourPrimary = UserUtils.getOurPubKeyFromCache();
         let members = await GroupUtils.getGroupMembers(PubKey.cast(groupId));
 
         const ourself = members.find(m => m.key !== ourPrimary.key);
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 5d78bd04f..fe9fd0e8a 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -614,15 +614,6 @@ export function reducer(
       return state;
     }
 
-    if (selectedConversation === id) {
-      // Inbox -> Archived: no conversation is selected
-      // Note: With today's stacked converastions architecture, this can result in weird
-      //   behavior - no selected conversation in the left pane, but a conversation show
-      //   in the right pane.
-      // if (!existing.isArchived && data.isArchived) {
-      //   selectedConversation = undefined;
-      // }
-    }
     return {
       ...state,
       selectedConversation,