diff --git a/ui/app/components/app/dropdowns/network-dropdown.js b/ui/app/components/app/dropdowns/network-dropdown.js
index 378ad3ba6..7a656d5b9 100644
--- a/ui/app/components/app/dropdowns/network-dropdown.js
+++ b/ui/app/components/app/dropdowns/network-dropdown.js
@@ -32,9 +32,6 @@ function mapStateToProps (state) {
 
 function mapDispatchToProps (dispatch) {
   return {
-    hideModal: () => {
-      dispatch(actions.hideModal())
-    },
     setProviderType: (type) => {
       dispatch(actions.setProviderType(type))
     },
@@ -47,7 +44,6 @@ function mapDispatchToProps (dispatch) {
     delRpcTarget: (target) => {
       dispatch(actions.delRpcTarget(target))
     },
-    showNetworkDropdown: () => dispatch(actions.showNetworkDropdown()),
     hideNetworkDropdown: () => dispatch(actions.hideNetworkDropdown()),
     setNetworksTabAddMode: isInAddMode => dispatch(actions.setNetworksTabAddMode(isInAddMode)),
   }
diff --git a/ui/app/pages/routes/index.js b/ui/app/pages/routes/index.js
index f89ab31e0..0f4737f22 100644
--- a/ui/app/pages/routes/index.js
+++ b/ui/app/pages/routes/index.js
@@ -6,7 +6,7 @@ import { compose } from 'recompose'
 import actions from '../../store/actions'
 import log from 'loglevel'
 import IdleTimer from 'react-idle-timer'
-import {getMetaMaskAccounts, getNetworkIdentifier, preferencesSelector} from '../../selectors/selectors'
+import {getNetworkIdentifier, preferencesSelector} from '../../selectors/selectors'
 import classnames from 'classnames'
 
 // init
@@ -259,7 +259,7 @@ class Routes extends Component {
       passwordBox.focus()
     } else {
       // currently active: deactivate
-      this.props.dispatch(actions.lockMetamask(false))
+      this.props.lockMetaMask()
     }
   }
 
@@ -330,31 +330,14 @@ Routes.propTypes = {
   sidebar: PropTypes.object,
   alertOpen: PropTypes.bool,
   hideSidebar: PropTypes.func,
-  isOnboarding: PropTypes.bool,
   isUnlocked: PropTypes.bool,
-  networkDropdownOpen: PropTypes.bool,
-  showNetworkDropdown: PropTypes.func,
-  hideNetworkDropdown: PropTypes.func,
   setLastActiveTime: PropTypes.func,
   history: PropTypes.object,
   location: PropTypes.object,
-  dispatch: PropTypes.func,
-  toggleAccountMenu: PropTypes.func,
-  selectedAddress: PropTypes.string,
-  lostAccounts: PropTypes.array,
-  isInitialized: PropTypes.bool,
-  forgottenPassword: PropTypes.bool,
-  activeAddress: PropTypes.string,
-  unapprovedTxs: PropTypes.object,
+  lockMetaMask: PropTypes.func,
   submittedPendingTransactions: PropTypes.array,
-  unapprovedMsgCount: PropTypes.number,
-  unapprovedPersonalMsgCount: PropTypes.number,
-  unapprovedTypedMessagesCount: PropTypes.number,
-  welcomeScreenSeen: PropTypes.bool,
-  isPopup: PropTypes.bool,
   isMouseUser: PropTypes.bool,
   setMouseUserState: PropTypes.func,
-  t: PropTypes.func,
   providerId: PropTypes.string,
   providerRequests: PropTypes.array,
   autoLogoutTimeLimit: PropTypes.number,
@@ -363,7 +346,6 @@ Routes.propTypes = {
 function mapStateToProps (state) {
   const { appState, metamask } = state
   const {
-    networkDropdownOpen,
     sidebar,
     alertOpen,
     alertMessage,
@@ -371,74 +353,34 @@ function mapStateToProps (state) {
     loadingMessage,
   } = appState
 
-  const accounts = getMetaMaskAccounts(state)
   const { autoLogoutTimeLimit = 0 } = preferencesSelector(state)
 
-  const {
-    identities,
-    address,
-    keyrings,
-    isInitialized,
-    unapprovedTxs,
-    lostAccounts,
-    unapprovedMsgCount,
-    unapprovedPersonalMsgCount,
-    unapprovedTypedMessagesCount,
-    providerRequests,
-  } = metamask
-  const selected = address || Object.keys(accounts)[0]
-
   return {
     // state from plugin
-    networkDropdownOpen,
     sidebar,
     alertOpen,
     alertMessage,
     isLoading,
     loadingMessage,
-    isInitialized,
     isUnlocked: state.metamask.isUnlocked,
-    selectedAddress: state.metamask.selectedAddress,
     currentView: state.appState.currentView,
-    activeAddress: state.appState.activeAddress,
-    transForward: state.appState.transForward,
-    isOnboarding: Boolean(!isInitialized),
-    isPopup: state.metamask.isPopup,
     submittedPendingTransactions: submittedPendingTransactionsSelector(state),
-    unapprovedTxs,
-    unapprovedMsgs: state.metamask.unapprovedMsgs,
-    unapprovedMsgCount,
-    unapprovedPersonalMsgCount,
-    unapprovedTypedMessagesCount,
-    menuOpen: state.appState.menuOpen,
     network: state.metamask.network,
     provider: state.metamask.provider,
-    forgottenPassword: state.appState.forgottenPassword,
-    lostAccounts,
     frequentRpcListDetail: state.metamask.frequentRpcListDetail || [],
     currentCurrency: state.metamask.currentCurrency,
     isMouseUser: state.appState.isMouseUser,
-    Qr: state.appState.Qr,
-    welcomeScreenSeen: state.metamask.welcomeScreenSeen,
     providerId: getNetworkIdentifier(state),
     autoLogoutTimeLimit,
-
-    // state needed to get account dropdown temporarily rendering from app bar
-    identities,
-    selected,
-    keyrings,
-    providerRequests,
+    providerRequests: metamask.providerRequests,
   }
 }
 
 function mapDispatchToProps (dispatch) {
   return {
-    dispatch,
+    lockMetaMask: () => dispatch(actions.lockMetamask(false)),
     hideSidebar: () => dispatch(actions.hideSidebar()),
-    showNetworkDropdown: () => dispatch(actions.showNetworkDropdown()),
-    hideNetworkDropdown: () => dispatch(actions.hideNetworkDropdown()),
     setCurrentCurrencyToUSD: () => dispatch(actions.setCurrentCurrency('usd')),
-    toggleAccountMenu: () => dispatch(actions.toggleAccountMenu()),
     setMouseUserState: (isMouseUser) => dispatch(actions.setMouseUserState(isMouseUser)),
     setLastActiveTime: () => dispatch(actions.setLastActiveTime()),
   }