diff --git a/ui/app/components/app/dropdowns/network-dropdown.js b/ui/app/components/app/dropdowns/network-dropdown.js
index 889da4f08..20f011755 100644
--- a/ui/app/components/app/dropdowns/network-dropdown.js
+++ b/ui/app/components/app/dropdowns/network-dropdown.js
@@ -126,7 +126,6 @@ class NetworkDropdown extends Component {
   }
 
   renderCommonRpc (rpcListDetail, provider) {
-    const props = this.props
     const reversedRpcListDetail = rpcListDetail.slice().reverse()
 
     return reversedRpcListDetail.map((entry) => {
@@ -143,7 +142,7 @@ class NetworkDropdown extends Component {
           <DropdownMenuItem
             key={`common${rpc}`}
             closeMenu={() => this.props.hideNetworkDropdown()}
-            onClick={() => props.setRpcTarget(rpc, chainId, ticker, nickname)}
+            onClick={() => this.props.setRpcTarget(rpc, chainId, ticker, nickname)}
             style={{
               fontSize: '16px',
               lineHeight: '20px',
@@ -170,7 +169,7 @@ class NetworkDropdown extends Component {
               className="fa fa-times delete"
               onClick={(e) => {
                 e.stopPropagation()
-                props.delRpcTarget(rpc)
+                this.props.delRpcTarget(rpc)
               }}
             />
           </DropdownMenuItem>
diff --git a/ui/app/components/app/token-cell/token-cell.component.js b/ui/app/components/app/token-cell/token-cell.component.js
index d54e6b8ec..25dbda934 100644
--- a/ui/app/components/app/token-cell/token-cell.component.js
+++ b/ui/app/components/app/token-cell/token-cell.component.js
@@ -48,7 +48,6 @@ export default class TokenCell extends Component {
 
   render () {
     const { tokenMenuOpen } = this.state
-    const props = this.props
     const {
       address,
       symbol,
@@ -62,7 +61,7 @@ export default class TokenCell extends Component {
       sidebarOpen,
       currentCurrency,
       image,
-    } = props
+    } = this.props
     let currentTokenToFiatRate
     let currentTokenInFiat
     let formattedFiat = ''
diff --git a/ui/app/components/app/token-list.js b/ui/app/components/app/token-list.js
index db92fcb10..80477ad87 100644
--- a/ui/app/components/app/token-list.js
+++ b/ui/app/components/app/token-list.js
@@ -132,8 +132,7 @@ class TokenList extends Component {
 
   render () {
     const { userAddress, assetImages } = this.props
-    const state = this.state
-    const { tokens, isLoading, error } = state
+    const { tokens, isLoading, error } = this.state
     if (isLoading) {
       return (
         <div