From 4bce1e46781199556f5ee6b93ea6acb33a4cbc98 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 3 Sep 2019 22:38:21 +0300
Subject: [PATCH] Final cleanup

---
 app/scripts/ui.js                             |  10 +-
 .../button-group/button-group.component.js    |  61 --
 .../button-group/button-group.stories.js      |  49 --
 ui/app/components/button-group/index.js       |   1 -
 ui/app/components/button-group/index.scss     |  38 -
 .../tests/button-group-component.test.js      |  97 ---
 ui/app/components/card/card.component.js      |  25 -
 ui/app/components/card/index.js               |   1 -
 ui/app/components/card/index.scss             |  11 -
 .../card/tests/card.component.test.js         |  25 -
 .../confirm-detail-row.component.js           |  84 ---
 .../confirm-detail-row/index.js               |   1 -
 .../confirm-detail-row/index.scss             |  46 --
 .../confirm-detail-row.component.test.js      |  64 --
 ...onfirm-page-container-content.component.js | 110 ---
 ...onfirm-page-container-summary.component.js |  71 --
 .../confirm-page-container-summary/index.js   |   1 -
 .../confirm-page-container-summary/index.scss |  54 --
 ...onfirm-page-container-warning.component.js |  22 -
 .../confirm-page-container-warning/index.js   |   1 -
 .../confirm-page-container-warning/index.scss |  18 -
 .../confirm-page-container-content/index.js   |   3 -
 .../confirm-page-container-content/index.scss |  64 --
 ...confirm-page-container-header.component.js |  63 --
 .../confirm-page-container-header/index.js    |   1 -
 .../confirm-page-container-header/index.scss  |  27 -
 .../confirm-page-container.component.js       | 137 ----
 .../confirm-page-container/index.js           |   8 -
 .../confirm-page-container/index.scss         |   5 -
 ui/app/components/copyButton.js               |  66 --
 ui/app/components/copyable.js                 |  53 --
 .../currency-display.component.js             |  36 -
 .../currency-display.container.js             |  40 -
 ui/app/components/currency-display/index.js   |   1 -
 ui/app/components/currency-display/index.scss |  10 -
 .../tests/currency-display.component.test.js  |  27 -
 .../tests/currency-display.container.test.js  | 120 ---
 .../error-message/error-message.component.js  |  30 -
 ui/app/components/error-message/index.js      |   1 -
 ui/app/components/error-message/index.scss    |  21 -
 .../tests/error-message.component.test.js     |  36 -
 .../hex-to-decimal.component.js               |  21 -
 ui/app/components/hex-to-decimal/index.js     |   1 -
 .../tests/hex-to-decimal.component.test.js    |  26 -
 ui/app/components/input-number.js             |  81 --
 ui/app/components/send/README.md              |   0
 .../account-list-item-README.md               |   0
 .../account-list-item.component.js            |  76 --
 .../account-list-item.container.js            |  15 -
 .../account-list-item/account-list-item.scss  |   0
 .../send/account-list-item/index.js           |   1 -
 .../tests/account-list-item-component.test.js | 132 ----
 .../tests/account-list-item-container.test.js |  32 -
 ui/app/components/send/index.js               |   1 -
 ui/app/components/send/send-content/index.js  |   1 -
 .../send-content/send-amount-row/README.md    |   0
 .../amount-max-button.component.js            |  60 --
 .../amount-max-button.container.js            |  40 -
 .../amount-max-button.selectors.js            |   9 -
 .../amount-max-button.utils.js                |  22 -
 .../amount-max-button/index.js                |   1 -
 .../tests/amount-max-button-component.test.js |  89 ---
 .../tests/amount-max-button-container.test.js |  91 ---
 .../tests/amount-max-button-selectors.test.js |  22 -
 .../tests/amount-max-button-utils.test.js     |  27 -
 .../send-content/send-amount-row/index.js     |   1 -
 .../send-amount-row.component.js              | 120 ---
 .../send-amount-row.container.js              |  54 --
 .../send-amount-row/send-amount-row.scss      |   0
 .../send-amount-row.selectors.js              |   9 -
 .../tests/send-amount-row-component.test.js   | 189 -----
 .../tests/send-amount-row-container.test.js   | 125 ----
 .../tests/send-amount-row-selectors.test.js   |  34 -
 .../send/send-content/send-content-README.md  |   0
 .../send-content/send-content.component.js    |  41 --
 .../send/send-content/send-content.scss       |   0
 .../send-content/send-dropdown-list/index.js  |   1 -
 .../send-dropdown-list.component.js           |  52 --
 .../send-dropdown-list-component.test.js      | 105 ---
 .../from-dropdown/from-dropdown-README.md     |   0
 .../from-dropdown/from-dropdown.component.js  |  46 --
 .../from-dropdown/from-dropdown.scss          |   0
 .../send-from-row/from-dropdown/index.js      |   1 -
 .../tests/from-dropdown-component.test.js     |  88 ---
 .../send/send-content/send-from-row/index.js  |   1 -
 .../send-from-row/send-from-row-README.md     |   0
 .../send-from-row/send-from-row.component.js  |  63 --
 .../send-from-row/send-from-row.container.js  |  46 --
 .../send-from-row/send-from-row.selectors.js  |   9 -
 .../tests/send-from-row-component.test.js     | 121 ---
 .../tests/send-from-row-container.test.js     | 110 ---
 .../tests/send-from-row-selectors.test.js     |  20 -
 .../send/send-content/send-gas-row/README.md  |   0
 .../gas-fee-display.component.js              |  58 --
 .../send-gas-row/gas-fee-display/index.js     |   1 -
 .../test/gas-fee-display.component.test.js    |  53 --
 .../send/send-content/send-gas-row/index.js   |   1 -
 .../send-gas-row/send-gas-row.component.js    |  48 --
 .../send-gas-row/send-gas-row.container.js    |  27 -
 .../send-gas-row/send-gas-row.scss            |   0
 .../send-gas-row/send-gas-row.selectors.js    |  14 -
 .../tests/send-gas-row-component.test.js      |  70 --
 .../tests/send-gas-row-container.test.js      |  70 --
 .../tests/send-gas-row-selectors.test.js      |  49 --
 .../send-content/send-hex-data-row/index.js   |   1 -
 .../send-hex-data-row.component.js            |  42 --
 .../send-hex-data-row.container.js            |  21 -
 .../send-content/send-row-wrapper/index.js    |   1 -
 .../send-row-error-message/index.js           |   1 -
 .../send-row-error-message-README.md          |   0
 .../send-row-error-message.component.js       |  27 -
 .../send-row-error-message.container.js       |  12 -
 .../send-row-error-message.scss               |   0
 .../send-row-error-message-component.test.js  |  28 -
 .../send-row-error-message-container.test.js  |  28 -
 .../send-row-wrapper-README.md                |   0
 .../send-row-wrapper.component.js             |  43 --
 .../send-row-wrapper/send-row-wrapper.scss    |   0
 .../tests/send-row-wrapper-component.test.js  |  79 --
 .../send/send-content/send-to-row/index.js    |   1 -
 .../send-to-row/send-to-row-README.md         |   0
 .../send-to-row/send-to-row.component.js      |  72 --
 .../send-to-row/send-to-row.container.js      |  44 --
 .../send-to-row/send-to-row.selectors.js      |  14 -
 .../send-to-row/send-to-row.utils.js          |  21 -
 .../tests/send-to-row-component.test.js       | 149 ----
 .../tests/send-to-row-container.test.js       | 115 ---
 .../tests/send-to-row-selectors.test.js       |  47 --
 .../tests/send-to-row-utils.test.js           |  57 --
 .../tests/send-content-component.test.js      |  50 --
 ui/app/components/send/send-footer/README.md  |   0
 ui/app/components/send/send-footer/index.js   |   1 -
 .../send/send-footer/send-footer.component.js | 104 ---
 .../send/send-footer/send-footer.container.js | 105 ---
 .../send/send-footer/send-footer.scss         |   0
 .../send/send-footer/send-footer.selectors.js |  11 -
 .../send/send-footer/send-footer.utils.js     |  85 ---
 .../tests/send-footer-component.test.js       | 232 ------
 .../tests/send-footer-container.test.js       | 196 -----
 .../tests/send-footer-selectors.test.js       |  24 -
 .../tests/send-footer-utils.test.js           | 234 ------
 ui/app/components/send/send-header/README.md  |   0
 ui/app/components/send/send-header/index.js   |   1 -
 .../send/send-header/send-header.component.js |  34 -
 .../send/send-header/send-header.container.js |  19 -
 .../send/send-header/send-header.selectors.js |  37 -
 .../tests/send-header-component.test.js       |  70 --
 .../tests/send-header-container.test.js       |  59 --
 .../tests/send-header-selectors.test.js       |  47 --
 ui/app/components/send/send.component.js      | 212 ------
 ui/app/components/send/send.container.js      | 108 ---
 ui/app/components/send/send.scss              |   0
 ui/app/components/send/send.selectors.js      | 295 --------
 .../send/tests/send-component.test.js         | 338 ---------
 .../send/tests/send-container.test.js         | 174 -----
 .../send/tests/send-selectors-test-data.js    | 230 ------
 .../send/tests/send-selectors.test.js         | 695 ------------------
 .../components/send/tests/send-utils.test.js  | 527 -------------
 .../send/to-autocomplete.component.js         | 141 ----
 .../components/send/to-autocomplete/index.js  |   1 -
 .../send/to-autocomplete/to-autocomplete.js   | 129 ----
 ui/app/components/token-input/index.js        |   1 -
 .../tests/token-input.component.test.js       | 308 --------
 .../tests/token-input.container.test.js       | 129 ----
 .../token-input/token-input.component.js      | 136 ----
 .../token-input/token-input.container.js      |  27 -
 ui/app/components/tooltip-v2.js               |  66 --
 ui/app/components/unit-input/index.js         |   1 -
 ui/app/components/unit-input/index.scss       |  44 --
 .../tests/unit-input.component.test.js        | 146 ----
 .../unit-input/unit-input.component.js        | 104 ---
 .../index.js                                  |   1 -
 ...erenced-currency-display.component.test.js |  34 -
 ...erenced-currency-display.container.test.js | 105 ---
 ...-preferenced-currency-display.component.js |  45 --
 ...-preferenced-currency-display.container.js |  52 --
 .../user-preferenced-currency-input/index.js  |   1 -
 ...eferenced-currency-input.component.test.js |  32 -
 ...eferenced-currency-input.container.test.js |  31 -
 ...er-preferenced-currency-input.component.js |  20 -
 ...er-preferenced-currency-input.container.js |  13 -
 .../user-preferenced-token-input/index.js     |   1 -
 ...-preferenced-token-input.component.test.js |  32 -
 ...-preferenced-token-input.container.test.js |  31 -
 .../user-preferenced-token-input.component.js |  20 -
 .../user-preferenced-token-input.container.js |  13 -
 186 files changed, 2 insertions(+), 10267 deletions(-)
 delete mode 100644 ui/app/components/button-group/button-group.component.js
 delete mode 100644 ui/app/components/button-group/button-group.stories.js
 delete mode 100644 ui/app/components/button-group/index.js
 delete mode 100644 ui/app/components/button-group/index.scss
 delete mode 100644 ui/app/components/button-group/tests/button-group-component.test.js
 delete mode 100644 ui/app/components/card/card.component.js
 delete mode 100644 ui/app/components/card/index.js
 delete mode 100644 ui/app/components/card/index.scss
 delete mode 100644 ui/app/components/card/tests/card.component.test.js
 delete mode 100644 ui/app/components/confirm-page-container/confirm-detail-row/confirm-detail-row.component.js
 delete mode 100644 ui/app/components/confirm-page-container/confirm-detail-row/index.js
 delete mode 100644 ui/app/components/confirm-page-container/confirm-detail-row/index.scss
 delete mode 100644 ui/app/components/confirm-page-container/confirm-detail-row/tests/confirm-detail-row.component.test.js
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/index.js
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/index.scss
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/confirm-page-container-warning.component.js
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/index.js
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/index.scss
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-content/index.js
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-content/index.scss
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-header/index.js
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container-header/index.scss
 delete mode 100644 ui/app/components/confirm-page-container/confirm-page-container.component.js
 delete mode 100644 ui/app/components/confirm-page-container/index.js
 delete mode 100644 ui/app/components/confirm-page-container/index.scss
 delete mode 100644 ui/app/components/copyButton.js
 delete mode 100644 ui/app/components/copyable.js
 delete mode 100644 ui/app/components/currency-display/currency-display.component.js
 delete mode 100644 ui/app/components/currency-display/currency-display.container.js
 delete mode 100644 ui/app/components/currency-display/index.js
 delete mode 100644 ui/app/components/currency-display/index.scss
 delete mode 100644 ui/app/components/currency-display/tests/currency-display.component.test.js
 delete mode 100644 ui/app/components/currency-display/tests/currency-display.container.test.js
 delete mode 100644 ui/app/components/error-message/error-message.component.js
 delete mode 100644 ui/app/components/error-message/index.js
 delete mode 100644 ui/app/components/error-message/index.scss
 delete mode 100644 ui/app/components/error-message/tests/error-message.component.test.js
 delete mode 100644 ui/app/components/hex-to-decimal/hex-to-decimal.component.js
 delete mode 100644 ui/app/components/hex-to-decimal/index.js
 delete mode 100644 ui/app/components/hex-to-decimal/tests/hex-to-decimal.component.test.js
 delete mode 100644 ui/app/components/input-number.js
 delete mode 100644 ui/app/components/send/README.md
 delete mode 100644 ui/app/components/send/account-list-item/account-list-item-README.md
 delete mode 100644 ui/app/components/send/account-list-item/account-list-item.component.js
 delete mode 100644 ui/app/components/send/account-list-item/account-list-item.container.js
 delete mode 100644 ui/app/components/send/account-list-item/account-list-item.scss
 delete mode 100644 ui/app/components/send/account-list-item/index.js
 delete mode 100644 ui/app/components/send/account-list-item/tests/account-list-item-component.test.js
 delete mode 100644 ui/app/components/send/account-list-item/tests/account-list-item-container.test.js
 delete mode 100644 ui/app/components/send/index.js
 delete mode 100644 ui/app/components/send/send-content/index.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/README.md
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.component.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.container.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.selectors.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.utils.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/amount-max-button/index.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-component.test.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-container.test.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-selectors.test.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-utils.test.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/index.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/send-amount-row.component.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/send-amount-row.container.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/send-amount-row.scss
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/send-amount-row.selectors.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/tests/send-amount-row-component.test.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/tests/send-amount-row-container.test.js
 delete mode 100644 ui/app/components/send/send-content/send-amount-row/tests/send-amount-row-selectors.test.js
 delete mode 100644 ui/app/components/send/send-content/send-content-README.md
 delete mode 100644 ui/app/components/send/send-content/send-content.component.js
 delete mode 100644 ui/app/components/send/send-content/send-content.scss
 delete mode 100644 ui/app/components/send/send-content/send-dropdown-list/index.js
 delete mode 100644 ui/app/components/send/send-content/send-dropdown-list/send-dropdown-list.component.js
 delete mode 100644 ui/app/components/send/send-content/send-dropdown-list/tests/send-dropdown-list-component.test.js
 delete mode 100644 ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown-README.md
 delete mode 100644 ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.component.js
 delete mode 100644 ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.scss
 delete mode 100644 ui/app/components/send/send-content/send-from-row/from-dropdown/index.js
 delete mode 100644 ui/app/components/send/send-content/send-from-row/from-dropdown/tests/from-dropdown-component.test.js
 delete mode 100644 ui/app/components/send/send-content/send-from-row/index.js
 delete mode 100644 ui/app/components/send/send-content/send-from-row/send-from-row-README.md
 delete mode 100644 ui/app/components/send/send-content/send-from-row/send-from-row.component.js
 delete mode 100644 ui/app/components/send/send-content/send-from-row/send-from-row.container.js
 delete mode 100644 ui/app/components/send/send-content/send-from-row/send-from-row.selectors.js
 delete mode 100644 ui/app/components/send/send-content/send-from-row/tests/send-from-row-component.test.js
 delete mode 100644 ui/app/components/send/send-content/send-from-row/tests/send-from-row-container.test.js
 delete mode 100644 ui/app/components/send/send-content/send-from-row/tests/send-from-row-selectors.test.js
 delete mode 100644 ui/app/components/send/send-content/send-gas-row/README.md
 delete mode 100644 ui/app/components/send/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
 delete mode 100644 ui/app/components/send/send-content/send-gas-row/gas-fee-display/index.js
 delete mode 100644 ui/app/components/send/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
 delete mode 100644 ui/app/components/send/send-content/send-gas-row/index.js
 delete mode 100644 ui/app/components/send/send-content/send-gas-row/send-gas-row.component.js
 delete mode 100644 ui/app/components/send/send-content/send-gas-row/send-gas-row.container.js
 delete mode 100644 ui/app/components/send/send-content/send-gas-row/send-gas-row.scss
 delete mode 100644 ui/app/components/send/send-content/send-gas-row/send-gas-row.selectors.js
 delete mode 100644 ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-component.test.js
 delete mode 100644 ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-container.test.js
 delete mode 100644 ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-selectors.test.js
 delete mode 100644 ui/app/components/send/send-content/send-hex-data-row/index.js
 delete mode 100644 ui/app/components/send/send-content/send-hex-data-row/send-hex-data-row.component.js
 delete mode 100644 ui/app/components/send/send-content/send-hex-data-row/send-hex-data-row.container.js
 delete mode 100644 ui/app/components/send/send-content/send-row-wrapper/index.js
 delete mode 100644 ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/index.js
 delete mode 100644 ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message-README.md
 delete mode 100644 ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.js
 delete mode 100644 ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.container.js
 delete mode 100644 ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.scss
 delete mode 100644 ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/tests/send-row-error-message-component.test.js
 delete mode 100644 ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/tests/send-row-error-message-container.test.js
 delete mode 100644 ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper-README.md
 delete mode 100644 ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper.component.js
 delete mode 100644 ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper.scss
 delete mode 100644 ui/app/components/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js
 delete mode 100644 ui/app/components/send/send-content/send-to-row/index.js
 delete mode 100644 ui/app/components/send/send-content/send-to-row/send-to-row-README.md
 delete mode 100644 ui/app/components/send/send-content/send-to-row/send-to-row.component.js
 delete mode 100644 ui/app/components/send/send-content/send-to-row/send-to-row.container.js
 delete mode 100644 ui/app/components/send/send-content/send-to-row/send-to-row.selectors.js
 delete mode 100644 ui/app/components/send/send-content/send-to-row/send-to-row.utils.js
 delete mode 100644 ui/app/components/send/send-content/send-to-row/tests/send-to-row-component.test.js
 delete mode 100644 ui/app/components/send/send-content/send-to-row/tests/send-to-row-container.test.js
 delete mode 100644 ui/app/components/send/send-content/send-to-row/tests/send-to-row-selectors.test.js
 delete mode 100644 ui/app/components/send/send-content/send-to-row/tests/send-to-row-utils.test.js
 delete mode 100644 ui/app/components/send/send-content/tests/send-content-component.test.js
 delete mode 100644 ui/app/components/send/send-footer/README.md
 delete mode 100644 ui/app/components/send/send-footer/index.js
 delete mode 100644 ui/app/components/send/send-footer/send-footer.component.js
 delete mode 100644 ui/app/components/send/send-footer/send-footer.container.js
 delete mode 100644 ui/app/components/send/send-footer/send-footer.scss
 delete mode 100644 ui/app/components/send/send-footer/send-footer.selectors.js
 delete mode 100644 ui/app/components/send/send-footer/send-footer.utils.js
 delete mode 100644 ui/app/components/send/send-footer/tests/send-footer-component.test.js
 delete mode 100644 ui/app/components/send/send-footer/tests/send-footer-container.test.js
 delete mode 100644 ui/app/components/send/send-footer/tests/send-footer-selectors.test.js
 delete mode 100644 ui/app/components/send/send-footer/tests/send-footer-utils.test.js
 delete mode 100644 ui/app/components/send/send-header/README.md
 delete mode 100644 ui/app/components/send/send-header/index.js
 delete mode 100644 ui/app/components/send/send-header/send-header.component.js
 delete mode 100644 ui/app/components/send/send-header/send-header.container.js
 delete mode 100644 ui/app/components/send/send-header/send-header.selectors.js
 delete mode 100644 ui/app/components/send/send-header/tests/send-header-component.test.js
 delete mode 100644 ui/app/components/send/send-header/tests/send-header-container.test.js
 delete mode 100644 ui/app/components/send/send-header/tests/send-header-selectors.test.js
 delete mode 100644 ui/app/components/send/send.component.js
 delete mode 100644 ui/app/components/send/send.container.js
 delete mode 100644 ui/app/components/send/send.scss
 delete mode 100644 ui/app/components/send/send.selectors.js
 delete mode 100644 ui/app/components/send/tests/send-component.test.js
 delete mode 100644 ui/app/components/send/tests/send-container.test.js
 delete mode 100644 ui/app/components/send/tests/send-selectors-test-data.js
 delete mode 100644 ui/app/components/send/tests/send-selectors.test.js
 delete mode 100644 ui/app/components/send/tests/send-utils.test.js
 delete mode 100644 ui/app/components/send/to-autocomplete.component.js
 delete mode 100644 ui/app/components/send/to-autocomplete/index.js
 delete mode 100644 ui/app/components/send/to-autocomplete/to-autocomplete.js
 delete mode 100644 ui/app/components/token-input/index.js
 delete mode 100644 ui/app/components/token-input/tests/token-input.component.test.js
 delete mode 100644 ui/app/components/token-input/tests/token-input.container.test.js
 delete mode 100644 ui/app/components/token-input/token-input.component.js
 delete mode 100644 ui/app/components/token-input/token-input.container.js
 delete mode 100644 ui/app/components/tooltip-v2.js
 delete mode 100644 ui/app/components/unit-input/index.js
 delete mode 100644 ui/app/components/unit-input/index.scss
 delete mode 100644 ui/app/components/unit-input/tests/unit-input.component.test.js
 delete mode 100644 ui/app/components/unit-input/unit-input.component.js
 delete mode 100644 ui/app/components/user-preferenced-currency-display/index.js
 delete mode 100644 ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.component.test.js
 delete mode 100644 ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js
 delete mode 100644 ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.component.js
 delete mode 100644 ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js
 delete mode 100644 ui/app/components/user-preferenced-currency-input/index.js
 delete mode 100644 ui/app/components/user-preferenced-currency-input/tests/user-preferenced-currency-input.component.test.js
 delete mode 100644 ui/app/components/user-preferenced-currency-input/tests/user-preferenced-currency-input.container.test.js
 delete mode 100644 ui/app/components/user-preferenced-currency-input/user-preferenced-currency-input.component.js
 delete mode 100644 ui/app/components/user-preferenced-currency-input/user-preferenced-currency-input.container.js
 delete mode 100644 ui/app/components/user-preferenced-token-input/index.js
 delete mode 100644 ui/app/components/user-preferenced-token-input/tests/user-preferenced-token-input.component.test.js
 delete mode 100644 ui/app/components/user-preferenced-token-input/tests/user-preferenced-token-input.container.test.js
 delete mode 100644 ui/app/components/user-preferenced-token-input/user-preferenced-token-input.component.js
 delete mode 100644 ui/app/components/user-preferenced-token-input/user-preferenced-token-input.container.js

diff --git a/app/scripts/ui.js b/app/scripts/ui.js
index fe8795b86..4b72a3b2b 100644
--- a/app/scripts/ui.js
+++ b/app/scripts/ui.js
@@ -46,14 +46,8 @@ async function start () {
 
     // Code commented out until we begin auto adding users to NewUI
 
-    let css = OldMetaMaskUiCss()
-    let deleteInjectedCss = injectCss(css)
-
-    store.subscribe(() => {
-      deleteInjectedCss()
-      css = OldMetaMaskUiCss()
-      deleteInjectedCss = injectCss(css)
-    })
+    const css = OldMetaMaskUiCss()
+    injectCss(css)
   })
 
 
diff --git a/ui/app/components/button-group/button-group.component.js b/ui/app/components/button-group/button-group.component.js
deleted file mode 100644
index f99f710ce..000000000
--- a/ui/app/components/button-group/button-group.component.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React, { PureComponent } from 'react'
-import PropTypes from 'prop-types'
-import classnames from 'classnames'
-
-export default class ButtonGroup extends PureComponent {
-  static propTypes = {
-    defaultActiveButtonIndex: PropTypes.number,
-    disabled: PropTypes.bool,
-    children: PropTypes.array,
-    className: PropTypes.string,
-    style: PropTypes.object,
-  }
-
-  static defaultProps = {
-    className: 'button-group',
-  }
-
-  state = {
-    activeButtonIndex: this.props.defaultActiveButtonIndex || 0,
-  }
-
-  handleButtonClick (activeButtonIndex) {
-    this.setState({ activeButtonIndex })
-  }
-
-  renderButtons () {
-    const { children, disabled } = this.props
-
-    return React.Children.map(children, (child, index) => {
-      return child && (
-        <button
-          className={classnames(
-            'button-group__button',
-            { 'button-group__button--active': index === this.state.activeButtonIndex },
-          )}
-          onClick={() => {
-            this.handleButtonClick(index)
-            child.props.onClick && child.props.onClick()
-          }}
-          disabled={disabled || child.props.disabled}
-          key={index}
-        >
-          { child.props.children }
-        </button>
-      )
-    })
-  }
-
-  render () {
-    const { className, style } = this.props
-
-    return (
-      <div
-        className={className}
-        style={style}
-      >
-        { this.renderButtons() }
-      </div>
-    )
-  }
-}
diff --git a/ui/app/components/button-group/button-group.stories.js b/ui/app/components/button-group/button-group.stories.js
deleted file mode 100644
index 14e1a7e49..000000000
--- a/ui/app/components/button-group/button-group.stories.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from 'react'
-import { storiesOf } from '@storybook/react'
-import { action } from '@storybook/addon-actions'
-import ButtonGroup from './'
-import Button from '../button'
-import { text, boolean } from '@storybook/addon-knobs/react'
-
-storiesOf('ButtonGroup', module)
-  .add('with Buttons', () =>
-    <ButtonGroup
-      style={{ width: '300px' }}
-      disabled={boolean('Disabled', false)}
-      defaultActiveButtonIndex={1}
-    >
-      <Button
-        onClick={action('cheap')}
-      >
-        {text('Button1', 'Cheap')}
-      </Button>
-      <Button
-        onClick={action('average')}
-      >
-        {text('Button2', 'Average')}
-      </Button>
-      <Button
-        onClick={action('fast')}
-      >
-        {text('Button3', 'Fast')}
-      </Button>
-    </ButtonGroup>
-  )
-  .add('with a disabled Button', () =>
-    <ButtonGroup
-      style={{ width: '300px' }}
-      disabled={boolean('Disabled', false)}
-    >
-      <Button
-        onClick={action('enabled')}
-      >
-        {text('Button1', 'Enabled')}
-      </Button>
-      <Button
-        onClick={action('disabled')}
-        disabled
-      >
-        {text('Button2', 'Disabled')}
-      </Button>
-    </ButtonGroup>
-  )
diff --git a/ui/app/components/button-group/index.js b/ui/app/components/button-group/index.js
deleted file mode 100644
index df470bd57..000000000
--- a/ui/app/components/button-group/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './button-group.component'
diff --git a/ui/app/components/button-group/index.scss b/ui/app/components/button-group/index.scss
deleted file mode 100644
index 29713c75b..000000000
--- a/ui/app/components/button-group/index.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-.button-group {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  &__button {
-    font-family: Roboto;
-    font-size: 1rem;
-    color: $tundora;
-    border-style: solid;
-    border-color: $alto;
-    border-width: 1px 1px 1px;
-    border-left: 0;
-    flex: 1;
-    padding: 12px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-
-    &:first-child {
-      border-left: 1px solid $alto;
-      border-radius: 4px 0 0 4px;
-    }
-
-    &:last-child {
-      border-radius: 0 4px 4px 0;
-    }
-
-    &--active {
-      background-color: $dodger-blue;
-      color: $white;
-    }
-
-    &:disabled {
-      opacity: .5;
-    }
-  }
-}
\ No newline at end of file
diff --git a/ui/app/components/button-group/tests/button-group-component.test.js b/ui/app/components/button-group/tests/button-group-component.test.js
deleted file mode 100644
index f07bb97c8..000000000
--- a/ui/app/components/button-group/tests/button-group-component.test.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import sinon from 'sinon'
-import ButtonGroup from '../button-group.component.js'
-
-const childButtonSpies = {
-  onClick: sinon.spy(),
-}
-
-sinon.spy(ButtonGroup.prototype, 'handleButtonClick')
-sinon.spy(ButtonGroup.prototype, 'renderButtons')
-
-const mockButtons = [
-  <button onClick={childButtonSpies.onClick} key={'a'}><div className="mockClass" /></button>,
-  <button onClick={childButtonSpies.onClick} key={'b'}></button>,
-  <button onClick={childButtonSpies.onClick} key={'c'}></button>,
-]
-
-describe('ButtonGroup Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(<ButtonGroup
-      defaultActiveButtonIndex={1}
-      disabled={false}
-      className="someClassName"
-      style={ { color: 'red' } }
-    >{mockButtons}</ButtonGroup>)
-  })
-
-  afterEach(() => {
-    childButtonSpies.onClick.resetHistory()
-    ButtonGroup.prototype.handleButtonClick.resetHistory()
-    ButtonGroup.prototype.renderButtons.resetHistory()
-  })
-
-  describe('handleButtonClick', () => {
-    it('should set the activeButtonIndex', () => {
-      assert.equal(wrapper.state('activeButtonIndex'), 1)
-      wrapper.instance().handleButtonClick(2)
-      assert.equal(wrapper.state('activeButtonIndex'), 2)
-    })
-  })
-
-  describe('renderButtons', () => {
-    it('should render a button for each child', () => {
-        const childButtons = wrapper.find('.button-group__button')
-        assert.equal(childButtons.length, 3)
-    })
-
-    it('should render the correct button with an active state', () => {
-        const childButtons = wrapper.find('.button-group__button')
-        const activeChildButton = wrapper.find('.button-group__button--active')
-        assert.deepEqual(childButtons.get(1), activeChildButton.get(0))
-    })
-
-    it('should call handleButtonClick and the respective button\'s onClick method when a button is clicked', () => {
-        assert.equal(ButtonGroup.prototype.handleButtonClick.callCount, 0)
-        assert.equal(childButtonSpies.onClick.callCount, 0)
-        const childButtons = wrapper.find('.button-group__button')
-        childButtons.at(0).props().onClick()
-        childButtons.at(1).props().onClick()
-        childButtons.at(2).props().onClick()
-        assert.equal(ButtonGroup.prototype.handleButtonClick.callCount, 3)
-        assert.equal(childButtonSpies.onClick.callCount, 3)
-    })
-
-    it('should render all child buttons as disabled if props.disabled is true', () => {
-        const childButtons = wrapper.find('.button-group__button')
-        childButtons.forEach(button => {
-            assert.equal(button.props().disabled, undefined)
-        })
-        wrapper.setProps({ disabled: true })
-        const disabledChildButtons = wrapper.find('[disabled=true]')
-        assert.equal(disabledChildButtons.length, 3)
-    })
-
-    it('should render the children of the button', () => {
-        const mockClass = wrapper.find('.mockClass')
-        assert.equal(mockClass.length, 1)
-    })
-  })
-
-  describe('render', () => {
-    it('should render a div with the expected class and style', () => {
-      assert.equal(wrapper.find('div').at(0).props().className, 'someClassName')
-      assert.deepEqual(wrapper.find('div').at(0).props().style, { color: 'red' })
-    })
-
-    it('should call renderButtons when rendering', () => {
-        assert.equal(ButtonGroup.prototype.renderButtons.callCount, 1)
-        wrapper.instance().render()
-        assert.equal(ButtonGroup.prototype.renderButtons.callCount, 2)
-    })
-  })
-})
diff --git a/ui/app/components/card/card.component.js b/ui/app/components/card/card.component.js
deleted file mode 100644
index bb7241da1..000000000
--- a/ui/app/components/card/card.component.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React, { PureComponent } from 'react'
-import PropTypes from 'prop-types'
-import classnames from 'classnames'
-
-export default class Card extends PureComponent {
-  static propTypes = {
-    className: PropTypes.string,
-    overrideClassName: PropTypes.bool,
-    title: PropTypes.string,
-    children: PropTypes.node,
-  }
-
-  render () {
-    const { className, overrideClassName, title } = this.props
-
-    return (
-      <div className={classnames({ 'card': !overrideClassName }, className)}>
-        <div className="card__title">
-          { title }
-        </div>
-        { this.props.children }
-      </div>
-    )
-  }
-}
diff --git a/ui/app/components/card/index.js b/ui/app/components/card/index.js
deleted file mode 100644
index c3ca6e3f4..000000000
--- a/ui/app/components/card/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './card.component'
diff --git a/ui/app/components/card/index.scss b/ui/app/components/card/index.scss
deleted file mode 100644
index bde54a15e..000000000
--- a/ui/app/components/card/index.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.card {
-  border-radius: 4px;
-  box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.08);
-  padding: 8px;
-
-  &__title {
-    border-bottom: 1px solid #d8d8d8;
-    padding-bottom: 4px;
-    text-transform: capitalize;
-  }
-}
diff --git a/ui/app/components/card/tests/card.component.test.js b/ui/app/components/card/tests/card.component.test.js
deleted file mode 100644
index cea05033f..000000000
--- a/ui/app/components/card/tests/card.component.test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import Card from '../card.component'
-
-describe('Card Component', () => {
-  it('should render a card with a title and child element', () => {
-    const wrapper = shallow(
-      <Card
-        title="Test"
-        className="card-test-class"
-      >
-        <div className="child-test-class">Child</div>
-      </Card>
-    )
-
-    assert.ok(wrapper.hasClass('card-test-class'))
-    const title = wrapper.find('.card__title')
-    assert.ok(title)
-    assert.equal(title.text(), 'Test')
-    const child = wrapper.find('.child-test-class')
-    assert.ok(child)
-    assert.equal(child.text(), 'Child')
-  })
-})
diff --git a/ui/app/components/confirm-page-container/confirm-detail-row/confirm-detail-row.component.js b/ui/app/components/confirm-page-container/confirm-detail-row/confirm-detail-row.component.js
deleted file mode 100644
index c7262d2a9..000000000
--- a/ui/app/components/confirm-page-container/confirm-detail-row/confirm-detail-row.component.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import classnames from 'classnames'
-import UserPreferencedCurrencyDisplay from '../../user-preferenced-currency-display'
-import { PRIMARY, SECONDARY } from '../../../constants/common'
-
-const ConfirmDetailRow = props => {
-  const {
-    label,
-    primaryText,
-    secondaryText,
-    onHeaderClick,
-    primaryValueTextColor,
-    headerText,
-    headerTextClassName,
-    value,
-  } = props
-
-  return (
-    <div className="confirm-detail-row">
-      <div className="confirm-detail-row__label">
-        { label }
-      </div>
-      <div className="confirm-detail-row__details">
-        <div
-          className={classnames('confirm-detail-row__header-text', headerTextClassName)}
-          onClick={() => onHeaderClick && onHeaderClick()}
-        >
-          { headerText }
-        </div>
-        {
-          primaryText
-            ? (
-              <div
-                className="confirm-detail-row__primary"
-                style={{ color: primaryValueTextColor }}
-              >
-                { primaryText }
-              </div>
-            ) : (
-              <UserPreferencedCurrencyDisplay
-                className="confirm-detail-row__primary"
-                type={PRIMARY}
-                value={value}
-                showEthLogo
-                ethLogoHeight="18"
-                style={{ color: primaryValueTextColor }}
-                hideLabel
-              />
-            )
-        }
-        {
-          secondaryText
-            ? (
-              <div className="confirm-detail-row__secondary">
-                { secondaryText }
-              </div>
-            ) : (
-              <UserPreferencedCurrencyDisplay
-                className="confirm-detail-row__secondary"
-                type={SECONDARY}
-                value={value}
-                showEthLogo
-                hideLabel
-              />
-            )
-        }
-      </div>
-    </div>
-  )
-}
-
-ConfirmDetailRow.propTypes = {
-  headerText: PropTypes.string,
-  headerTextClassName: PropTypes.string,
-  label: PropTypes.string,
-  onHeaderClick: PropTypes.func,
-  primaryValueTextColor: PropTypes.string,
-  primaryText: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
-  secondaryText: PropTypes.string,
-  value: PropTypes.string,
-}
-
-export default ConfirmDetailRow
diff --git a/ui/app/components/confirm-page-container/confirm-detail-row/index.js b/ui/app/components/confirm-page-container/confirm-detail-row/index.js
deleted file mode 100644
index 056afff04..000000000
--- a/ui/app/components/confirm-page-container/confirm-detail-row/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './confirm-detail-row.component'
diff --git a/ui/app/components/confirm-page-container/confirm-detail-row/index.scss b/ui/app/components/confirm-page-container/confirm-detail-row/index.scss
deleted file mode 100644
index 580a41fde..000000000
--- a/ui/app/components/confirm-page-container/confirm-detail-row/index.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-.confirm-detail-row {
-  padding: 14px 0;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-
-  &__label {
-    font-size: .75rem;
-    font-weight: 500;
-    color: $scorpion;
-    text-transform: uppercase;
-  }
-
-  &__details {
-    flex: 1;
-    text-align: end;
-    min-width: 0;
-  }
-
-  &__primary {
-    font-size: 1.5rem;
-    justify-content: flex-end;
-  }
-
-  &__secondary {
-    color: $oslo-gray;
-    justify-content: flex-end;
-  }
-
-  &__header-text {
-    font-size: .75rem;
-    text-transform: uppercase;
-    margin-bottom: 6px;
-    color: $scorpion;
-
-    &--edit {
-      color: $curious-blue;
-      cursor: pointer;
-    }
-
-    &--total {
-      font-size: .625rem;
-    }
-  }
-}
diff --git a/ui/app/components/confirm-page-container/confirm-detail-row/tests/confirm-detail-row.component.test.js b/ui/app/components/confirm-page-container/confirm-detail-row/tests/confirm-detail-row.component.test.js
deleted file mode 100644
index c8507985d..000000000
--- a/ui/app/components/confirm-page-container/confirm-detail-row/tests/confirm-detail-row.component.test.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import ConfirmDetailRow from '../confirm-detail-row.component.js'
-import sinon from 'sinon'
-
-const propsMethodSpies = {
-  onHeaderClick: sinon.spy(),
-}
-
-describe('Confirm Detail Row Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(
-      <ConfirmDetailRow
-        errorType={'mockErrorType'}
-        label={'mockLabel'}
-        showError={false}
-        primaryText = {'mockFiatText'}
-        secondaryText = {'mockEthText'}
-        primaryValueTextColor= {'mockColor'}
-        onHeaderClick= {propsMethodSpies.onHeaderClick}
-        headerText = {'mockHeaderText'}
-        headerTextClassName = {'mockHeaderClass'}
-      />
-    )
-  })
-
-	describe('render', () => {
-    it('should render a div with a confirm-detail-row class', () => {
-      assert.equal(wrapper.find('div.confirm-detail-row').length, 1)
-    })
-
-    it('should render the label as a child of the confirm-detail-row__label', () => {
-      assert.equal(wrapper.find('.confirm-detail-row > .confirm-detail-row__label').childAt(0).text(), 'mockLabel')
-    })
-
-    it('should render the headerText as a child of the confirm-detail-row__header-text', () => {
-      assert.equal(wrapper.find('.confirm-detail-row__details > .confirm-detail-row__header-text').childAt(0).text(), 'mockHeaderText')
-    })
-
-    it('should render the primaryText as a child of the confirm-detail-row__primary', () => {
-      assert.equal(wrapper.find('.confirm-detail-row__details > .confirm-detail-row__primary').childAt(0).text(), 'mockFiatText')
-    })
-
-    it('should render the ethText as a child of the confirm-detail-row__secondary', () => {
-      assert.equal(wrapper.find('.confirm-detail-row__details > .confirm-detail-row__secondary').childAt(0).text(), 'mockEthText')
-    })
-
-    it('should set the fiatTextColor on confirm-detail-row__primary', () => {
-      assert.equal(wrapper.find('.confirm-detail-row__primary').props().style.color, 'mockColor')
-    })
-
-    it('should assure the confirm-detail-row__header-text classname is correct', () => {
-      assert.equal(wrapper.find('.confirm-detail-row__header-text').props().className, 'confirm-detail-row__header-text mockHeaderClass')
-    })
-
-    it('should call onHeaderClick when headerText div gets clicked', () => {
-      wrapper.find('.confirm-detail-row__header-text').props().onClick()
-      assert.equal(assert.equal(propsMethodSpies.onHeaderClick.callCount, 1))
-    })
-	})
-})
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
deleted file mode 100644
index 1dca81560..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
+++ /dev/null
@@ -1,110 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import classnames from 'classnames'
-import { Tabs, Tab } from '../../tabs'
-import { ConfirmPageContainerSummary, ConfirmPageContainerWarning } from './'
-import ErrorMessage from '../../error-message'
-
-export default class ConfirmPageContainerContent extends Component {
-  static propTypes = {
-    action: PropTypes.string,
-    dataComponent: PropTypes.node,
-    detailsComponent: PropTypes.node,
-    errorKey: PropTypes.string,
-    errorMessage: PropTypes.string,
-    hideSubtitle: PropTypes.bool,
-    identiconAddress: PropTypes.string,
-    nonce: PropTypes.string,
-    assetImage: PropTypes.string,
-    subtitle: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    subtitleComponent: PropTypes.node,
-    summaryComponent: PropTypes.node,
-    title: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    titleComponent: PropTypes.node,
-    warning: PropTypes.string,
-  }
-
-  renderContent () {
-    const { detailsComponent, dataComponent } = this.props
-
-    if (detailsComponent && dataComponent) {
-      return this.renderTabs()
-    } else {
-      return detailsComponent || dataComponent
-    }
-  }
-
-  renderTabs () {
-    const { detailsComponent, dataComponent } = this.props
-
-    return (
-      <Tabs>
-        <Tab name="Details">
-          { detailsComponent }
-        </Tab>
-        <Tab name="Data">
-          { dataComponent }
-        </Tab>
-      </Tabs>
-    )
-  }
-
-  render () {
-    const {
-      action,
-      errorKey,
-      errorMessage,
-      title,
-      titleComponent,
-      subtitle,
-      subtitleComponent,
-      hideSubtitle,
-      identiconAddress,
-      nonce,
-      assetImage,
-      summaryComponent,
-      detailsComponent,
-      dataComponent,
-      warning,
-    } = this.props
-
-    return (
-      <div className="confirm-page-container-content">
-        {
-          warning && (
-            <ConfirmPageContainerWarning warning={warning} />
-          )
-        }
-        {
-          summaryComponent || (
-            <ConfirmPageContainerSummary
-              className={classnames({
-                'confirm-page-container-summary--border': !detailsComponent || !dataComponent,
-              })}
-              action={action}
-              title={title}
-              titleComponent={titleComponent}
-              subtitle={subtitle}
-              subtitleComponent={subtitleComponent}
-              hideSubtitle={hideSubtitle}
-              identiconAddress={identiconAddress}
-              nonce={nonce}
-              assetImage={assetImage}
-            />
-          )
-        }
-        { this.renderContent() }
-        {
-          (errorKey || errorMessage) && (
-            <div className="confirm-page-container-content__error-container">
-              <ErrorMessage
-                errorMessage={errorMessage}
-                errorKey={errorKey}
-              />
-            </div>
-          )
-        }
-      </div>
-    )
-  }
-}
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
deleted file mode 100644
index 89ceb015f..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import classnames from 'classnames'
-import Identicon from '../../../identicon'
-
-const ConfirmPageContainerSummary = props => {
-  const {
-    action,
-    title,
-    titleComponent,
-    subtitle,
-    subtitleComponent,
-    hideSubtitle,
-    className,
-    identiconAddress,
-    nonce,
-    assetImage,
-  } = props
-
-  return (
-    <div className={classnames('confirm-page-container-summary', className)}>
-      <div className="confirm-page-container-summary__action-row">
-        <div className="confirm-page-container-summary__action">
-          { action }
-        </div>
-        {
-          nonce && (
-            <div className="confirm-page-container-summary__nonce">
-              { `#${nonce}` }
-            </div>
-          )
-        }
-      </div>
-      <div className="confirm-page-container-summary__title">
-        {
-          identiconAddress && (
-            <Identicon
-              className="confirm-page-container-summary__identicon"
-              diameter={36}
-              address={identiconAddress}
-              image={assetImage}
-            />
-          )
-        }
-        <div className="confirm-page-container-summary__title-text">
-          { titleComponent || title }
-        </div>
-      </div>
-      {
-        hideSubtitle || <div className="confirm-page-container-summary__subtitle">
-          { subtitleComponent || subtitle }
-        </div>
-      }
-    </div>
-  )
-}
-
-ConfirmPageContainerSummary.propTypes = {
-  action: PropTypes.string,
-  title: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  titleComponent: PropTypes.node,
-  subtitle: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  subtitleComponent: PropTypes.node,
-  hideSubtitle: PropTypes.bool,
-  className: PropTypes.string,
-  identiconAddress: PropTypes.string,
-  nonce: PropTypes.string,
-  assetImage: PropTypes.string,
-}
-
-export default ConfirmPageContainerSummary
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/index.js b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/index.js
deleted file mode 100644
index ed1b28cf2..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './confirm-page-container-summary.component'
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/index.scss b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/index.scss
deleted file mode 100644
index 7f0f5d37a..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/index.scss
+++ /dev/null
@@ -1,54 +0,0 @@
-.confirm-page-container-summary {
-  padding: 16px 24px 0;
-  background-color: #f9fafa;
-  height: 133px;
-  box-sizing: border-box;
-
-  &__action-row {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  &__action {
-    text-transform: uppercase;
-    color: $oslo-gray;
-    font-size: .75rem;
-    padding: 3px 8px;
-    border: 1px solid $oslo-gray;
-    border-radius: 4px;
-    display: inline-block;
-  }
-
-  &__nonce {
-    color: $oslo-gray;
-  }
-
-  &__title {
-    padding: 4px 0;
-    display: flex;
-    align-items: center;
-  }
-
-  &__identicon {
-    flex: 0 0 auto;
-    margin-right: 8px;
-  }
-
-  &__title-text {
-    font-size: 2.25rem;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
-  &__subtitle {
-    color: $oslo-gray;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
-  &--border {
-    border-bottom: 1px solid $geyser;
-  }
-}
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/confirm-page-container-warning.component.js b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/confirm-page-container-warning.component.js
deleted file mode 100644
index 79901c8fc..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/confirm-page-container-warning.component.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-
-const ConfirmPageContainerWarning = props => {
-  return (
-    <div className="confirm-page-container-warning">
-      <img
-        className="confirm-page-container-warning__icon"
-        src="/images/alert.svg"
-      />
-      <div className="confirm-page-container-warning__warning">
-        { props.warning }
-      </div>
-    </div>
-  )
-}
-
-ConfirmPageContainerWarning.propTypes = {
-  warning: PropTypes.string,
-}
-
-export default ConfirmPageContainerWarning
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/index.js b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/index.js
deleted file mode 100644
index 6e48bd144..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './confirm-page-container-warning.component'
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/index.scss b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/index.scss
deleted file mode 100644
index 50545a1a2..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/index.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.confirm-page-container-warning {
-  background-color: #fffcdb;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border-bottom: 1px solid $geyser;
-  padding: 12px 24px;
-
-  &__icon {
-    flex: 0 0 auto;
-    margin-right: 16px;
-  }
-
-  &__warning {
-    font-size: .75rem;
-    color: #5f5922;
-  }
-}
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/index.js b/ui/app/components/confirm-page-container/confirm-page-container-content/index.js
deleted file mode 100644
index 4dfd89d92..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default } from './confirm-page-container-content.component'
-export { default as ConfirmPageContainerSummary } from './confirm-page-container-summary'
-export { default as ConfirmPageContainerWarning } from './confirm-page-container-warning'
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/index.scss b/ui/app/components/confirm-page-container/confirm-page-container-content/index.scss
deleted file mode 100644
index 698e624f4..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/index.scss
+++ /dev/null
@@ -1,64 +0,0 @@
-@import './confirm-page-container-warning/index';
-
-@import './confirm-page-container-summary/index';
-
-.confirm-page-container-content {
-  overflow-y: auto;
-  flex: 1;
-
-  &__error-container {
-    padding: 0 16px 16px 16px;
-  }
-
-  &__details {
-    box-sizing: border-box;
-    padding: 0 24px;
-  }
-
-  &__data {
-   padding: 16px;
-   color: $oslo-gray;
-  }
-
-  &__data-box {
-    background-color: #f9fafa;
-    padding: 12px;
-    font-size: .75rem;
-    margin-bottom: 16px;
-    word-wrap: break-word;
-    max-height: 200px;
-    overflow-y: auto;
-
-    &-label {
-      text-transform: uppercase;
-      padding: 8px 0 12px;
-      font-size: 12px;
-    }
-  }
-
-  &__data-field {
-    display: flex;
-    flex-direction: row;
-
-    &-label {
-      font-weight: 500;
-      padding-right: 16px;
-    }
-
-    &:not(:last-child) {
-      margin-bottom: 5px;
-    }
-  }
-
-  &__gas-fee {
-    border-bottom: 1px solid $geyser;
-  }
-
-  &__function-type {
-    font-size: .875rem;
-    font-weight: 500;
-    text-transform: capitalize;
-    color: $black;
-    padding-left: 5px;
-  }
-}
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js b/ui/app/components/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js
deleted file mode 100644
index e6fe8f82c..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import {
-  ENVIRONMENT_TYPE_POPUP,
-  ENVIRONMENT_TYPE_NOTIFICATION,
-} from '../../../../../app/scripts/lib/enums'
-import NetworkDisplay from '../../network-display'
-
-export default class ConfirmPageContainer extends Component {
-  static contextTypes = {
-    t: PropTypes.func,
-  }
-
-  static propTypes = {
-    showEdit: PropTypes.bool,
-    onEdit: PropTypes.func,
-    children: PropTypes.node,
-  }
-
-  renderTop () {
-    const { onEdit, showEdit } = this.props
-    const windowType = window.METAMASK_UI_TYPE
-    const isFullScreen = windowType !== ENVIRONMENT_TYPE_NOTIFICATION &&
-      windowType !== ENVIRONMENT_TYPE_POPUP
-
-    if (!showEdit && isFullScreen) {
-      return null
-    }
-
-    return (
-      <div className="confirm-page-container-header__row">
-        <div
-          className="confirm-page-container-header__back-button-container"
-          style={{
-            visibility: showEdit ? 'initial' : 'hidden',
-          }}
-        >
-          <img
-            src="/images/caret-left.svg"
-          />
-          <span
-            className="confirm-page-container-header__back-button"
-            onClick={() => onEdit()}
-          >
-            { this.context.t('edit') }
-          </span>
-        </div>
-        { !isFullScreen && <NetworkDisplay /> }
-      </div>
-    )
-  }
-
-  render () {
-    const { children } = this.props
-
-    return (
-      <div className="confirm-page-container-header">
-        { this.renderTop() }
-        { children }
-      </div>
-    )
-  }
-}
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-header/index.js b/ui/app/components/confirm-page-container/confirm-page-container-header/index.js
deleted file mode 100644
index 71feb6931..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-header/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './confirm-page-container-header.component'
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-header/index.scss b/ui/app/components/confirm-page-container/confirm-page-container-header/index.scss
deleted file mode 100644
index 43e1e4427..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-header/index.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-.confirm-page-container-header {
-  display: flex;
-  flex-direction: column;
-  flex: 0 0 auto;
-
-  &__row {
-    display: flex;
-    justify-content: space-between;
-    border-bottom: 1px solid $geyser;
-    padding: 13px 13px 13px 24px;
-    flex: 0 0 auto;
-  }
-
-  &__back-button-container {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-
-  &__back-button {
-    color: #2f9ae0;
-    font-size: 1rem;
-    cursor: pointer;
-    font-weight: 400;
-    padding-left: 5px;
-  }
-}
diff --git a/ui/app/components/confirm-page-container/confirm-page-container.component.js b/ui/app/components/confirm-page-container/confirm-page-container.component.js
deleted file mode 100644
index 8b2e47cbb..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container.component.js
+++ /dev/null
@@ -1,137 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import SenderToRecipient from '../sender-to-recipient'
-import { PageContainerFooter } from '../page-container'
-import { ConfirmPageContainerHeader, ConfirmPageContainerContent } from './'
-
-export default class ConfirmPageContainer extends Component {
-  static contextTypes = {
-    t: PropTypes.func,
-  }
-
-  static propTypes = {
-    // Header
-    action: PropTypes.string,
-    hideSubtitle: PropTypes.bool,
-    onEdit: PropTypes.func,
-    showEdit: PropTypes.bool,
-    subtitle: PropTypes.string,
-    subtitleComponent: PropTypes.node,
-    title: PropTypes.string,
-    titleComponent: PropTypes.node,
-    // Sender to Recipient
-    fromAddress: PropTypes.string,
-    fromName: PropTypes.string,
-    toAddress: PropTypes.string,
-    toName: PropTypes.string,
-    // Content
-    contentComponent: PropTypes.node,
-    errorKey: PropTypes.string,
-    errorMessage: PropTypes.string,
-    fiatTransactionAmount: PropTypes.string,
-    fiatTransactionFee: PropTypes.string,
-    fiatTransactionTotal: PropTypes.string,
-    ethTransactionAmount: PropTypes.string,
-    ethTransactionFee: PropTypes.string,
-    ethTransactionTotal: PropTypes.string,
-    onEditGas: PropTypes.func,
-    dataComponent: PropTypes.node,
-    detailsComponent: PropTypes.node,
-    identiconAddress: PropTypes.string,
-    nonce: PropTypes.string,
-    assetImage: PropTypes.string,
-    summaryComponent: PropTypes.node,
-    warning: PropTypes.string,
-    unapprovedTxCount: PropTypes.number,
-    // Footer
-    onCancelAll: PropTypes.func,
-    onCancel: PropTypes.func,
-    onSubmit: PropTypes.func,
-    disabled: PropTypes.bool,
-  }
-
-  render () {
-    const {
-      showEdit,
-      onEdit,
-      fromName,
-      fromAddress,
-      toName,
-      toAddress,
-      disabled,
-      errorKey,
-      errorMessage,
-      contentComponent,
-      action,
-      title,
-      titleComponent,
-      subtitle,
-      subtitleComponent,
-      hideSubtitle,
-      summaryComponent,
-      detailsComponent,
-      dataComponent,
-      onCancelAll,
-      onCancel,
-      onSubmit,
-      identiconAddress,
-      nonce,
-      unapprovedTxCount,
-      assetImage,
-      warning,
-    } = this.props
-    const renderAssetImage = contentComponent || (!contentComponent && !identiconAddress)
-
-    return (
-      <div className="page-container">
-        <ConfirmPageContainerHeader
-          showEdit={showEdit}
-          onEdit={() => onEdit()}
-        >
-          <SenderToRecipient
-            senderName={fromName}
-            senderAddress={fromAddress}
-            recipientName={toName}
-            recipientAddress={toAddress}
-            assetImage={renderAssetImage ? assetImage : undefined}
-          />
-        </ConfirmPageContainerHeader>
-        {
-          contentComponent || (
-            <ConfirmPageContainerContent
-              action={action}
-              title={title}
-              titleComponent={titleComponent}
-              subtitle={subtitle}
-              subtitleComponent={subtitleComponent}
-              hideSubtitle={hideSubtitle}
-              summaryComponent={summaryComponent}
-              detailsComponent={detailsComponent}
-              dataComponent={dataComponent}
-              errorMessage={errorMessage}
-              errorKey={errorKey}
-              identiconAddress={identiconAddress}
-              nonce={nonce}
-              assetImage={assetImage}
-              warning={warning}
-            />
-          )
-        }
-        <PageContainerFooter
-          onCancel={() => onCancel()}
-          cancelText={this.context.t('reject')}
-          onSubmit={() => onSubmit()}
-          submitText={this.context.t('confirm')}
-          submitButtonType="confirm"
-          disabled={disabled}
-        >
-          {unapprovedTxCount > 1 && (
-            <a onClick={() => onCancelAll()}>
-              {this.context.t('rejectTxsN', [unapprovedTxCount])}
-            </a>
-          )}
-        </PageContainerFooter>
-      </div>
-    )
-  }
-}
diff --git a/ui/app/components/confirm-page-container/index.js b/ui/app/components/confirm-page-container/index.js
deleted file mode 100644
index ee88aa5d3..000000000
--- a/ui/app/components/confirm-page-container/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export { default } from './confirm-page-container.component'
-export { default as ConfirmPageContainerHeader } from './confirm-page-container-header'
-export { default as ConfirmDetailRow } from './confirm-detail-row'
-export {
-  default as ConfirmPageContainerContent,
-  ConfirmPageContainerSummary,
-  ConfirmPageContainerError,
-} from './confirm-page-container-content'
diff --git a/ui/app/components/confirm-page-container/index.scss b/ui/app/components/confirm-page-container/index.scss
deleted file mode 100644
index af7a5b555..000000000
--- a/ui/app/components/confirm-page-container/index.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@import './confirm-page-container-content/index';
-
-@import './confirm-page-container-header/index';
-
-@import './confirm-detail-row/index';
diff --git a/ui/app/components/copyButton.js b/ui/app/components/copyButton.js
deleted file mode 100644
index a60d33523..000000000
--- a/ui/app/components/copyButton.js
+++ /dev/null
@@ -1,66 +0,0 @@
-const Component = require('react').Component
-const PropTypes = require('prop-types')
-const h = require('react-hyperscript')
-const inherits = require('util').inherits
-const copyToClipboard = require('copy-to-clipboard')
-const connect = require('react-redux').connect
-
-const Tooltip = require('./tooltip')
-
-CopyButton.contextTypes = {
-  t: PropTypes.func,
-}
-
-module.exports = connect()(CopyButton)
-
-
-inherits(CopyButton, Component)
-function CopyButton () {
-  Component.call(this)
-}
-
-// As parameters, accepts:
-// "value", which is the value to copy (mandatory)
-// "title", which is the text to show on hover (optional, defaults to 'Copy')
-CopyButton.prototype.render = function () {
-  const props = this.props
-  const state = this.state || {}
-
-  const value = props.value
-  const copied = state.copied
-
-  const message = copied ? this.context.t('copiedButton') : props.title || this.context.t('copyButton')
-
-  return h('.copy-button', {
-    style: {
-      display: 'flex',
-      alignItems: 'center',
-    },
-  }, [
-
-    h(Tooltip, {
-      title: message,
-    }, [
-      h('i.fa.fa-clipboard.cursor-pointer.color-orange', {
-        style: {
-          margin: '5px',
-        },
-        onClick: (event) => {
-          event.preventDefault()
-          event.stopPropagation()
-          copyToClipboard(value)
-          this.debounceRestore()
-        },
-      }),
-    ]),
-
-  ])
-}
-
-CopyButton.prototype.debounceRestore = function () {
-  this.setState({ copied: true })
-  clearTimeout(this.timeout)
-  this.timeout = setTimeout(() => {
-    this.setState({ copied: false })
-  }, 850)
-}
diff --git a/ui/app/components/copyable.js b/ui/app/components/copyable.js
deleted file mode 100644
index ad504deb8..000000000
--- a/ui/app/components/copyable.js
+++ /dev/null
@@ -1,53 +0,0 @@
-const Component = require('react').Component
-const PropTypes = require('prop-types')
-const h = require('react-hyperscript')
-const inherits = require('util').inherits
-
-const Tooltip = require('./tooltip')
-const copyToClipboard = require('copy-to-clipboard')
-const connect = require('react-redux').connect
-
-Copyable.contextTypes = {
-  t: PropTypes.func,
-}
-
-module.exports = connect()(Copyable)
-
-
-inherits(Copyable, Component)
-function Copyable () {
-  Component.call(this)
-  this.state = {
-    copied: false,
-  }
-}
-
-Copyable.prototype.render = function () {
-  const props = this.props
-  const state = this.state
-  const { value, children } = props
-  const { copied } = state
-
-  return h(Tooltip, {
-    title: copied ? this.context.t('copiedExclamation') : this.context.t('copy'),
-    position: 'bottom',
-  }, h('span', {
-    style: {
-      cursor: 'pointer',
-    },
-    onClick: (event) => {
-      event.preventDefault()
-      event.stopPropagation()
-      copyToClipboard(value)
-      this.debounceRestore()
-    },
-  }, children))
-}
-
-Copyable.prototype.debounceRestore = function () {
-  this.setState({ copied: true })
-  clearTimeout(this.timeout)
-  this.timeout = setTimeout(() => {
-    this.setState({ copied: false })
-  }, 850)
-}
diff --git a/ui/app/components/currency-display/currency-display.component.js b/ui/app/components/currency-display/currency-display.component.js
deleted file mode 100644
index 5f5717be3..000000000
--- a/ui/app/components/currency-display/currency-display.component.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React, { PureComponent } from 'react'
-import PropTypes from 'prop-types'
-import classnames from 'classnames'
-import { ETH, GWEI } from '../../constants/common'
-
-export default class CurrencyDisplay extends PureComponent {
-  static propTypes = {
-    className: PropTypes.string,
-    displayValue: PropTypes.string,
-    prefix: PropTypes.string,
-    prefixComponent: PropTypes.node,
-    style: PropTypes.object,
-    // Used in container
-    currency: PropTypes.oneOf([ETH]),
-    denomination: PropTypes.oneOf([GWEI]),
-    value: PropTypes.string,
-    numberOfDecimals: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    hideLabel: PropTypes.bool,
-  }
-
-  render () {
-    const { className, displayValue, prefix, prefixComponent, style } = this.props
-    const text = `${prefix || ''}${displayValue}`
-
-    return (
-      <div
-        className={classnames('currency-display-component', className)}
-        style={style}
-        title={text}
-      >
-        { prefixComponent}
-        <span className="currency-display-component__text">{ text }</span>
-      </div>
-    )
-  }
-}
diff --git a/ui/app/components/currency-display/currency-display.container.js b/ui/app/components/currency-display/currency-display.container.js
deleted file mode 100644
index b387229b5..000000000
--- a/ui/app/components/currency-display/currency-display.container.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { connect } from 'react-redux'
-import CurrencyDisplay from './currency-display.component'
-import { getValueFromWeiHex, formatCurrency } from '../../helpers/confirm-transaction/util'
-
-const mapStateToProps = state => {
-  const { metamask: { currentCurrency, conversionRate } } = state
-
-  return {
-    currentCurrency,
-    conversionRate,
-  }
-}
-
-const mergeProps = (stateProps, dispatchProps, ownProps) => {
-  const { currentCurrency, conversionRate, ...restStateProps } = stateProps
-  const {
-    value,
-    numberOfDecimals = 2,
-    currency,
-    denomination,
-    hideLabel,
-    ...restOwnProps
-  } = ownProps
-
-  const toCurrency = currency || currentCurrency
-  const convertedValue = getValueFromWeiHex({
-    value, toCurrency, conversionRate, numberOfDecimals, toDenomination: denomination,
-  })
-  const formattedValue = formatCurrency(convertedValue, toCurrency)
-  const displayValue = hideLabel ? formattedValue : `${formattedValue} ${toCurrency.toUpperCase()}`
-
-  return {
-    ...restStateProps,
-    ...dispatchProps,
-    ...restOwnProps,
-    displayValue,
-  }
-}
-
-export default connect(mapStateToProps, null, mergeProps)(CurrencyDisplay)
diff --git a/ui/app/components/currency-display/index.js b/ui/app/components/currency-display/index.js
deleted file mode 100644
index 38f08765f..000000000
--- a/ui/app/components/currency-display/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './currency-display.container'
diff --git a/ui/app/components/currency-display/index.scss b/ui/app/components/currency-display/index.scss
deleted file mode 100644
index 8c0196102..000000000
--- a/ui/app/components/currency-display/index.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.currency-display-component {
-  display: flex;
-  align-items: center;
-
-  &__text {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-}
diff --git a/ui/app/components/currency-display/tests/currency-display.component.test.js b/ui/app/components/currency-display/tests/currency-display.component.test.js
deleted file mode 100644
index d9ef052f1..000000000
--- a/ui/app/components/currency-display/tests/currency-display.component.test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import CurrencyDisplay from '../currency-display.component'
-
-describe('CurrencyDisplay Component', () => {
-  it('should render text with a className', () => {
-    const wrapper = shallow(<CurrencyDisplay
-      displayValue="$123.45"
-      className="currency-display"
-    />)
-
-    assert.ok(wrapper.hasClass('currency-display'))
-    assert.equal(wrapper.text(), '$123.45')
-  })
-
-  it('should render text with a prefix', () => {
-    const wrapper = shallow(<CurrencyDisplay
-      displayValue="$123.45"
-      className="currency-display"
-      prefix="-"
-    />)
-
-    assert.ok(wrapper.hasClass('currency-display'))
-    assert.equal(wrapper.text(), '-$123.45')
-  })
-})
diff --git a/ui/app/components/currency-display/tests/currency-display.container.test.js b/ui/app/components/currency-display/tests/currency-display.container.test.js
deleted file mode 100644
index b9f98c543..000000000
--- a/ui/app/components/currency-display/tests/currency-display.container.test.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-
-let mapStateToProps, mergeProps
-
-proxyquire('../currency-display.container.js', {
-  'react-redux': {
-    connect: (ms, md, mp) => {
-      mapStateToProps = ms
-      mergeProps = mp
-      return () => ({})
-    },
-  },
-})
-
-describe('CurrencyDisplay container', () => {
-  describe('mapStateToProps()', () => {
-    it('should return the correct props', () => {
-      const mockState = {
-        metamask: {
-          conversionRate: 280.45,
-          currentCurrency: 'usd',
-        },
-      }
-
-      assert.deepEqual(mapStateToProps(mockState), {
-        conversionRate: 280.45,
-        currentCurrency: 'usd',
-      })
-    })
-  })
-
-  describe('mergeProps()', () => {
-    it('should return the correct props', () => {
-      const mockStateProps = {
-        conversionRate: 280.45,
-        currentCurrency: 'usd',
-      }
-
-      const tests = [
-        {
-          props: {
-            value: '0x2386f26fc10000',
-            numberOfDecimals: 2,
-            currency: 'usd',
-          },
-          result: {
-            displayValue: '$2.80 USD',
-          },
-        },
-        {
-          props: {
-            value: '0x2386f26fc10000',
-          },
-          result: {
-            displayValue: '$2.80 USD',
-          },
-        },
-        {
-          props: {
-            value: '0x1193461d01595930',
-            currency: 'ETH',
-            numberOfDecimals: 3,
-          },
-          result: {
-            displayValue: '1.266 ETH',
-          },
-        },
-        {
-          props: {
-            value: '0x1193461d01595930',
-            currency: 'ETH',
-            numberOfDecimals: 3,
-            hideLabel: true,
-          },
-          result: {
-            displayValue: '1.266',
-          },
-        },
-        {
-          props: {
-            value: '0x3b9aca00',
-            currency: 'ETH',
-            denomination: 'GWEI',
-            hideLabel: true,
-          },
-          result: {
-            displayValue: '1',
-          },
-        },
-        {
-          props: {
-            value: '0x3b9aca00',
-            currency: 'ETH',
-            denomination: 'WEI',
-            hideLabel: true,
-          },
-          result: {
-            displayValue: '1000000000',
-          },
-        },
-        {
-          props: {
-            value: '0x3b9aca00',
-            currency: 'ETH',
-            numberOfDecimals: 100,
-            hideLabel: true,
-          },
-          result: {
-            displayValue: '1e-9',
-          },
-        },
-      ]
-
-      tests.forEach(({ props, result }) => {
-        assert.deepEqual(mergeProps(mockStateProps, {}, { ...props }), result)
-      })
-    })
-  })
-})
diff --git a/ui/app/components/error-message/error-message.component.js b/ui/app/components/error-message/error-message.component.js
deleted file mode 100644
index b4464c33b..000000000
--- a/ui/app/components/error-message/error-message.component.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-
-const ErrorMessage = (props, context) => {
-  const { errorMessage, errorKey } = props
-  const error = errorKey ? context.t(errorKey) : errorMessage
-
-  return (
-    <div className="error-message">
-      <img
-        src="/images/alert-red.svg"
-        className="error-message__icon"
-      />
-      <div className="error-message__text">
-        { `ALERT: ${error}` }
-      </div>
-    </div>
-  )
-}
-
-ErrorMessage.propTypes = {
-  errorMessage: PropTypes.string,
-  errorKey: PropTypes.string,
-}
-
-ErrorMessage.contextTypes = {
-  t: PropTypes.func,
-}
-
-export default ErrorMessage
diff --git a/ui/app/components/error-message/index.js b/ui/app/components/error-message/index.js
deleted file mode 100644
index 1c97a9955..000000000
--- a/ui/app/components/error-message/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './error-message.component'
diff --git a/ui/app/components/error-message/index.scss b/ui/app/components/error-message/index.scss
deleted file mode 100644
index 5915e21cf..000000000
--- a/ui/app/components/error-message/index.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-.error-message {
-  min-height: 32px;
-  border: 1px solid $monzo;
-  color: $monzo;
-  background: lighten($monzo, 56%);
-  border-radius: 4px;
-  font-size: .75rem;
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  padding: 8px 16px;
-
-  &__icon {
-    margin-right: 8px;
-    flex: 0 0 auto;
-  }
-
-  &__text {
-    overflow: auto;
-  }
-}
diff --git a/ui/app/components/error-message/tests/error-message.component.test.js b/ui/app/components/error-message/tests/error-message.component.test.js
deleted file mode 100644
index 8c5347173..000000000
--- a/ui/app/components/error-message/tests/error-message.component.test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import ErrorMessage from '../error-message.component'
-
-describe('ErrorMessage Component', () => {
-  const t = key => `translate ${key}`
-
-  it('should render a message from props.errorMessage', () => {
-    const wrapper = shallow(
-      <ErrorMessage
-        errorMessage="This is an error."
-      />,
-      { context: { t }}
-    )
-
-    assert.ok(wrapper)
-    assert.equal(wrapper.find('.error-message').length, 1)
-    assert.equal(wrapper.find('.error-message__icon').length, 1)
-    assert.equal(wrapper.find('.error-message__text').text(), 'ALERT: This is an error.')
-  })
-
-  it('should render a message translated from props.errorKey', () => {
-    const wrapper = shallow(
-      <ErrorMessage
-        errorKey="testKey"
-      />,
-      { context: { t }}
-    )
-
-    assert.ok(wrapper)
-    assert.equal(wrapper.find('.error-message').length, 1)
-    assert.equal(wrapper.find('.error-message__icon').length, 1)
-    assert.equal(wrapper.find('.error-message__text').text(), 'ALERT: translate testKey')
-  })
-})
diff --git a/ui/app/components/hex-to-decimal/hex-to-decimal.component.js b/ui/app/components/hex-to-decimal/hex-to-decimal.component.js
deleted file mode 100644
index 6847a6919..000000000
--- a/ui/app/components/hex-to-decimal/hex-to-decimal.component.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import React, { PureComponent } from 'react'
-import PropTypes from 'prop-types'
-import { hexToDecimal } from '../../helpers/conversions.util'
-
-export default class HexToDecimal extends PureComponent {
-  static propTypes = {
-    className: PropTypes.string,
-    value: PropTypes.string,
-  }
-
-  render () {
-    const { className, value } = this.props
-    const decimalValue = hexToDecimal(value)
-
-    return (
-      <div className={className}>
-        { decimalValue }
-      </div>
-    )
-  }
-}
diff --git a/ui/app/components/hex-to-decimal/index.js b/ui/app/components/hex-to-decimal/index.js
deleted file mode 100644
index 6e8567ca9..000000000
--- a/ui/app/components/hex-to-decimal/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './hex-to-decimal.component'
diff --git a/ui/app/components/hex-to-decimal/tests/hex-to-decimal.component.test.js b/ui/app/components/hex-to-decimal/tests/hex-to-decimal.component.test.js
deleted file mode 100644
index c98da9ad4..000000000
--- a/ui/app/components/hex-to-decimal/tests/hex-to-decimal.component.test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import HexToDecimal from '../hex-to-decimal.component'
-
-describe('HexToDecimal Component', () => {
-  it('should render a prefixed hex as a decimal with a className', () => {
-    const wrapper = shallow(<HexToDecimal
-      value="0x3039"
-      className="hex-to-decimal"
-    />)
-
-    assert.ok(wrapper.hasClass('hex-to-decimal'))
-    assert.equal(wrapper.text(), '12345')
-  })
-
-  it('should render an unprefixed hex as a decimal with a className', () => {
-    const wrapper = shallow(<HexToDecimal
-      value="1A85"
-      className="hex-to-decimal"
-    />)
-
-    assert.ok(wrapper.hasClass('hex-to-decimal'))
-    assert.equal(wrapper.text(), '6789')
-  })
-})
diff --git a/ui/app/components/input-number.js b/ui/app/components/input-number.js
deleted file mode 100644
index eec5e3740..000000000
--- a/ui/app/components/input-number.js
+++ /dev/null
@@ -1,81 +0,0 @@
-const Component = require('react').Component
-const h = require('react-hyperscript')
-const inherits = require('util').inherits
-const {
-  addCurrencies,
-  conversionGTE,
-  conversionLTE,
-  subtractCurrencies,
-} = require('../conversion-util')
-
-module.exports = InputNumber
-
-inherits(InputNumber, Component)
-function InputNumber () {
-  Component.call(this)
-
-  this.setValue = this.setValue.bind(this)
-}
-
-function isValidInput (text) {
-  const re = /^([1-9]\d*|0)(\.|\.\d*)?$/
-  return re.test(text)
-}
-
-function removeLeadingZeroes (str) {
-  return str.replace(/^0*(?=\d)/, '')
-}
-
-InputNumber.prototype.setValue = function (newValue) {
-  newValue = removeLeadingZeroes(newValue)
-  if (newValue && !isValidInput(newValue)) return
-  const { fixed, min = -1, max = Infinity, onChange } = this.props
-
-  newValue = fixed ? newValue.toFixed(4) : newValue
-  const newValueGreaterThanMin = conversionGTE(
-    { value: newValue || '0', fromNumericBase: 'dec' },
-    { value: min, fromNumericBase: 'hex' },
-  )
-
-  const newValueLessThanMax = conversionLTE(
-    { value: newValue || '0', fromNumericBase: 'dec' },
-    { value: max, fromNumericBase: 'hex' },
-  )
-  if (newValueGreaterThanMin && newValueLessThanMax) {
-    onChange(newValue)
-  } else if (!newValueGreaterThanMin) {
-    onChange(min)
-  } else if (!newValueLessThanMax) {
-    onChange(max)
-  }
-}
-
-InputNumber.prototype.render = function () {
-  const { unitLabel, step = 1, placeholder, value } = this.props
-
-  return h('div.customize-gas-input-wrapper', {}, [
-    h('input', {
-      className: 'customize-gas-input',
-      value,
-      placeholder,
-      type: 'number',
-      onChange: e => {
-        this.setValue(e.target.value)
-      },
-      min: 0,
-    }),
-    h('span.gas-tooltip-input-detail', {}, [unitLabel]),
-    h('div.gas-tooltip-input-arrows', {}, [
-      h('div.gas-tooltip-input-arrow-wrapper', {
-        onClick: () => this.setValue(addCurrencies(value, step, { toNumericBase: 'dec' })),
-      }, [
-        h('i.fa.fa-angle-up'),
-      ]),
-      h('div.gas-tooltip-input-arrow-wrapper', {
-        onClick: () => this.setValue(subtractCurrencies(value, step, { toNumericBase: 'dec' })),
-      }, [
-        h('i.fa.fa-angle-down'),
-      ]),
-    ]),
-  ])
-}
diff --git a/ui/app/components/send/README.md b/ui/app/components/send/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/account-list-item/account-list-item-README.md b/ui/app/components/send/account-list-item/account-list-item-README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/account-list-item/account-list-item.component.js b/ui/app/components/send/account-list-item/account-list-item.component.js
deleted file mode 100644
index 14bb7471f..000000000
--- a/ui/app/components/send/account-list-item/account-list-item.component.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import { checksumAddress } from '../../../util'
-import Identicon from '../../identicon'
-import UserPreferencedCurrencyDisplay from '../../user-preferenced-currency-display'
-import { PRIMARY, SECONDARY } from '../../../constants/common'
-
-export default class AccountListItem extends Component {
-
-  static propTypes = {
-    account: PropTypes.object,
-    className: PropTypes.string,
-    conversionRate: PropTypes.number,
-    currentCurrency: PropTypes.string,
-    displayAddress: PropTypes.bool,
-    displayBalance: PropTypes.bool,
-    handleClick: PropTypes.func,
-    icon: PropTypes.node,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  render () {
-    const {
-      account,
-      className,
-      displayAddress = false,
-      displayBalance = true,
-      handleClick,
-      icon = null,
-    } = this.props
-
-    const { name, address, balance } = account || {}
-
-    return (<div
-      className={`account-list-item ${className}`}
-      onClick={() => handleClick({ name, address, balance })}
-    >
-
-      <div className="account-list-item__top-row">
-        <Identicon
-          address={address}
-          className="account-list-item__identicon"
-          diameter={18}
-        />
-
-        <div className="account-list-item__account-name">{ name || address }</div>
-
-        {icon && <div className="account-list-item__icon">{ icon }</div>}
-
-      </div>
-
-      {displayAddress && name && <div className="account-list-item__account-address">
-        { checksumAddress(address) }
-      </div>}
-
-      {
-        displayBalance && (
-          <div className="account-list-item__account-balances">
-            <UserPreferencedCurrencyDisplay
-              type={PRIMARY}
-              value={balance}
-            />
-            <UserPreferencedCurrencyDisplay
-              type={SECONDARY}
-              value={balance}
-            />
-          </div>
-        )
-      }
-
-    </div>)
-  }
-}
diff --git a/ui/app/components/send/account-list-item/account-list-item.container.js b/ui/app/components/send/account-list-item/account-list-item.container.js
deleted file mode 100644
index 4b4519288..000000000
--- a/ui/app/components/send/account-list-item/account-list-item.container.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { connect } from 'react-redux'
-import {
-    getConversionRate,
-    getCurrentCurrency,
-} from '../send.selectors.js'
-import AccountListItem from './account-list-item.component'
-
-export default connect(mapStateToProps)(AccountListItem)
-
-function mapStateToProps (state) {
-  return {
-    conversionRate: getConversionRate(state),
-    currentCurrency: getCurrentCurrency(state),
-  }
-}
diff --git a/ui/app/components/send/account-list-item/account-list-item.scss b/ui/app/components/send/account-list-item/account-list-item.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/account-list-item/index.js b/ui/app/components/send/account-list-item/index.js
deleted file mode 100644
index 907485cf7..000000000
--- a/ui/app/components/send/account-list-item/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './account-list-item.container'
diff --git a/ui/app/components/send/account-list-item/tests/account-list-item-component.test.js b/ui/app/components/send/account-list-item/tests/account-list-item-component.test.js
deleted file mode 100644
index f88c0dbd0..000000000
--- a/ui/app/components/send/account-list-item/tests/account-list-item-component.test.js
+++ /dev/null
@@ -1,132 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import sinon from 'sinon'
-import proxyquire from 'proxyquire'
-import Identicon from '../../../identicon'
-import UserPreferencedCurrencyDisplay from '../../../user-preferenced-currency-display'
-
-const utilsMethodStubs = {
-  checksumAddress: sinon.stub().returns('mockCheckSumAddress'),
-}
-
-const AccountListItem = proxyquire('../account-list-item.component.js', {
-  '../../../util': utilsMethodStubs,
-}).default
-
-
-const propsMethodSpies = {
-  handleClick: sinon.spy(),
-}
-
-describe('AccountListItem Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(<AccountListItem
-      account={ { address: 'mockAddress', name: 'mockName', balance: 'mockBalance' } }
-      className={'mockClassName'}
-      conversionRate={4}
-      currentCurrency={'mockCurrentyCurrency'}
-      displayAddress={false}
-      displayBalance={false}
-      handleClick={propsMethodSpies.handleClick}
-      icon={<i className="mockIcon" />}
-    />, { context: { t: str => str + '_t' } })
-  })
-
-  afterEach(() => {
-    propsMethodSpies.handleClick.resetHistory()
-  })
-
-  describe('render', () => {
-    it('should render a div with the passed className', () => {
-      assert.equal(wrapper.find('.mockClassName').length, 1)
-      assert(wrapper.find('.mockClassName').is('div'))
-      assert(wrapper.find('.mockClassName').hasClass('account-list-item'))
-    })
-
-    it('should call handleClick with the expected props when the root div is clicked', () => {
-      const { onClick } = wrapper.find('.mockClassName').props()
-      assert.equal(propsMethodSpies.handleClick.callCount, 0)
-      onClick()
-      assert.equal(propsMethodSpies.handleClick.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.handleClick.getCall(0).args,
-        [{ address: 'mockAddress', name: 'mockName', balance: 'mockBalance' }]
-      )
-    })
-
-    it('should have a top row div', () => {
-      assert.equal(wrapper.find('.mockClassName > .account-list-item__top-row').length, 1)
-      assert(wrapper.find('.mockClassName > .account-list-item__top-row').is('div'))
-    })
-
-    it('should have an identicon, name and icon in the top row', () => {
-      const topRow = wrapper.find('.mockClassName > .account-list-item__top-row')
-      assert.equal(topRow.find(Identicon).length, 1)
-      assert.equal(topRow.find('.account-list-item__account-name').length, 1)
-      assert.equal(topRow.find('.account-list-item__icon').length, 1)
-    })
-
-    it('should show the account name if it exists', () => {
-      const topRow = wrapper.find('.mockClassName > .account-list-item__top-row')
-      assert.equal(topRow.find('.account-list-item__account-name').text(), 'mockName')
-    })
-
-    it('should show the account address if there is no name', () => {
-      wrapper.setProps({ account: { address: 'addressButNoName' } })
-      const topRow = wrapper.find('.mockClassName > .account-list-item__top-row')
-      assert.equal(topRow.find('.account-list-item__account-name').text(), 'addressButNoName')
-    })
-
-    it('should render the passed icon', () => {
-      const topRow = wrapper.find('.mockClassName > .account-list-item__top-row')
-      assert(topRow.find('.account-list-item__icon').childAt(0).is('i'))
-      assert(topRow.find('.account-list-item__icon').childAt(0).hasClass('mockIcon'))
-    })
-
-    it('should not render an icon if none is passed', () => {
-      wrapper.setProps({ icon: null })
-      const topRow = wrapper.find('.mockClassName > .account-list-item__top-row')
-      assert.equal(topRow.find('.account-list-item__icon').length, 0)
-    })
-
-    it('should render the account address as a checksumAddress if displayAddress is true and name is provided', () => {
-      wrapper.setProps({ displayAddress: true })
-      assert.equal(wrapper.find('.account-list-item__account-address').length, 1)
-      assert.equal(wrapper.find('.account-list-item__account-address').text(), 'mockCheckSumAddress')
-      assert.deepEqual(
-        utilsMethodStubs.checksumAddress.getCall(0).args,
-        ['mockAddress']
-      )
-    })
-
-    it('should not render the account address as a checksumAddress if displayAddress is false', () => {
-      wrapper.setProps({ displayAddress: false })
-      assert.equal(wrapper.find('.account-list-item__account-address').length, 0)
-    })
-
-    it('should not render the account address as a checksumAddress if name is not provided', () => {
-      wrapper.setProps({ account: { address: 'someAddressButNoName' } })
-      assert.equal(wrapper.find('.account-list-item__account-address').length, 0)
-    })
-
-    it('should render a CurrencyDisplay with the correct props if displayBalance is true', () => {
-      wrapper.setProps({ displayBalance: true })
-      assert.equal(wrapper.find(UserPreferencedCurrencyDisplay).length, 2)
-      assert.deepEqual(
-        wrapper.find(UserPreferencedCurrencyDisplay).at(0).props(),
-        {
-          type: 'PRIMARY',
-          value: 'mockBalance',
-        }
-      )
-    })
-
-    it('should not render a CurrencyDisplay if displayBalance is false', () => {
-      wrapper.setProps({ displayBalance: false })
-      assert.equal(wrapper.find(UserPreferencedCurrencyDisplay).length, 0)
-    })
-  })
-})
diff --git a/ui/app/components/send/account-list-item/tests/account-list-item-container.test.js b/ui/app/components/send/account-list-item/tests/account-list-item-container.test.js
deleted file mode 100644
index af0859117..000000000
--- a/ui/app/components/send/account-list-item/tests/account-list-item-container.test.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-
-let mapStateToProps
-
-proxyquire('../account-list-item.container.js', {
-  'react-redux': {
-    connect: (ms, md) => {
-      mapStateToProps = ms
-      return () => ({})
-    },
-  },
-  '../send.selectors.js': {
-    getConversionRate: (s) => `mockConversionRate:${s}`,
-    getCurrentCurrency: (s) => `mockCurrentCurrency:${s}`,
-  },
-})
-
-describe('account-list-item container', () => {
-
-  describe('mapStateToProps()', () => {
-
-    it('should map the correct properties to props', () => {
-      assert.deepEqual(mapStateToProps('mockState'), {
-        conversionRate: 'mockConversionRate:mockState',
-        currentCurrency: 'mockCurrentCurrency:mockState',
-      })
-    })
-
-  })
-
-})
diff --git a/ui/app/components/send/index.js b/ui/app/components/send/index.js
deleted file mode 100644
index b5114babc..000000000
--- a/ui/app/components/send/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './send.container'
diff --git a/ui/app/components/send/send-content/index.js b/ui/app/components/send/send-content/index.js
deleted file mode 100644
index 891c17e6a..000000000
--- a/ui/app/components/send/send-content/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './send-content.component'
diff --git a/ui/app/components/send/send-content/send-amount-row/README.md b/ui/app/components/send/send-content/send-amount-row/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.component.js b/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.component.js
deleted file mode 100644
index ceb620941..000000000
--- a/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.component.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-
-export default class AmountMaxButton extends Component {
-
-  static propTypes = {
-    balance: PropTypes.string,
-    gasTotal: PropTypes.string,
-    maxModeOn: PropTypes.bool,
-    selectedToken: PropTypes.object,
-    setAmountToMax: PropTypes.func,
-    setMaxModeTo: PropTypes.func,
-    tokenBalance: PropTypes.string,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  setMaxAmount () {
-    const {
-      balance,
-      gasTotal,
-      selectedToken,
-      setAmountToMax,
-      tokenBalance,
-    } = this.props
-
-    setAmountToMax({
-      balance,
-      gasTotal,
-      selectedToken,
-      tokenBalance,
-    })
-  }
-
-  onMaxClick = (event) => {
-    const { setMaxModeTo } = this.props
-
-    event.preventDefault()
-    setMaxModeTo(true)
-    this.setMaxAmount()
-  }
-
-  render () {
-    return this.props.maxModeOn
-      ? null
-      : (
-        <div>
-          <span
-            className="send-v2__amount-max"
-            onClick={this.onMaxClick}
-          >
-            {this.context.t('max')}
-          </span>
-        </div>
-      )
-  }
-
-}
diff --git a/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.container.js b/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.container.js
deleted file mode 100644
index 2d2ec42f7..000000000
--- a/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.container.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { connect } from 'react-redux'
-import {
-  getGasTotal,
-  getSelectedToken,
-  getSendFromBalance,
-  getTokenBalance,
-} from '../../../send.selectors.js'
-import { getMaxModeOn } from './amount-max-button.selectors.js'
-import { calcMaxAmount } from './amount-max-button.utils.js'
-import {
-  updateSendAmount,
-  setMaxModeTo,
-} from '../../../../../actions'
-import AmountMaxButton from './amount-max-button.component'
-import {
-  updateSendErrors,
-} from '../../../../../ducks/send.duck'
-
-export default connect(mapStateToProps, mapDispatchToProps)(AmountMaxButton)
-
-function mapStateToProps (state) {
-
-  return {
-    balance: getSendFromBalance(state),
-    gasTotal: getGasTotal(state),
-    maxModeOn: getMaxModeOn(state),
-    selectedToken: getSelectedToken(state),
-    tokenBalance: getTokenBalance(state),
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return {
-    setAmountToMax: maxAmountDataObject => {
-      dispatch(updateSendErrors({ amount: null }))
-      dispatch(updateSendAmount(calcMaxAmount(maxAmountDataObject)))
-    },
-    setMaxModeTo: bool => dispatch(setMaxModeTo(bool)),
-  }
-}
diff --git a/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.selectors.js b/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.selectors.js
deleted file mode 100644
index 69fec1994..000000000
--- a/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.selectors.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const selectors = {
-  getMaxModeOn,
-}
-
-module.exports = selectors
-
-function getMaxModeOn (state) {
-  return state.metamask.send.maxModeOn
-}
diff --git a/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.utils.js b/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.utils.js
deleted file mode 100644
index b490a7fd7..000000000
--- a/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.utils.js
+++ /dev/null
@@ -1,22 +0,0 @@
-const {
-  multiplyCurrencies,
-  subtractCurrencies,
-} = require('../../../../../conversion-util')
-const ethUtil = require('ethereumjs-util')
-
-function calcMaxAmount ({ balance, gasTotal, selectedToken, tokenBalance }) {
-    const { decimals } = selectedToken || {}
-    const multiplier = Math.pow(10, Number(decimals || 0))
-
-    return selectedToken
-      ? multiplyCurrencies(tokenBalance, multiplier, {toNumericBase: 'hex'})
-      : subtractCurrencies(
-        ethUtil.addHexPrefix(balance),
-        ethUtil.addHexPrefix(gasTotal),
-        { toNumericBase: 'hex' }
-      )
-}
-
-module.exports = {
-  calcMaxAmount,
-}
diff --git a/ui/app/components/send/send-content/send-amount-row/amount-max-button/index.js b/ui/app/components/send/send-content/send-amount-row/amount-max-button/index.js
deleted file mode 100644
index ee8271494..000000000
--- a/ui/app/components/send/send-content/send-amount-row/amount-max-button/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './amount-max-button.container'
diff --git a/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-component.test.js b/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-component.test.js
deleted file mode 100644
index b04d3897f..000000000
--- a/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-component.test.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import sinon from 'sinon'
-import AmountMaxButton from '../amount-max-button.component.js'
-
-const propsMethodSpies = {
-  setAmountToMax: sinon.spy(),
-  setMaxModeTo: sinon.spy(),
-}
-
-const MOCK_EVENT = { preventDefault: () => {} }
-
-sinon.spy(AmountMaxButton.prototype, 'setMaxAmount')
-
-describe('AmountMaxButton Component', function () {
-  let wrapper
-  let instance
-
-  beforeEach(() => {
-    wrapper = shallow(<AmountMaxButton
-      balance={'mockBalance'}
-      gasTotal={'mockGasTotal'}
-      maxModeOn={false}
-      selectedToken={ { address: 'mockTokenAddress' } }
-      setAmountToMax={propsMethodSpies.setAmountToMax}
-      setMaxModeTo={propsMethodSpies.setMaxModeTo}
-      tokenBalance={'mockTokenBalance'}
-    />, { context: { t: str => str + '_t' } })
-    instance = wrapper.instance()
-  })
-
-  afterEach(() => {
-    propsMethodSpies.setAmountToMax.resetHistory()
-    propsMethodSpies.setMaxModeTo.resetHistory()
-    AmountMaxButton.prototype.setMaxAmount.resetHistory()
-  })
-
-  describe('setMaxAmount', () => {
-
-    it('should call setAmountToMax with the correct params', () => {
-      assert.equal(propsMethodSpies.setAmountToMax.callCount, 0)
-      instance.setMaxAmount()
-      assert.equal(propsMethodSpies.setAmountToMax.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.setAmountToMax.getCall(0).args,
-        [{
-          balance: 'mockBalance',
-          gasTotal: 'mockGasTotal',
-          selectedToken: { address: 'mockTokenAddress' },
-          tokenBalance: 'mockTokenBalance',
-        }]
-      )
-    })
-
-  })
-
-  describe('render', () => {
-    it('should render an element with a send-v2__amount-max class', () => {
-      assert(wrapper.exists('.send-v2__amount-max'))
-    })
-
-    it('should call setMaxModeTo and setMaxAmount when the send-v2__amount-max div is clicked', () => {
-      const {
-        onClick,
-      } = wrapper.find('.send-v2__amount-max').props()
-
-      assert.equal(AmountMaxButton.prototype.setMaxAmount.callCount, 0)
-      assert.equal(propsMethodSpies.setMaxModeTo.callCount, 0)
-      onClick(MOCK_EVENT)
-      assert.equal(AmountMaxButton.prototype.setMaxAmount.callCount, 1)
-      assert.equal(propsMethodSpies.setMaxModeTo.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.setMaxModeTo.getCall(0).args,
-        [true]
-      )
-    })
-
-    it('should not render anything when maxModeOn is true', () => {
-      wrapper.setProps({ maxModeOn: true })
-      assert.ok(!wrapper.exists('.send-v2__amount-max'))
-    })
-
-    it('should render the expected text when maxModeOn is false', () => {
-      wrapper.setProps({ maxModeOn: false })
-      assert.equal(wrapper.find('.send-v2__amount-max').text(), 'max_t')
-    })
-  })
-})
diff --git a/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-container.test.js b/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-container.test.js
deleted file mode 100644
index 2cc00d6d6..000000000
--- a/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-container.test.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-import sinon from 'sinon'
-
-let mapStateToProps
-let mapDispatchToProps
-
-const actionSpies = {
-  setMaxModeTo: sinon.spy(),
-  updateSendAmount: sinon.spy(),
-}
-const duckActionSpies = {
-  updateSendErrors: sinon.spy(),
-}
-
-proxyquire('../amount-max-button.container.js', {
-  'react-redux': {
-    connect: (ms, md) => {
-      mapStateToProps = ms
-      mapDispatchToProps = md
-      return () => ({})
-    },
-  },
-  '../../../send.selectors.js': {
-    getGasTotal: (s) => `mockGasTotal:${s}`,
-    getSelectedToken: (s) => `mockSelectedToken:${s}`,
-    getSendFromBalance: (s) => `mockBalance:${s}`,
-    getTokenBalance: (s) => `mockTokenBalance:${s}`,
-  },
-  './amount-max-button.selectors.js': { getMaxModeOn: (s) => `mockMaxModeOn:${s}` },
-  './amount-max-button.utils.js': { calcMaxAmount: (mockObj) => mockObj.val + 1 },
-  '../../../../../actions': actionSpies,
-  '../../../../../ducks/send.duck': duckActionSpies,
-})
-
-describe('amount-max-button container', () => {
-
-  describe('mapStateToProps()', () => {
-
-    it('should map the correct properties to props', () => {
-      assert.deepEqual(mapStateToProps('mockState'), {
-        balance: 'mockBalance:mockState',
-        gasTotal: 'mockGasTotal:mockState',
-        maxModeOn: 'mockMaxModeOn:mockState',
-        selectedToken: 'mockSelectedToken:mockState',
-        tokenBalance: 'mockTokenBalance:mockState',
-      })
-    })
-
-  })
-
-  describe('mapDispatchToProps()', () => {
-    let dispatchSpy
-    let mapDispatchToPropsObject
-
-    beforeEach(() => {
-      dispatchSpy = sinon.spy()
-      mapDispatchToPropsObject = mapDispatchToProps(dispatchSpy)
-    })
-
-    describe('setAmountToMax()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.setAmountToMax({ val: 11, foo: 'bar' })
-        assert(dispatchSpy.calledTwice)
-        assert(duckActionSpies.updateSendErrors.calledOnce)
-        assert.deepEqual(
-          duckActionSpies.updateSendErrors.getCall(0).args[0],
-          { amount: null }
-        )
-        assert(actionSpies.updateSendAmount.calledOnce)
-        assert.equal(
-          actionSpies.updateSendAmount.getCall(0).args[0],
-          12
-        )
-      })
-    })
-
-    describe('setMaxModeTo()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.setMaxModeTo('mockVal')
-        assert(dispatchSpy.calledOnce)
-        assert.equal(
-          actionSpies.setMaxModeTo.getCall(0).args[0],
-          'mockVal'
-        )
-      })
-    })
-
-  })
-
-})
diff --git a/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-selectors.test.js b/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-selectors.test.js
deleted file mode 100644
index 655fe1969..000000000
--- a/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-selectors.test.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import assert from 'assert'
-import {
-  getMaxModeOn,
-} from '../amount-max-button.selectors.js'
-
-describe('amount-max-button selectors', () => {
-
-  describe('getMaxModeOn()', () => {
-    it('should', () => {
-      const state = {
-        metamask: {
-          send: {
-            maxModeOn: null,
-          },
-        },
-      }
-
-      assert.equal(getMaxModeOn(state), null)
-    })
-  })
-
-})
diff --git a/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-utils.test.js b/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-utils.test.js
deleted file mode 100644
index 816df6a12..000000000
--- a/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-utils.test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import assert from 'assert'
-import {
-  calcMaxAmount,
-} from '../amount-max-button.utils.js'
-
-describe('amount-max-button utils', () => {
-
-  describe('calcMaxAmount()', () => {
-    it('should calculate the correct amount when no selectedToken defined', () => {
-      assert.deepEqual(calcMaxAmount({
-        balance: 'ffffff',
-        gasTotal: 'ff',
-        selectedToken: false,
-      }), 'ffff00')
-    })
-
-    it('should calculate the correct amount when a selectedToken is defined', () => {
-      assert.deepEqual(calcMaxAmount({
-        selectedToken: {
-          decimals: 10,
-        },
-        tokenBalance: 100,
-      }), 'e8d4a51000')
-    })
-  })
-
-})
diff --git a/ui/app/components/send/send-content/send-amount-row/index.js b/ui/app/components/send/send-content/send-amount-row/index.js
deleted file mode 100644
index abc6852fe..000000000
--- a/ui/app/components/send/send-content/send-amount-row/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './send-amount-row.container'
diff --git a/ui/app/components/send/send-content/send-amount-row/send-amount-row.component.js b/ui/app/components/send/send-content/send-amount-row/send-amount-row.component.js
deleted file mode 100644
index 0268376bf..000000000
--- a/ui/app/components/send/send-content/send-amount-row/send-amount-row.component.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import SendRowWrapper from '../send-row-wrapper/'
-import AmountMaxButton from './amount-max-button/'
-import UserPreferencedCurrencyInput from '../../../user-preferenced-currency-input'
-import UserPreferencedTokenInput from '../../../user-preferenced-token-input'
-
-export default class SendAmountRow extends Component {
-
-  static propTypes = {
-    amount: PropTypes.string,
-    amountConversionRate: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.number,
-    ]),
-    balance: PropTypes.string,
-    conversionRate: PropTypes.number,
-    convertedCurrency: PropTypes.string,
-    gasTotal: PropTypes.string,
-    inError: PropTypes.bool,
-    primaryCurrency: PropTypes.string,
-    selectedToken: PropTypes.object,
-    setMaxModeTo: PropTypes.func,
-    tokenBalance: PropTypes.string,
-    updateGasFeeError: PropTypes.func,
-    updateSendAmount: PropTypes.func,
-    updateSendAmountError: PropTypes.func,
-    updateGas: PropTypes.func,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  validateAmount (amount) {
-    const {
-      amountConversionRate,
-      balance,
-      conversionRate,
-      gasTotal,
-      primaryCurrency,
-      selectedToken,
-      tokenBalance,
-      updateGasFeeError,
-      updateSendAmountError,
-    } = this.props
-
-    updateSendAmountError({
-      amount,
-      amountConversionRate,
-      balance,
-      conversionRate,
-      gasTotal,
-      primaryCurrency,
-      selectedToken,
-      tokenBalance,
-    })
-
-    if (selectedToken) {
-      updateGasFeeError({
-        amount,
-        amountConversionRate,
-        balance,
-        conversionRate,
-        gasTotal,
-        primaryCurrency,
-        selectedToken,
-        tokenBalance,
-      })
-    }
-  }
-
-  updateAmount (amount) {
-    const { updateSendAmount, setMaxModeTo } = this.props
-
-    setMaxModeTo(false)
-    updateSendAmount(amount)
-  }
-
-  updateGas (amount) {
-    const { selectedToken, updateGas } = this.props
-
-    if (selectedToken) {
-      updateGas({ amount })
-    }
-  }
-
-  renderInput () {
-    const { amount, inError, selectedToken } = this.props
-    const Component = selectedToken ? UserPreferencedTokenInput : UserPreferencedCurrencyInput
-
-    return (
-      <Component
-        onChange={newAmount => this.validateAmount(newAmount)}
-        onBlur={newAmount => {
-          this.updateGas(newAmount)
-          this.updateAmount(newAmount)
-        }}
-        error={inError}
-        value={amount}
-      />
-    )
-  }
-
-  render () {
-    const { gasTotal, inError } = this.props
-
-    return (
-      <SendRowWrapper
-        label={`${this.context.t('amount')}:`}
-        showError={inError}
-        errorType={'amount'}
-      >
-        {!inError && gasTotal && <AmountMaxButton />}
-        { this.renderInput() }
-      </SendRowWrapper>
-    )
-  }
-
-}
diff --git a/ui/app/components/send/send-content/send-amount-row/send-amount-row.container.js b/ui/app/components/send/send-content/send-amount-row/send-amount-row.container.js
deleted file mode 100644
index 3504d1b73..000000000
--- a/ui/app/components/send/send-content/send-amount-row/send-amount-row.container.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { connect } from 'react-redux'
-import {
-  getAmountConversionRate,
-  getConversionRate,
-  getCurrentCurrency,
-  getGasTotal,
-  getPrimaryCurrency,
-  getSelectedToken,
-  getSendAmount,
-  getSendFromBalance,
-  getTokenBalance,
-} from '../../send.selectors'
-import {
-  sendAmountIsInError,
-} from './send-amount-row.selectors'
-import { getAmountErrorObject, getGasFeeErrorObject } from '../../send.utils'
-import {
-  setMaxModeTo,
-  updateSendAmount,
-} from '../../../../actions'
-import {
-  updateSendErrors,
-} from '../../../../ducks/send.duck'
-import SendAmountRow from './send-amount-row.component'
-
-export default connect(mapStateToProps, mapDispatchToProps)(SendAmountRow)
-
-function mapStateToProps (state) {
-  return {
-    amount: getSendAmount(state),
-    amountConversionRate: getAmountConversionRate(state),
-    balance: getSendFromBalance(state),
-    conversionRate: getConversionRate(state),
-    convertedCurrency: getCurrentCurrency(state),
-    gasTotal: getGasTotal(state),
-    inError: sendAmountIsInError(state),
-    primaryCurrency: getPrimaryCurrency(state),
-    selectedToken: getSelectedToken(state),
-    tokenBalance: getTokenBalance(state),
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return {
-    setMaxModeTo: bool => dispatch(setMaxModeTo(bool)),
-    updateSendAmount: newAmount => dispatch(updateSendAmount(newAmount)),
-    updateGasFeeError: (amountDataObject) => {
-        dispatch(updateSendErrors(getGasFeeErrorObject(amountDataObject)))
-    },
-    updateSendAmountError: (amountDataObject) => {
-        dispatch(updateSendErrors(getAmountErrorObject(amountDataObject)))
-    },
-  }
-}
diff --git a/ui/app/components/send/send-content/send-amount-row/send-amount-row.scss b/ui/app/components/send/send-content/send-amount-row/send-amount-row.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-content/send-amount-row/send-amount-row.selectors.js b/ui/app/components/send/send-content/send-amount-row/send-amount-row.selectors.js
deleted file mode 100644
index fb08c7ed7..000000000
--- a/ui/app/components/send/send-content/send-amount-row/send-amount-row.selectors.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const selectors = {
-  sendAmountIsInError,
-}
-
-module.exports = selectors
-
-function sendAmountIsInError (state) {
-  return Boolean(state.send.errors.amount)
-}
diff --git a/ui/app/components/send/send-content/send-amount-row/tests/send-amount-row-component.test.js b/ui/app/components/send/send-content/send-amount-row/tests/send-amount-row-component.test.js
deleted file mode 100644
index e63db4a2d..000000000
--- a/ui/app/components/send/send-content/send-amount-row/tests/send-amount-row-component.test.js
+++ /dev/null
@@ -1,189 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import sinon from 'sinon'
-import SendAmountRow from '../send-amount-row.component.js'
-
-import SendRowWrapper from '../../send-row-wrapper/send-row-wrapper.component'
-import AmountMaxButton from '../amount-max-button/amount-max-button.container'
-import UserPreferencedTokenInput from '../../../../user-preferenced-token-input'
-
-const propsMethodSpies = {
-  setMaxModeTo: sinon.spy(),
-  updateSendAmount: sinon.spy(),
-  updateSendAmountError: sinon.spy(),
-  updateGas: sinon.spy(),
-  updateGasFeeError: sinon.spy(),
-}
-
-sinon.spy(SendAmountRow.prototype, 'updateAmount')
-sinon.spy(SendAmountRow.prototype, 'validateAmount')
-sinon.spy(SendAmountRow.prototype, 'updateGas')
-
-describe('SendAmountRow Component', function () {
-  let wrapper
-  let instance
-
-  beforeEach(() => {
-    wrapper = shallow(<SendAmountRow
-      amount={'mockAmount'}
-      amountConversionRate={'mockAmountConversionRate'}
-      balance={'mockBalance'}
-      conversionRate={7}
-      convertedCurrency={'mockConvertedCurrency'}
-      gasTotal={'mockGasTotal'}
-      inError={false}
-      primaryCurrency={'mockPrimaryCurrency'}
-      selectedToken={ { address: 'mockTokenAddress' } }
-      setMaxModeTo={propsMethodSpies.setMaxModeTo}
-      tokenBalance={'mockTokenBalance'}
-      updateGasFeeError={propsMethodSpies.updateGasFeeError}
-      updateSendAmount={propsMethodSpies.updateSendAmount}
-      updateSendAmountError={propsMethodSpies.updateSendAmountError}
-      updateGas={propsMethodSpies.updateGas}
-    />, { context: { t: str => str + '_t' } })
-    instance = wrapper.instance()
-  })
-
-  afterEach(() => {
-    propsMethodSpies.setMaxModeTo.resetHistory()
-    propsMethodSpies.updateSendAmount.resetHistory()
-    propsMethodSpies.updateSendAmountError.resetHistory()
-    propsMethodSpies.updateGasFeeError.resetHistory()
-    SendAmountRow.prototype.validateAmount.resetHistory()
-    SendAmountRow.prototype.updateAmount.resetHistory()
-  })
-
-  describe('validateAmount', () => {
-
-    it('should call updateSendAmountError with the correct params', () => {
-      assert.equal(propsMethodSpies.updateSendAmountError.callCount, 0)
-      instance.validateAmount('someAmount')
-      assert.equal(propsMethodSpies.updateSendAmountError.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.updateSendAmountError.getCall(0).args,
-        [{
-          amount: 'someAmount',
-          amountConversionRate: 'mockAmountConversionRate',
-          balance: 'mockBalance',
-          conversionRate: 7,
-          gasTotal: 'mockGasTotal',
-          primaryCurrency: 'mockPrimaryCurrency',
-          selectedToken: { address: 'mockTokenAddress' },
-          tokenBalance: 'mockTokenBalance',
-        }]
-      )
-    })
-
-    it('should call updateGasFeeError if selectedToken is truthy', () => {
-      assert.equal(propsMethodSpies.updateGasFeeError.callCount, 0)
-      instance.validateAmount('someAmount')
-      assert.equal(propsMethodSpies.updateGasFeeError.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.updateGasFeeError.getCall(0).args,
-        [{
-          amount: 'someAmount',
-          amountConversionRate: 'mockAmountConversionRate',
-          balance: 'mockBalance',
-          conversionRate: 7,
-          gasTotal: 'mockGasTotal',
-          primaryCurrency: 'mockPrimaryCurrency',
-          selectedToken: { address: 'mockTokenAddress' },
-          tokenBalance: 'mockTokenBalance',
-        }]
-      )
-    })
-
-    it('should call not updateGasFeeError if selectedToken is falsey', () => {
-      wrapper.setProps({ selectedToken: null })
-      assert.equal(propsMethodSpies.updateGasFeeError.callCount, 0)
-      instance.validateAmount('someAmount')
-      assert.equal(propsMethodSpies.updateGasFeeError.callCount, 0)
-    })
-
-  })
-
-  describe('updateAmount', () => {
-
-    it('should call setMaxModeTo', () => {
-      assert.equal(propsMethodSpies.setMaxModeTo.callCount, 0)
-      instance.updateAmount('someAmount')
-      assert.equal(propsMethodSpies.setMaxModeTo.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.setMaxModeTo.getCall(0).args,
-        [false]
-      )
-    })
-
-    it('should call updateSendAmount', () => {
-      assert.equal(propsMethodSpies.updateSendAmount.callCount, 0)
-      instance.updateAmount('someAmount')
-      assert.equal(propsMethodSpies.updateSendAmount.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.updateSendAmount.getCall(0).args,
-        ['someAmount']
-      )
-    })
-
-  })
-
-  describe('render', () => {
-    it('should render a SendRowWrapper component', () => {
-      assert.equal(wrapper.find(SendRowWrapper).length, 1)
-    })
-
-    it('should pass the correct props to SendRowWrapper', () => {
-      const {
-        errorType,
-        label,
-        showError,
-      } = wrapper.find(SendRowWrapper).props()
-
-      assert.equal(errorType, 'amount')
-
-      assert.equal(label, 'amount_t:')
-
-      assert.equal(showError, false)
-    })
-
-    it('should render an AmountMaxButton as the first child of the SendRowWrapper', () => {
-      assert(wrapper.find(SendRowWrapper).childAt(0).is(AmountMaxButton))
-    })
-
-    it('should render a UserPreferencedTokenInput as the second child of the SendRowWrapper', () => {
-      console.log('HI', wrapper.find(SendRowWrapper).childAt(1))
-      assert(wrapper.find(SendRowWrapper).childAt(1).is(UserPreferencedTokenInput))
-    })
-
-    it('should render the UserPreferencedTokenInput with the correct props', () => {
-      const {
-        onBlur,
-        onChange,
-        error,
-        value,
-      } = wrapper.find(SendRowWrapper).childAt(1).props()
-      assert.equal(error, false)
-      assert.equal(value, 'mockAmount')
-      assert.equal(SendAmountRow.prototype.updateGas.callCount, 0)
-      assert.equal(SendAmountRow.prototype.updateAmount.callCount, 0)
-      onBlur('mockNewAmount')
-      assert.equal(SendAmountRow.prototype.updateGas.callCount, 1)
-      assert.deepEqual(
-        SendAmountRow.prototype.updateGas.getCall(0).args,
-        ['mockNewAmount']
-      )
-      assert.equal(SendAmountRow.prototype.updateAmount.callCount, 1)
-      assert.deepEqual(
-        SendAmountRow.prototype.updateAmount.getCall(0).args,
-        ['mockNewAmount']
-      )
-      assert.equal(SendAmountRow.prototype.validateAmount.callCount, 0)
-      onChange('mockNewAmount')
-      assert.equal(SendAmountRow.prototype.validateAmount.callCount, 1)
-      assert.deepEqual(
-        SendAmountRow.prototype.validateAmount.getCall(0).args,
-        ['mockNewAmount']
-      )
-    })
-  })
-})
diff --git a/ui/app/components/send/send-content/send-amount-row/tests/send-amount-row-container.test.js b/ui/app/components/send/send-content/send-amount-row/tests/send-amount-row-container.test.js
deleted file mode 100644
index 52e351aee..000000000
--- a/ui/app/components/send/send-content/send-amount-row/tests/send-amount-row-container.test.js
+++ /dev/null
@@ -1,125 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-import sinon from 'sinon'
-
-let mapStateToProps
-let mapDispatchToProps
-
-const actionSpies = {
-  setMaxModeTo: sinon.spy(),
-  updateSendAmount: sinon.spy(),
-}
-const duckActionSpies = {
-  updateSendErrors: sinon.spy(),
-}
-
-proxyquire('../send-amount-row.container.js', {
-  'react-redux': {
-    connect: (ms, md) => {
-      mapStateToProps = ms
-      mapDispatchToProps = md
-      return () => ({})
-    },
-  },
-  '../../send.selectors': {
-    getAmountConversionRate: (s) => `mockAmountConversionRate:${s}`,
-    getConversionRate: (s) => `mockConversionRate:${s}`,
-    getCurrentCurrency: (s) => `mockConvertedCurrency:${s}`,
-    getGasTotal: (s) => `mockGasTotal:${s}`,
-    getPrimaryCurrency: (s) => `mockPrimaryCurrency:${s}`,
-    getSelectedToken: (s) => `mockSelectedToken:${s}`,
-    getSendAmount: (s) => `mockAmount:${s}`,
-    getSendFromBalance: (s) => `mockBalance:${s}`,
-    getTokenBalance: (s) => `mockTokenBalance:${s}`,
-  },
-  './send-amount-row.selectors': { sendAmountIsInError: (s) => `mockInError:${s}` },
-  '../../send.utils': {
-    getAmountErrorObject: (mockDataObject) => ({ ...mockDataObject, mockChange: true }),
-    getGasFeeErrorObject: (mockDataObject) => ({ ...mockDataObject, mockGasFeeErrorChange: true }),
-  },
-  '../../../../actions': actionSpies,
-  '../../../../ducks/send.duck': duckActionSpies,
-})
-
-describe('send-amount-row container', () => {
-
-  describe('mapStateToProps()', () => {
-
-    it('should map the correct properties to props', () => {
-      assert.deepEqual(mapStateToProps('mockState'), {
-        amount: 'mockAmount:mockState',
-        amountConversionRate: 'mockAmountConversionRate:mockState',
-        balance: 'mockBalance:mockState',
-        conversionRate: 'mockConversionRate:mockState',
-        convertedCurrency: 'mockConvertedCurrency:mockState',
-        gasTotal: 'mockGasTotal:mockState',
-        inError: 'mockInError:mockState',
-        primaryCurrency: 'mockPrimaryCurrency:mockState',
-        selectedToken: 'mockSelectedToken:mockState',
-        tokenBalance: 'mockTokenBalance:mockState',
-      })
-    })
-
-  })
-
-  describe('mapDispatchToProps()', () => {
-    let dispatchSpy
-    let mapDispatchToPropsObject
-
-    beforeEach(() => {
-      dispatchSpy = sinon.spy()
-      mapDispatchToPropsObject = mapDispatchToProps(dispatchSpy)
-      duckActionSpies.updateSendErrors.resetHistory()
-    })
-
-    describe('setMaxModeTo()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.setMaxModeTo('mockBool')
-        assert(dispatchSpy.calledOnce)
-        assert(actionSpies.setMaxModeTo.calledOnce)
-        assert.equal(
-          actionSpies.setMaxModeTo.getCall(0).args[0],
-          'mockBool'
-        )
-      })
-    })
-
-    describe('updateSendAmount()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.updateSendAmount('mockAmount')
-        assert(dispatchSpy.calledOnce)
-        assert(actionSpies.updateSendAmount.calledOnce)
-        assert.equal(
-          actionSpies.updateSendAmount.getCall(0).args[0],
-          'mockAmount'
-        )
-      })
-    })
-
-    describe('updateGasFeeError()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.updateGasFeeError({ some: 'data' })
-        assert(dispatchSpy.calledOnce)
-        assert(duckActionSpies.updateSendErrors.calledOnce)
-        assert.deepEqual(
-          duckActionSpies.updateSendErrors.getCall(0).args[0],
-          { some: 'data', mockGasFeeErrorChange: true }
-        )
-      })
-    })
-
-    describe('updateSendAmountError()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.updateSendAmountError({ some: 'data' })
-        assert(dispatchSpy.calledOnce)
-        assert(duckActionSpies.updateSendErrors.calledOnce)
-        assert.deepEqual(
-          duckActionSpies.updateSendErrors.getCall(0).args[0],
-          { some: 'data', mockChange: true }
-        )
-      })
-    })
-
-  })
-
-})
diff --git a/ui/app/components/send/send-content/send-amount-row/tests/send-amount-row-selectors.test.js b/ui/app/components/send/send-content/send-amount-row/tests/send-amount-row-selectors.test.js
deleted file mode 100644
index 4672cb8a7..000000000
--- a/ui/app/components/send/send-content/send-amount-row/tests/send-amount-row-selectors.test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import assert from 'assert'
-import {
-  sendAmountIsInError,
-} from '../send-amount-row.selectors.js'
-
-describe('send-amount-row selectors', () => {
-
-  describe('sendAmountIsInError()', () => {
-    it('should return true if send.errors.amount is truthy', () => {
-      const state = {
-        send: {
-          errors: {
-            amount: 'abc',
-          },
-        },
-      }
-
-      assert.equal(sendAmountIsInError(state), true)
-    })
-
-    it('should return false if send.errors.amount is falsy', () => {
-      const state = {
-        send: {
-          errors: {
-            amount: null,
-          },
-        },
-      }
-
-      assert.equal(sendAmountIsInError(state), false)
-    })
-  })
-
-})
diff --git a/ui/app/components/send/send-content/send-content-README.md b/ui/app/components/send/send-content/send-content-README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-content/send-content.component.js b/ui/app/components/send/send-content/send-content.component.js
deleted file mode 100644
index 1b03ffd2b..000000000
--- a/ui/app/components/send/send-content/send-content.component.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import PageContainerContent from '../../page-container/page-container-content.component'
-import SendAmountRow from './send-amount-row/'
-import SendFromRow from './send-from-row/'
-import SendGasRow from './send-gas-row/'
-import SendHexDataRow from './send-hex-data-row'
-import SendToRow from './send-to-row/'
-
-export default class SendContent extends Component {
-
-  static propTypes = {
-    updateGas: PropTypes.func,
-    scanQrCode: PropTypes.func,
-    showHexData: PropTypes.bool,
-  };
-
-  updateGas = (updateData) => this.props.updateGas(updateData)
-
-  render () {
-    return (
-      <PageContainerContent>
-        <div className="send-v2__form">
-          <SendFromRow />
-          <SendToRow
-            updateGas={this.updateGas}
-            scanQrCode={ _ => this.props.scanQrCode()}
-          />
-          <SendAmountRow updateGas={this.updateGas} />
-          <SendGasRow />
-          {(this.props.showHexData && (
-            <SendHexDataRow
-              updateGas={this.updateGas}
-            />
-          ))}
-        </div>
-      </PageContainerContent>
-    )
-  }
-
-}
diff --git a/ui/app/components/send/send-content/send-content.scss b/ui/app/components/send/send-content/send-content.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-content/send-dropdown-list/index.js b/ui/app/components/send/send-content/send-dropdown-list/index.js
deleted file mode 100644
index 04af6536c..000000000
--- a/ui/app/components/send/send-content/send-dropdown-list/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './send-dropdown-list.component'
diff --git a/ui/app/components/send/send-content/send-dropdown-list/send-dropdown-list.component.js b/ui/app/components/send/send-content/send-dropdown-list/send-dropdown-list.component.js
deleted file mode 100644
index bedac1259..000000000
--- a/ui/app/components/send/send-content/send-dropdown-list/send-dropdown-list.component.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import AccountListItem from '../../account-list-item/'
-
-export default class SendDropdownList extends Component {
-
-  static propTypes = {
-    accounts: PropTypes.array,
-    closeDropdown: PropTypes.func,
-    onSelect: PropTypes.func,
-    activeAddress: PropTypes.string,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  getListItemIcon (accountAddress, activeAddress) {
-    return accountAddress === activeAddress
-      ? <i className={`fa fa-check fa-lg`} style={ { color: '#02c9b1' } }/>
-      : null
-  }
-
-  render () {
-    const {
-      accounts,
-      closeDropdown,
-      onSelect,
-      activeAddress,
-    } = this.props
-
-    return (<div>
-      <div
-        className="send-v2__from-dropdown__close-area"
-        onClick={() => closeDropdown()}
-      />
-      <div className="send-v2__from-dropdown__list">
-        {accounts.map((account, index) => <AccountListItem
-          account={account}
-          className="account-list-item__dropdown"
-          handleClick={() => {
-            onSelect(account)
-            closeDropdown()
-          }}
-          icon={this.getListItemIcon(account.address, activeAddress)}
-          key={`send-dropdown-account-#${index}`}
-        />)}
-      </div>
-    </div>)
-  }
-
-}
diff --git a/ui/app/components/send/send-content/send-dropdown-list/tests/send-dropdown-list-component.test.js b/ui/app/components/send/send-content/send-dropdown-list/tests/send-dropdown-list-component.test.js
deleted file mode 100644
index b92dd4dfe..000000000
--- a/ui/app/components/send/send-content/send-dropdown-list/tests/send-dropdown-list-component.test.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import sinon from 'sinon'
-import SendDropdownList from '../send-dropdown-list.component.js'
-
-import AccountListItem from '../../../account-list-item/account-list-item.container'
-
-const propsMethodSpies = {
-  closeDropdown: sinon.spy(),
-  onSelect: sinon.spy(),
-}
-
-sinon.spy(SendDropdownList.prototype, 'getListItemIcon')
-
-describe('SendDropdownList Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(<SendDropdownList
-      accounts={[
-        { address: 'mockAccount0' },
-        { address: 'mockAccount1' },
-        { address: 'mockAccount2' },
-      ]}
-      closeDropdown={propsMethodSpies.closeDropdown}
-      onSelect={propsMethodSpies.onSelect}
-      activeAddress={'mockAddress2'}
-    />, { context: { t: str => str + '_t' } })
-  })
-
-  afterEach(() => {
-    propsMethodSpies.closeDropdown.resetHistory()
-    propsMethodSpies.onSelect.resetHistory()
-    SendDropdownList.prototype.getListItemIcon.resetHistory()
-  })
-
-  describe('getListItemIcon', () => {
-    it('should return check icon if the passed addresses are the same', () => {
-      assert.deepEqual(
-        wrapper.instance().getListItemIcon('mockAccount0', 'mockAccount0'),
-        <i className={`fa fa-check fa-lg`} style={ { color: '#02c9b1' } }/>
-      )
-    })
-
-    it('should return null if the passed addresses are different', () => {
-      assert.equal(
-        wrapper.instance().getListItemIcon('mockAccount0', 'mockAccount1'),
-        null
-      )
-    })
-  })
-
-  describe('render', () => {
-    it('should render a single div with two children', () => {
-      assert(wrapper.is('div'))
-      assert.equal(wrapper.children().length, 2)
-    })
-
-    it('should render the children with the correct classes', () => {
-      assert(wrapper.childAt(0).hasClass('send-v2__from-dropdown__close-area'))
-      assert(wrapper.childAt(1).hasClass('send-v2__from-dropdown__list'))
-    })
-
-    it('should call closeDropdown onClick of the send-v2__from-dropdown__close-area', () => {
-      assert.equal(propsMethodSpies.closeDropdown.callCount, 0)
-      wrapper.childAt(0).props().onClick()
-      assert.equal(propsMethodSpies.closeDropdown.callCount, 1)
-    })
-
-    it('should render an AccountListItem for each item in accounts', () => {
-      assert.equal(wrapper.childAt(1).children().length, 3)
-      assert(wrapper.childAt(1).children().every(AccountListItem))
-    })
-
-    it('should pass the correct props to the AccountListItem', () => {
-      wrapper.childAt(1).children().forEach((accountListItem, index) => {
-        const {
-          account,
-          className,
-          handleClick,
-        } = accountListItem.props()
-        assert.deepEqual(account, { address: 'mockAccount' + index })
-        assert.equal(className, 'account-list-item__dropdown')
-        assert.equal(propsMethodSpies.onSelect.callCount, 0)
-        handleClick()
-        assert.equal(propsMethodSpies.onSelect.callCount, 1)
-        assert.deepEqual(propsMethodSpies.onSelect.getCall(0).args[0], { address: 'mockAccount' + index })
-        propsMethodSpies.onSelect.resetHistory()
-        propsMethodSpies.closeDropdown.resetHistory()
-        assert.equal(propsMethodSpies.closeDropdown.callCount, 0)
-        handleClick()
-        assert.equal(propsMethodSpies.closeDropdown.callCount, 1)
-        propsMethodSpies.onSelect.resetHistory()
-        propsMethodSpies.closeDropdown.resetHistory()
-      })
-    })
-
-    it('should call this.getListItemIcon for each AccountListItem', () => {
-      assert.equal(SendDropdownList.prototype.getListItemIcon.callCount, 3)
-      const getListItemIconCalls = SendDropdownList.prototype.getListItemIcon.getCalls()
-      assert(getListItemIconCalls.every(({ args }, index) => args[0] === 'mockAccount' + index))
-    })
-  })
-})
diff --git a/ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown-README.md b/ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown-README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.component.js b/ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.component.js
deleted file mode 100644
index 4f43a9d61..000000000
--- a/ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.component.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import AccountListItem from '../../../account-list-item/'
-import SendDropdownList from '../../send-dropdown-list/'
-
-export default class FromDropdown extends Component {
-
-  static propTypes = {
-    accounts: PropTypes.array,
-    closeDropdown: PropTypes.func,
-    dropdownOpen: PropTypes.bool,
-    onSelect: PropTypes.func,
-    openDropdown: PropTypes.func,
-    selectedAccount: PropTypes.object,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  render () {
-    const {
-      accounts,
-      closeDropdown,
-      dropdownOpen,
-      openDropdown,
-      selectedAccount,
-      onSelect,
-    } = this.props
-
-    return <div className="send-v2__from-dropdown">
-      <AccountListItem
-        account={selectedAccount}
-        handleClick={openDropdown}
-        icon={<i className={`fa fa-caret-down fa-lg`} style={ { color: '#dedede' } }/>}
-      />
-      {dropdownOpen && <SendDropdownList
-        accounts={accounts}
-        closeDropdown={closeDropdown}
-        onSelect={onSelect}
-        activeAddress={selectedAccount.address}
-      />}
-    </div>
-  }
-
-}
diff --git a/ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.scss b/ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-content/send-from-row/from-dropdown/index.js b/ui/app/components/send/send-content/send-from-row/from-dropdown/index.js
deleted file mode 100644
index 2314ef4e3..000000000
--- a/ui/app/components/send/send-content/send-from-row/from-dropdown/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './from-dropdown.component'
diff --git a/ui/app/components/send/send-content/send-from-row/from-dropdown/tests/from-dropdown-component.test.js b/ui/app/components/send/send-content/send-from-row/from-dropdown/tests/from-dropdown-component.test.js
deleted file mode 100644
index 84fcb281e..000000000
--- a/ui/app/components/send/send-content/send-from-row/from-dropdown/tests/from-dropdown-component.test.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import sinon from 'sinon'
-import FromDropdown from '../from-dropdown.component.js'
-
-import AccountListItem from '../../../../account-list-item/account-list-item.container'
-import SendDropdownList from '../../../send-dropdown-list/send-dropdown-list.component'
-
-const propsMethodSpies = {
-  closeDropdown: sinon.spy(),
-  openDropdown: sinon.spy(),
-  onSelect: sinon.spy(),
-}
-
-describe('FromDropdown Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(<FromDropdown
-      accounts={['mockAccount']}
-      closeDropdown={propsMethodSpies.closeDropdown}
-      dropdownOpen={false}
-      onSelect={propsMethodSpies.onSelect}
-      openDropdown={propsMethodSpies.openDropdown}
-      selectedAccount={ { address: 'mockAddress' } }
-    />, { context: { t: str => str + '_t' } })
-  })
-
-  afterEach(() => {
-    propsMethodSpies.closeDropdown.resetHistory()
-    propsMethodSpies.openDropdown.resetHistory()
-    propsMethodSpies.onSelect.resetHistory()
-  })
-
-  describe('render', () => {
-    it('should render a div with a .send-v2__from-dropdown class', () => {
-      assert.equal(wrapper.find('.send-v2__from-dropdown').length, 1)
-    })
-
-    it('should render an AccountListItem as the first child of the .send-v2__from-dropdown div', () => {
-      assert(wrapper.find('.send-v2__from-dropdown').childAt(0).is(AccountListItem))
-    })
-
-    it('should pass the correct props to AccountListItem', () => {
-      const {
-        account,
-        handleClick,
-        icon,
-      } = wrapper.find('.send-v2__from-dropdown').childAt(0).props()
-      assert.deepEqual(account, { address: 'mockAddress' })
-      assert.deepEqual(
-        icon,
-        <i className={`fa fa-caret-down fa-lg`} style={ { color: '#dedede' } }/>
-      )
-      assert.equal(propsMethodSpies.openDropdown.callCount, 0)
-      handleClick()
-      assert.equal(propsMethodSpies.openDropdown.callCount, 1)
-    })
-
-    it('should not render a SendDropdownList when dropdownOpen is false', () => {
-      assert.equal(wrapper.find(SendDropdownList).length, 0)
-    })
-
-    it('should render a SendDropdownList when dropdownOpen is true', () => {
-      wrapper.setProps({ dropdownOpen: true })
-      assert(wrapper.find(SendDropdownList).length, 1)
-    })
-
-    it('should pass the correct props to the SendDropdownList]', () => {
-      wrapper.setProps({ dropdownOpen: true })
-      const {
-        accounts,
-        closeDropdown,
-        onSelect,
-        activeAddress,
-      } = wrapper.find(SendDropdownList).props()
-      assert.deepEqual(accounts, ['mockAccount'])
-      assert.equal(activeAddress, 'mockAddress')
-      assert.equal(propsMethodSpies.closeDropdown.callCount, 0)
-      closeDropdown()
-      assert.equal(propsMethodSpies.closeDropdown.callCount, 1)
-      assert.equal(propsMethodSpies.onSelect.callCount, 0)
-      onSelect()
-      assert.equal(propsMethodSpies.onSelect.callCount, 1)
-    })
-  })
-})
diff --git a/ui/app/components/send/send-content/send-from-row/index.js b/ui/app/components/send/send-content/send-from-row/index.js
deleted file mode 100644
index 0a79726b2..000000000
--- a/ui/app/components/send/send-content/send-from-row/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './send-from-row.container'
diff --git a/ui/app/components/send/send-content/send-from-row/send-from-row-README.md b/ui/app/components/send/send-content/send-from-row/send-from-row-README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-content/send-from-row/send-from-row.component.js b/ui/app/components/send/send-content/send-from-row/send-from-row.component.js
deleted file mode 100644
index 3e0e0de22..000000000
--- a/ui/app/components/send/send-content/send-from-row/send-from-row.component.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import SendRowWrapper from '../send-row-wrapper/'
-import FromDropdown from './from-dropdown/'
-
-export default class SendFromRow extends Component {
-
-  static propTypes = {
-    closeFromDropdown: PropTypes.func,
-    conversionRate: PropTypes.number,
-    from: PropTypes.object,
-    fromAccounts: PropTypes.array,
-    fromDropdownOpen: PropTypes.bool,
-    openFromDropdown: PropTypes.func,
-    tokenContract: PropTypes.object,
-    updateSendFrom: PropTypes.func,
-    setSendTokenBalance: PropTypes.func,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  async handleFromChange (newFrom) {
-    const {
-      updateSendFrom,
-      tokenContract,
-      setSendTokenBalance,
-    } = this.props
-
-    if (tokenContract) {
-      const usersToken = await tokenContract.balanceOf(newFrom.address)
-      setSendTokenBalance(usersToken)
-    }
-    updateSendFrom(newFrom)
-  }
-
-  render () {
-    const {
-      closeFromDropdown,
-      conversionRate,
-      from,
-      fromAccounts,
-      fromDropdownOpen,
-      openFromDropdown,
-    } = this.props
-
-    return (
-      <SendRowWrapper label={`${this.context.t('from')}:`}>
-        <FromDropdown
-          accounts={fromAccounts}
-          closeDropdown={() => closeFromDropdown()}
-          conversionRate={conversionRate}
-          dropdownOpen={fromDropdownOpen}
-          onSelect={newFrom => this.handleFromChange(newFrom)}
-          openDropdown={() => openFromDropdown()}
-          selectedAccount={from}
-        />
-      </SendRowWrapper>
-    )
-  }
-
-}
diff --git a/ui/app/components/send/send-content/send-from-row/send-from-row.container.js b/ui/app/components/send/send-content/send-from-row/send-from-row.container.js
deleted file mode 100644
index 33cb63b43..000000000
--- a/ui/app/components/send/send-content/send-from-row/send-from-row.container.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import { connect } from 'react-redux'
-import {
-    accountsWithSendEtherInfoSelector,
-    getConversionRate,
-    getSelectedTokenContract,
-    getSendFromObject,
-} from '../../send.selectors.js'
-import {
-  getFromDropdownOpen,
-} from './send-from-row.selectors.js'
-import { calcTokenBalance } from '../../send.utils.js'
-import {
-    updateSendFrom,
-    setSendTokenBalance,
-} from '../../../../actions'
-import {
-    closeFromDropdown,
-    openFromDropdown,
-} from '../../../../ducks/send.duck'
-import SendFromRow from './send-from-row.component'
-
-export default connect(mapStateToProps, mapDispatchToProps)(SendFromRow)
-
-function mapStateToProps (state) {
-  return {
-    conversionRate: getConversionRate(state),
-    from: getSendFromObject(state),
-    fromAccounts: accountsWithSendEtherInfoSelector(state),
-    fromDropdownOpen: getFromDropdownOpen(state),
-    tokenContract: getSelectedTokenContract(state),
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return {
-    closeFromDropdown: () => dispatch(closeFromDropdown()),
-    openFromDropdown: () => dispatch(openFromDropdown()),
-    updateSendFrom: newFrom => dispatch(updateSendFrom(newFrom)),
-    setSendTokenBalance: (usersToken, selectedToken) => {
-        if (!usersToken) return
-
-        const tokenBalance = calcTokenBalance({ usersToken, selectedToken })
-        dispatch(setSendTokenBalance(tokenBalance))
-    },
-  }
-}
diff --git a/ui/app/components/send/send-content/send-from-row/send-from-row.selectors.js b/ui/app/components/send/send-content/send-from-row/send-from-row.selectors.js
deleted file mode 100644
index 03ef4806b..000000000
--- a/ui/app/components/send/send-content/send-from-row/send-from-row.selectors.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const selectors = {
-  getFromDropdownOpen,
-}
-
-module.exports = selectors
-
-function getFromDropdownOpen (state) {
-  return state.send.fromDropdownOpen
-}
diff --git a/ui/app/components/send/send-content/send-from-row/tests/send-from-row-component.test.js b/ui/app/components/send/send-content/send-from-row/tests/send-from-row-component.test.js
deleted file mode 100644
index 9ba8d1739..000000000
--- a/ui/app/components/send/send-content/send-from-row/tests/send-from-row-component.test.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import sinon from 'sinon'
-import SendFromRow from '../send-from-row.component.js'
-
-import SendRowWrapper from '../../send-row-wrapper/send-row-wrapper.component'
-import FromDropdown from '../from-dropdown/from-dropdown.component'
-
-const propsMethodSpies = {
-  closeFromDropdown: sinon.spy(),
-  openFromDropdown: sinon.spy(),
-  updateSendFrom: sinon.spy(),
-  setSendTokenBalance: sinon.spy(),
-}
-
-sinon.spy(SendFromRow.prototype, 'handleFromChange')
-
-describe('SendFromRow Component', function () {
-  let wrapper
-  let instance
-
-  beforeEach(() => {
-    wrapper = shallow(<SendFromRow
-      closeFromDropdown={propsMethodSpies.closeFromDropdown}
-      conversionRate={15}
-      from={ { address: 'mockAddress' } }
-      fromAccounts={['mockAccount']}
-      fromDropdownOpen={false}
-      openFromDropdown={propsMethodSpies.openFromDropdown}
-      setSendTokenBalance={propsMethodSpies.setSendTokenBalance}
-      tokenContract={null}
-      updateSendFrom={propsMethodSpies.updateSendFrom}
-    />, { context: { t: str => str + '_t' } })
-    instance = wrapper.instance()
-  })
-
-  afterEach(() => {
-    propsMethodSpies.closeFromDropdown.resetHistory()
-    propsMethodSpies.openFromDropdown.resetHistory()
-    propsMethodSpies.updateSendFrom.resetHistory()
-    propsMethodSpies.setSendTokenBalance.resetHistory()
-    SendFromRow.prototype.handleFromChange.resetHistory()
-  })
-
-  describe('handleFromChange', () => {
-
-    it('should call updateSendFrom', () => {
-      assert.equal(propsMethodSpies.updateSendFrom.callCount, 0)
-      instance.handleFromChange('mockFrom')
-      assert.equal(propsMethodSpies.updateSendFrom.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.updateSendFrom.getCall(0).args,
-        ['mockFrom']
-      )
-    })
-
-    it('should call tokenContract.balanceOf and setSendTokenBalance if tokenContract is defined', async () => {
-      wrapper.setProps({
-        tokenContract: {
-          balanceOf: () => new Promise((resolve) => resolve('mockUsersToken')),
-        },
-      })
-      assert.equal(propsMethodSpies.setSendTokenBalance.callCount, 0)
-      await instance.handleFromChange('mockFrom')
-      assert.equal(propsMethodSpies.setSendTokenBalance.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.setSendTokenBalance.getCall(0).args,
-        ['mockUsersToken']
-      )
-    })
-
-  })
-
-  describe('render', () => {
-    it('should render a SendRowWrapper component', () => {
-      assert.equal(wrapper.find(SendRowWrapper).length, 1)
-    })
-
-    it('should pass the correct props to SendRowWrapper', () => {
-      const {
-        label,
-      } = wrapper.find(SendRowWrapper).props()
-
-      assert.equal(label, 'from_t:')
-    })
-
-    it('should render an FromDropdown as a child of the SendRowWrapper', () => {
-      assert(wrapper.find(SendRowWrapper).childAt(0).is(FromDropdown))
-    })
-
-    it('should render the FromDropdown with the correct props', () => {
-      const {
-        accounts,
-        closeDropdown,
-        conversionRate,
-        dropdownOpen,
-        onSelect,
-        openDropdown,
-        selectedAccount,
-      } = wrapper.find(SendRowWrapper).childAt(0).props()
-      assert.deepEqual(accounts, ['mockAccount'])
-      assert.equal(dropdownOpen, false)
-      assert.equal(conversionRate, 15)
-      assert.deepEqual(selectedAccount, { address: 'mockAddress' })
-      assert.equal(propsMethodSpies.closeFromDropdown.callCount, 0)
-      closeDropdown()
-      assert.equal(propsMethodSpies.closeFromDropdown.callCount, 1)
-      assert.equal(propsMethodSpies.openFromDropdown.callCount, 0)
-      openDropdown()
-      assert.equal(propsMethodSpies.openFromDropdown.callCount, 1)
-      assert.equal(SendFromRow.prototype.handleFromChange.callCount, 0)
-      onSelect('mockNewFrom')
-      assert.equal(SendFromRow.prototype.handleFromChange.callCount, 1)
-      assert.deepEqual(
-        SendFromRow.prototype.handleFromChange.getCall(0).args,
-        ['mockNewFrom']
-      )
-    })
-  })
-})
diff --git a/ui/app/components/send/send-content/send-from-row/tests/send-from-row-container.test.js b/ui/app/components/send/send-content/send-from-row/tests/send-from-row-container.test.js
deleted file mode 100644
index e080b2fe3..000000000
--- a/ui/app/components/send/send-content/send-from-row/tests/send-from-row-container.test.js
+++ /dev/null
@@ -1,110 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-import sinon from 'sinon'
-
-let mapStateToProps
-let mapDispatchToProps
-
-const actionSpies = {
-  updateSendFrom: sinon.spy(),
-  setSendTokenBalance: sinon.spy(),
-}
-const duckActionSpies = {
-  closeFromDropdown: sinon.spy(),
-  openFromDropdown: sinon.spy(),
-}
-
-proxyquire('../send-from-row.container.js', {
-  'react-redux': {
-    connect: (ms, md) => {
-      mapStateToProps = ms
-      mapDispatchToProps = md
-      return () => ({})
-    },
-  },
-  '../../send.selectors.js': {
-    accountsWithSendEtherInfoSelector: (s) => `mockFromAccounts:${s}`,
-    getConversionRate: (s) => `mockConversionRate:${s}`,
-    getSelectedTokenContract: (s) => `mockTokenContract:${s}`,
-    getSendFromObject: (s) => `mockFrom:${s}`,
-  },
-  './send-from-row.selectors.js': { getFromDropdownOpen: (s) => `mockFromDropdownOpen:${s}` },
-  '../../send.utils.js': { calcTokenBalance: ({ usersToken, selectedToken }) => usersToken + selectedToken },
-  '../../../../actions': actionSpies,
-  '../../../../ducks/send.duck': duckActionSpies,
-})
-
-describe('send-from-row container', () => {
-
-  describe('mapStateToProps()', () => {
-
-    it('should map the correct properties to props', () => {
-      assert.deepEqual(mapStateToProps('mockState'), {
-        conversionRate: 'mockConversionRate:mockState',
-        from: 'mockFrom:mockState',
-        fromAccounts: 'mockFromAccounts:mockState',
-        fromDropdownOpen: 'mockFromDropdownOpen:mockState',
-        tokenContract: 'mockTokenContract:mockState',
-      })
-    })
-
-  })
-
-  describe('mapDispatchToProps()', () => {
-    let dispatchSpy
-    let mapDispatchToPropsObject
-
-    beforeEach(() => {
-      dispatchSpy = sinon.spy()
-      mapDispatchToPropsObject = mapDispatchToProps(dispatchSpy)
-    })
-
-    describe('closeFromDropdown()', () => {
-      it('should dispatch a closeFromDropdown action', () => {
-        mapDispatchToPropsObject.closeFromDropdown()
-        assert(dispatchSpy.calledOnce)
-        assert(duckActionSpies.closeFromDropdown.calledOnce)
-        assert.equal(
-          duckActionSpies.closeFromDropdown.getCall(0).args[0],
-          undefined
-        )
-      })
-    })
-
-    describe('openFromDropdown()', () => {
-      it('should dispatch a openFromDropdown action', () => {
-        mapDispatchToPropsObject.openFromDropdown()
-        assert(dispatchSpy.calledOnce)
-        assert(duckActionSpies.openFromDropdown.calledOnce)
-        assert.equal(
-          duckActionSpies.openFromDropdown.getCall(0).args[0],
-          undefined
-        )
-      })
-    })
-
-    describe('updateSendFrom()', () => {
-      it('should dispatch an updateSendFrom action', () => {
-        mapDispatchToPropsObject.updateSendFrom('mockFrom')
-        assert(dispatchSpy.calledOnce)
-        assert.equal(
-          actionSpies.updateSendFrom.getCall(0).args[0],
-          'mockFrom'
-        )
-      })
-    })
-
-    describe('setSendTokenBalance()', () => {
-      it('should dispatch an setSendTokenBalance action', () => {
-        mapDispatchToPropsObject.setSendTokenBalance('mockUsersToken', 'mockSelectedToken')
-        assert(dispatchSpy.calledOnce)
-        assert.equal(
-          actionSpies.setSendTokenBalance.getCall(0).args[0],
-          'mockUsersTokenmockSelectedToken'
-        )
-      })
-    })
-
-  })
-
-})
diff --git a/ui/app/components/send/send-content/send-from-row/tests/send-from-row-selectors.test.js b/ui/app/components/send/send-content/send-from-row/tests/send-from-row-selectors.test.js
deleted file mode 100644
index ecb57bbc3..000000000
--- a/ui/app/components/send/send-content/send-from-row/tests/send-from-row-selectors.test.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import assert from 'assert'
-import {
-  getFromDropdownOpen,
-} from '../send-from-row.selectors.js'
-
-describe('send-from-row selectors', () => {
-
-  describe('getFromDropdownOpen()', () => {
-    it('should get send.fromDropdownOpen', () => {
-      const state = {
-        send: {
-          fromDropdownOpen: null,
-        },
-      }
-
-      assert.equal(getFromDropdownOpen(state), null)
-    })
-  })
-
-})
diff --git a/ui/app/components/send/send-content/send-gas-row/README.md b/ui/app/components/send/send-content/send-gas-row/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js b/ui/app/components/send/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
deleted file mode 100644
index 9bbb67506..000000000
--- a/ui/app/components/send/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import React, {Component} from 'react'
-import PropTypes from 'prop-types'
-import UserPreferencedCurrencyDisplay from '../../../../user-preferenced-currency-display'
-import { PRIMARY, SECONDARY } from '../../../../../constants/common'
-
-export default class GasFeeDisplay extends Component {
-
-  static propTypes = {
-    conversionRate: PropTypes.number,
-    primaryCurrency: PropTypes.string,
-    convertedCurrency: PropTypes.string,
-    gasLoadingError: PropTypes.bool,
-    gasTotal: PropTypes.string,
-    onClick: PropTypes.func,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  render () {
-    const { gasTotal, onClick, gasLoadingError } = this.props
-
-    return (
-      <div className="send-v2__gas-fee-display">
-        {gasTotal
-          ? (
-            <div className="currency-display">
-              <UserPreferencedCurrencyDisplay
-                value={gasTotal}
-                type={PRIMARY}
-              />
-              <UserPreferencedCurrencyDisplay
-                className="currency-display__converted-value"
-                value={gasTotal}
-                type={SECONDARY}
-              />
-            </div>
-          )
-          : gasLoadingError
-            ? <div className="currency-display.currency-display--message">
-                {this.context.t('setGasPrice')}
-              </div>
-            : <div className="currency-display">
-                {this.context.t('loading')}
-              </div>
-        }
-        <button
-          className="sliders-icon-container"
-          onClick={onClick}
-          disabled={!gasTotal && !gasLoadingError}
-        >
-          <i className="fa fa-sliders sliders-icon" />
-        </button>
-      </div>
-    )
-  }
-}
diff --git a/ui/app/components/send/send-content/send-gas-row/gas-fee-display/index.js b/ui/app/components/send/send-content/send-gas-row/gas-fee-display/index.js
deleted file mode 100644
index dba0edb7b..000000000
--- a/ui/app/components/send/send-content/send-gas-row/gas-fee-display/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './gas-fee-display.component'
diff --git a/ui/app/components/send/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js b/ui/app/components/send/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
deleted file mode 100644
index 9ff01493a..000000000
--- a/ui/app/components/send/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import {shallow} from 'enzyme'
-import GasFeeDisplay from '../gas-fee-display.component'
-import UserPreferencedCurrencyDisplay from '../../../../../user-preferenced-currency-display'
-import sinon from 'sinon'
-
-
-const propsMethodSpies = {
-  showCustomizeGasModal: sinon.spy(),
-}
-
-describe('SendGasRow Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(<GasFeeDisplay
-      conversionRate={20}
-      gasTotal={'mockGasTotal'}
-      onClick={propsMethodSpies.showCustomizeGasModal}
-      primaryCurrency={'mockPrimaryCurrency'}
-      convertedCurrency={'mockConvertedCurrency'}
-    />, {context: {t: str => str + '_t'}})
-  })
-
-  afterEach(() => {
-    propsMethodSpies.showCustomizeGasModal.resetHistory()
-  })
-
-  describe('render', () => {
-    it('should render a CurrencyDisplay component', () => {
-      assert.equal(wrapper.find(UserPreferencedCurrencyDisplay).length, 2)
-    })
-
-    it('should render the CurrencyDisplay with the correct props', () => {
-      const {
-        type,
-        value,
-      } = wrapper.find(UserPreferencedCurrencyDisplay).at(0).props()
-      assert.equal(type, 'PRIMARY')
-      assert.equal(value, 'mockGasTotal')
-    })
-
-    it('should render the Button with the correct props', () => {
-      const {
-        onClick,
-      } = wrapper.find('button').props()
-      assert.equal(propsMethodSpies.showCustomizeGasModal.callCount, 0)
-      onClick()
-      assert.equal(propsMethodSpies.showCustomizeGasModal.callCount, 1)
-    })
-  })
-})
diff --git a/ui/app/components/send/send-content/send-gas-row/index.js b/ui/app/components/send/send-content/send-gas-row/index.js
deleted file mode 100644
index 3c7ff1d5f..000000000
--- a/ui/app/components/send/send-content/send-gas-row/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './send-gas-row.container'
diff --git a/ui/app/components/send/send-content/send-gas-row/send-gas-row.component.js b/ui/app/components/send/send-content/send-gas-row/send-gas-row.component.js
deleted file mode 100644
index 91b58cfd0..000000000
--- a/ui/app/components/send/send-content/send-gas-row/send-gas-row.component.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import SendRowWrapper from '../send-row-wrapper/'
-import GasFeeDisplay from './gas-fee-display/gas-fee-display.component'
-
-export default class SendGasRow extends Component {
-
-  static propTypes = {
-    conversionRate: PropTypes.number,
-    convertedCurrency: PropTypes.string,
-    gasFeeError: PropTypes.bool,
-    gasLoadingError: PropTypes.bool,
-    gasTotal: PropTypes.string,
-    showCustomizeGasModal: PropTypes.func,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  render () {
-    const {
-      conversionRate,
-      convertedCurrency,
-      gasLoadingError,
-      gasTotal,
-      gasFeeError,
-      showCustomizeGasModal,
-    } = this.props
-
-    return (
-      <SendRowWrapper
-        label={`${this.context.t('gasFee')}:`}
-        showError={gasFeeError}
-        errorType={'gasFee'}
-      >
-        <GasFeeDisplay
-          conversionRate={conversionRate}
-          convertedCurrency={convertedCurrency}
-          gasLoadingError={gasLoadingError}
-          gasTotal={gasTotal}
-          onClick={() => showCustomizeGasModal()}
-        />
-      </SendRowWrapper>
-    )
-  }
-
-}
diff --git a/ui/app/components/send/send-content/send-gas-row/send-gas-row.container.js b/ui/app/components/send/send-content/send-gas-row/send-gas-row.container.js
deleted file mode 100644
index 8f8e3e4dd..000000000
--- a/ui/app/components/send/send-content/send-gas-row/send-gas-row.container.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { connect } from 'react-redux'
-import {
-    getConversionRate,
-    getCurrentCurrency,
-    getGasTotal,
-} from '../../send.selectors.js'
-import { getGasLoadingError, gasFeeIsInError } from './send-gas-row.selectors.js'
-import { showModal } from '../../../../actions'
-import SendGasRow from './send-gas-row.component'
-
-export default connect(mapStateToProps, mapDispatchToProps)(SendGasRow)
-
-function mapStateToProps (state) {
-  return {
-    conversionRate: getConversionRate(state),
-    convertedCurrency: getCurrentCurrency(state),
-    gasTotal: getGasTotal(state),
-    gasFeeError: gasFeeIsInError(state),
-    gasLoadingError: getGasLoadingError(state),
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return {
-    showCustomizeGasModal: () => dispatch(showModal({ name: 'CUSTOMIZE_GAS' })),
-  }
-}
diff --git a/ui/app/components/send/send-content/send-gas-row/send-gas-row.scss b/ui/app/components/send/send-content/send-gas-row/send-gas-row.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-content/send-gas-row/send-gas-row.selectors.js b/ui/app/components/send/send-content/send-gas-row/send-gas-row.selectors.js
deleted file mode 100644
index 96f6293c2..000000000
--- a/ui/app/components/send/send-content/send-gas-row/send-gas-row.selectors.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const selectors = {
-  gasFeeIsInError,
-  getGasLoadingError,
-}
-
-module.exports = selectors
-
-function getGasLoadingError (state) {
-  return state.send.errors.gasLoading
-}
-
-function gasFeeIsInError (state) {
-  return Boolean(state.send.errors.gasFee)
-}
diff --git a/ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-component.test.js b/ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-component.test.js
deleted file mode 100644
index 54a92bd2d..000000000
--- a/ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-component.test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import sinon from 'sinon'
-import SendGasRow from '../send-gas-row.component.js'
-
-import SendRowWrapper from '../../send-row-wrapper/send-row-wrapper.component'
-import GasFeeDisplay from '../gas-fee-display/gas-fee-display.component'
-
-const propsMethodSpies = {
-  showCustomizeGasModal: sinon.spy(),
-}
-
-describe('SendGasRow Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(<SendGasRow
-      conversionRate={20}
-      convertedCurrency={'mockConvertedCurrency'}
-      gasFeeError={'mockGasFeeError'}
-      gasLoadingError={false}
-      gasTotal={'mockGasTotal'}
-      showCustomizeGasModal={propsMethodSpies.showCustomizeGasModal}
-    />, { context: { t: str => str + '_t' } })
-  })
-
-  afterEach(() => {
-    propsMethodSpies.showCustomizeGasModal.resetHistory()
-  })
-
-  describe('render', () => {
-    it('should render a SendRowWrapper component', () => {
-      assert.equal(wrapper.find(SendRowWrapper).length, 1)
-    })
-
-    it('should pass the correct props to SendRowWrapper', () => {
-      const {
-        label,
-        showError,
-        errorType,
-      } = wrapper.find(SendRowWrapper).props()
-
-      assert.equal(label, 'gasFee_t:')
-      assert.equal(showError, 'mockGasFeeError')
-      assert.equal(errorType, 'gasFee')
-    })
-
-    it('should render a GasFeeDisplay as a child of the SendRowWrapper', () => {
-      assert(wrapper.find(SendRowWrapper).childAt(0).is(GasFeeDisplay))
-    })
-
-    it('should render the GasFeeDisplay with the correct props', () => {
-      const {
-        conversionRate,
-        convertedCurrency,
-        gasLoadingError,
-        gasTotal,
-        onClick,
-      } = wrapper.find(SendRowWrapper).childAt(0).props()
-      assert.equal(conversionRate, 20)
-      assert.equal(convertedCurrency, 'mockConvertedCurrency')
-      assert.equal(gasLoadingError, false)
-      assert.equal(gasTotal, 'mockGasTotal')
-      assert.equal(propsMethodSpies.showCustomizeGasModal.callCount, 0)
-      onClick()
-      assert.equal(propsMethodSpies.showCustomizeGasModal.callCount, 1)
-    })
-  })
-})
diff --git a/ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-container.test.js b/ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-container.test.js
deleted file mode 100644
index 2ce062505..000000000
--- a/ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-container.test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-import sinon from 'sinon'
-
-let mapStateToProps
-let mapDispatchToProps
-
-const actionSpies = {
-  showModal: sinon.spy(),
-}
-
-proxyquire('../send-gas-row.container.js', {
-  'react-redux': {
-    connect: (ms, md) => {
-      mapStateToProps = ms
-      mapDispatchToProps = md
-      return () => ({})
-    },
-  },
-  '../../send.selectors.js': {
-    getConversionRate: (s) => `mockConversionRate:${s}`,
-    getCurrentCurrency: (s) => `mockConvertedCurrency:${s}`,
-    getGasTotal: (s) => `mockGasTotal:${s}`,
-  },
-  './send-gas-row.selectors.js': {
-    getGasLoadingError: (s) => `mockGasLoadingError:${s}`,
-    gasFeeIsInError: (s) => `mockGasFeeError:${s}`,
-  },
-  '../../../../actions': actionSpies,
-})
-
-describe('send-gas-row container', () => {
-
-  describe('mapStateToProps()', () => {
-
-    it('should map the correct properties to props', () => {
-      assert.deepEqual(mapStateToProps('mockState'), {
-        conversionRate: 'mockConversionRate:mockState',
-        convertedCurrency: 'mockConvertedCurrency:mockState',
-        gasTotal: 'mockGasTotal:mockState',
-        gasFeeError: 'mockGasFeeError:mockState',
-        gasLoadingError: 'mockGasLoadingError:mockState',
-      })
-    })
-
-  })
-
-  describe('mapDispatchToProps()', () => {
-    let dispatchSpy
-    let mapDispatchToPropsObject
-
-    beforeEach(() => {
-      dispatchSpy = sinon.spy()
-      mapDispatchToPropsObject = mapDispatchToProps(dispatchSpy)
-    })
-
-    describe('showCustomizeGasModal()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.showCustomizeGasModal()
-        assert(dispatchSpy.calledOnce)
-        assert.deepEqual(
-          actionSpies.showModal.getCall(0).args[0],
-          { name: 'CUSTOMIZE_GAS' }
-        )
-      })
-    })
-
-  })
-
-})
diff --git a/ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-selectors.test.js b/ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-selectors.test.js
deleted file mode 100644
index d46dd9d8b..000000000
--- a/ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-selectors.test.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import assert from 'assert'
-import {
-  gasFeeIsInError,
-  getGasLoadingError,
-} from '../send-gas-row.selectors.js'
-
-describe('send-gas-row selectors', () => {
-
-  describe('getGasLoadingError()', () => {
-    it('should return send.errors.gasLoading', () => {
-      const state = {
-        send: {
-          errors: {
-            gasLoading: 'abc',
-          },
-        },
-      }
-
-      assert.equal(getGasLoadingError(state), 'abc')
-    })
-  })
-
-  describe('gasFeeIsInError()', () => {
-    it('should return true if send.errors.gasFee is truthy', () => {
-      const state = {
-        send: {
-          errors: {
-            gasFee: 'def',
-          },
-        },
-      }
-
-      assert.equal(gasFeeIsInError(state), true)
-    })
-
-    it('should return false send.errors.gasFee is falsely', () => {
-      const state = {
-        send: {
-          errors: {
-            gasFee: null,
-          },
-        },
-      }
-
-      assert.equal(gasFeeIsInError(state), false)
-    })
-  })
-
-})
diff --git a/ui/app/components/send/send-content/send-hex-data-row/index.js b/ui/app/components/send/send-content/send-hex-data-row/index.js
deleted file mode 100644
index 08c341067..000000000
--- a/ui/app/components/send/send-content/send-hex-data-row/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './send-hex-data-row.container'
diff --git a/ui/app/components/send/send-content/send-hex-data-row/send-hex-data-row.component.js b/ui/app/components/send/send-content/send-hex-data-row/send-hex-data-row.component.js
deleted file mode 100644
index 62a74a77b..000000000
--- a/ui/app/components/send/send-content/send-hex-data-row/send-hex-data-row.component.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import SendRowWrapper from '../send-row-wrapper'
-
-export default class SendHexDataRow extends Component {
-  static propTypes = {
-    data: PropTypes.string,
-    inError: PropTypes.bool,
-    updateSendHexData: PropTypes.func.isRequired,
-    updateGas: PropTypes.func.isRequired,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  onInput = (event) => {
-    const {updateSendHexData, updateGas} = this.props
-    const data = event.target.value.replace(/\n/g, '') || null
-    updateSendHexData(data)
-    updateGas({ data })
-  }
-
-  render () {
-    const {inError} = this.props
-    const {t} = this.context
-
-    return (
-      <SendRowWrapper
-        label={`${t('hexData')}:`}
-        showError={inError}
-        errorType={'amount'}
-      >
-        <textarea
-          onInput={this.onInput}
-          placeholder="Optional"
-          className="send-v2__hex-data__input"
-        />
-      </SendRowWrapper>
-    )
-  }
-}
diff --git a/ui/app/components/send/send-content/send-hex-data-row/send-hex-data-row.container.js b/ui/app/components/send/send-content/send-hex-data-row/send-hex-data-row.container.js
deleted file mode 100644
index df554ca5f..000000000
--- a/ui/app/components/send/send-content/send-hex-data-row/send-hex-data-row.container.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { connect } from 'react-redux'
-import {
-  updateSendHexData,
-} from '../../../../actions'
-import SendHexDataRow from './send-hex-data-row.component'
-
-export default connect(mapStateToProps, mapDispatchToProps)(SendHexDataRow)
-
-function mapStateToProps (state) {
-  return {
-    data: state.metamask.send.data,
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return {
-    updateSendHexData (data) {
-      return dispatch(updateSendHexData(data))
-    },
-  }
-}
diff --git a/ui/app/components/send/send-content/send-row-wrapper/index.js b/ui/app/components/send/send-content/send-row-wrapper/index.js
deleted file mode 100644
index d17545dcc..000000000
--- a/ui/app/components/send/send-content/send-row-wrapper/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './send-row-wrapper.component'
diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/index.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/index.js
deleted file mode 100644
index c00617f83..000000000
--- a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './send-row-error-message.container'
diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message-README.md b/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message-README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.js
deleted file mode 100644
index 61bc7bab7..000000000
--- a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-
-export default class SendRowErrorMessage extends Component {
-
-  static propTypes = {
-    errors: PropTypes.object,
-    errorType: PropTypes.string,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  render () {
-    const { errors, errorType } = this.props
-
-    const errorMessage = errors[errorType]
-
-    return (
-      errorMessage
-        ? <div className="send-v2__error">{this.context.t(errorMessage)}</div>
-        : null
-    )
-  }
-
-}
diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.container.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.container.js
deleted file mode 100644
index 59622047f..000000000
--- a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.container.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { connect } from 'react-redux'
-import { getSendErrors } from '../../../send.selectors'
-import SendRowErrorMessage from './send-row-error-message.component'
-
-export default connect(mapStateToProps)(SendRowErrorMessage)
-
-function mapStateToProps (state, ownProps) {
-  return {
-    errors: getSendErrors(state),
-    errorType: ownProps.errorType,
-  }
-}
diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.scss b/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/tests/send-row-error-message-component.test.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/tests/send-row-error-message-component.test.js
deleted file mode 100644
index 2304a43d2..000000000
--- a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/tests/send-row-error-message-component.test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import SendRowErrorMessage from '../send-row-error-message.component.js'
-
-describe('SendRowErrorMessage Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(<SendRowErrorMessage
-      errors={{ error1: 'abc', error2: 'def' }}
-      errorType={'error3'}
-    />, { context: { t: str => str + '_t' } })
-  })
-
-  describe('render', () => {
-    it('should render null if the passed errors do not contain an error of errorType', () => {
-      assert.equal(wrapper.find('.send-v2__error').length, 0)
-      assert.equal(wrapper.html(), null)
-    })
-
-    it('should render an error message if the passed errors contain an error of errorType', () => {
-      wrapper.setProps({ errors: { error1: 'abc', error2: 'def', error3: 'xyz' } })
-      assert.equal(wrapper.find('.send-v2__error').length, 1)
-      assert.equal(wrapper.find('.send-v2__error').text(), 'xyz_t')
-    })
-  })
-})
diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/tests/send-row-error-message-container.test.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/tests/send-row-error-message-container.test.js
deleted file mode 100644
index eecff165d..000000000
--- a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/tests/send-row-error-message-container.test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-
-let mapStateToProps
-
-proxyquire('../send-row-error-message.container.js', {
-  'react-redux': {
-    connect: (ms, md) => {
-      mapStateToProps = ms
-      return () => ({})
-    },
-  },
-  '../../../send.selectors': { getSendErrors: (s) => `mockErrors:${s}` },
-})
-
-describe('send-row-error-message container', () => {
-
-  describe('mapStateToProps()', () => {
-
-    it('should map the correct properties to props', () => {
-      assert.deepEqual(mapStateToProps('mockState', { errorType: 'someType' }), {
-        errors: 'mockErrors:mockState',
-        errorType: 'someType' })
-    })
-
-  })
-
-})
diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper-README.md b/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper-README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper.component.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper.component.js
deleted file mode 100644
index b7528a15f..000000000
--- a/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper.component.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import SendRowErrorMessage from './send-row-error-message/'
-
-export default class SendRowWrapper extends Component {
-
-  static propTypes = {
-    children: PropTypes.node,
-    errorType: PropTypes.string,
-    label: PropTypes.string,
-    showError: PropTypes.bool,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  render () {
-    const {
-      children,
-      errorType = '',
-      label,
-      showError = false,
-    } = this.props
-
-    const formField = Array.isArray(children) ? children[1] || children[0] : children
-    const customLabelContent = children.length > 1 ? children[0] : null
-
-    return (
-      <div className="send-v2__form-row">
-        <div className="send-v2__form-label">
-            {label}
-            {showError && <SendRowErrorMessage errorType={errorType}/>}
-            {customLabelContent}
-        </div>
-        <div className="send-v2__form-field">
-            {formField}
-        </div>
-      </div>
-    )
-  }
-
-}
diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper.scss b/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js b/ui/app/components/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js
deleted file mode 100644
index 30280e1d0..000000000
--- a/ui/app/components/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import SendRowWrapper from '../send-row-wrapper.component.js'
-
-import SendRowErrorMessage from '../send-row-error-message/send-row-error-message.container'
-
-describe('SendContent Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(<SendRowWrapper
-      errorType={'mockErrorType'}
-      label={'mockLabel'}
-      showError={false}
-    >
-      <span>Mock Form Field</span>
-    </SendRowWrapper>)
-  })
-
-  describe('render', () => {
-    it('should render a div with a send-v2__form-row class', () => {
-      assert.equal(wrapper.find('div.send-v2__form-row').length, 1)
-    })
-
-    it('should render two children of the root div, with send-v2_form label and field classes', () => {
-      assert.equal(wrapper.find('.send-v2__form-row > .send-v2__form-label').length, 1)
-      assert.equal(wrapper.find('.send-v2__form-row > .send-v2__form-field').length, 1)
-    })
-
-    it('should render the label as a child of the send-v2__form-label', () => {
-      assert.equal(wrapper.find('.send-v2__form-row > .send-v2__form-label').childAt(0).text(), 'mockLabel')
-    })
-
-    it('should render its first child as a child of the send-v2__form-field', () => {
-      assert.equal(wrapper.find('.send-v2__form-row > .send-v2__form-field').childAt(0).text(), 'Mock Form Field')
-    })
-
-    it('should not render a SendRowErrorMessage if showError is false', () => {
-      assert.equal(wrapper.find(SendRowErrorMessage).length, 0)
-    })
-
-    it('should render a SendRowErrorMessage with and errorType props if showError is true', () => {
-      wrapper.setProps({showError: true})
-      assert.equal(wrapper.find(SendRowErrorMessage).length, 1)
-
-      const expectedSendRowErrorMessage = wrapper.find('.send-v2__form-row > .send-v2__form-label').childAt(1)
-      assert(expectedSendRowErrorMessage.is(SendRowErrorMessage))
-      assert.deepEqual(
-        expectedSendRowErrorMessage.props(),
-        { errorType: 'mockErrorType' }
-      )
-    })
-
-    it('should render its second child as a child of the send-v2__form-field, if it has two children', () => {
-      wrapper = shallow(<SendRowWrapper
-      errorType={'mockErrorType'}
-      label={'mockLabel'}
-      showError={false}
-    >
-      <span>Mock Custom Label Content</span>
-      <span>Mock Form Field</span>
-    </SendRowWrapper>)
-      assert.equal(wrapper.find('.send-v2__form-row > .send-v2__form-field').childAt(0).text(), 'Mock Form Field')
-    })
-
-    it('should render its first child as the last child of the send-v2__form-label, if it has two children', () => {
-      wrapper = shallow(<SendRowWrapper
-      errorType={'mockErrorType'}
-      label={'mockLabel'}
-      showError={false}
-    >
-      <span>Mock Custom Label Content</span>
-      <span>Mock Form Field</span>
-    </SendRowWrapper>)
-      assert.equal(wrapper.find('.send-v2__form-row > .send-v2__form-label').childAt(1).text(), 'Mock Custom Label Content')
-    })
-  })
-})
diff --git a/ui/app/components/send/send-content/send-to-row/index.js b/ui/app/components/send/send-content/send-to-row/index.js
deleted file mode 100644
index 121f15148..000000000
--- a/ui/app/components/send/send-content/send-to-row/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './send-to-row.container'
diff --git a/ui/app/components/send/send-content/send-to-row/send-to-row-README.md b/ui/app/components/send/send-content/send-to-row/send-to-row-README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-content/send-to-row/send-to-row.component.js b/ui/app/components/send/send-content/send-to-row/send-to-row.component.js
deleted file mode 100644
index 17c75c817..000000000
--- a/ui/app/components/send/send-content/send-to-row/send-to-row.component.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import SendRowWrapper from '../send-row-wrapper/'
-import EnsInput from '../../../ens-input'
-import { getToErrorObject } from './send-to-row.utils.js'
-
-export default class SendToRow extends Component {
-
-  static propTypes = {
-    closeToDropdown: PropTypes.func,
-    hasHexData: PropTypes.bool.isRequired,
-    inError: PropTypes.bool,
-    network: PropTypes.string,
-    openToDropdown: PropTypes.func,
-    to: PropTypes.string,
-    toAccounts: PropTypes.array,
-    toDropdownOpen: PropTypes.bool,
-    updateGas: PropTypes.func,
-    updateSendTo: PropTypes.func,
-    updateSendToError: PropTypes.func,
-    scanQrCode: PropTypes.func,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  handleToChange (to, nickname = '', toError) {
-    const { hasHexData, updateSendTo, updateSendToError, updateGas } = this.props
-    const toErrorObject = getToErrorObject(to, toError, hasHexData)
-    updateSendTo(to, nickname)
-    updateSendToError(toErrorObject)
-    if (toErrorObject.to === null) {
-      updateGas({ to })
-    }
-  }
-
-  render () {
-    const {
-      closeToDropdown,
-      inError,
-      network,
-      openToDropdown,
-      to,
-      toAccounts,
-      toDropdownOpen,
-    } = this.props
-
-    return (
-      <SendRowWrapper
-        errorType={'to'}
-        label={`${this.context.t('to')}: `}
-        showError={inError}
-      >
-        <EnsInput
-          scanQrCode={_ => this.props.scanQrCode()}
-          accounts={toAccounts}
-          closeDropdown={() => closeToDropdown()}
-          dropdownOpen={toDropdownOpen}
-          inError={inError}
-          name={'address'}
-          network={network}
-          onChange={({ toAddress, nickname, toError }) => this.handleToChange(toAddress, nickname, toError)}
-          openDropdown={() => openToDropdown()}
-          placeholder={this.context.t('recipientAddress')}
-          to={to}
-        />
-      </SendRowWrapper>
-    )
-  }
-
-}
diff --git a/ui/app/components/send/send-content/send-to-row/send-to-row.container.js b/ui/app/components/send/send-content/send-to-row/send-to-row.container.js
deleted file mode 100644
index 3ee188bad..000000000
--- a/ui/app/components/send/send-content/send-to-row/send-to-row.container.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { connect } from 'react-redux'
-import {
-    getCurrentNetwork,
-    getSendTo,
-    getSendToAccounts,
-    getSendHexData,
-} from '../../send.selectors.js'
-import {
-    getToDropdownOpen,
-    sendToIsInError,
-} from './send-to-row.selectors.js'
-import {
-    updateSendTo,
-} from '../../../../actions'
-import {
-  updateSendErrors,
-  openToDropdown,
-  closeToDropdown,
-} from '../../../../ducks/send.duck'
-import SendToRow from './send-to-row.component'
-
-export default connect(mapStateToProps, mapDispatchToProps)(SendToRow)
-
-function mapStateToProps (state) {
-  return {
-    hasHexData: Boolean(getSendHexData(state)),
-    inError: sendToIsInError(state),
-    network: getCurrentNetwork(state),
-    to: getSendTo(state),
-    toAccounts: getSendToAccounts(state),
-    toDropdownOpen: getToDropdownOpen(state),
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return {
-    closeToDropdown: () => dispatch(closeToDropdown()),
-    openToDropdown: () => dispatch(openToDropdown()),
-    updateSendTo: (to, nickname) => dispatch(updateSendTo(to, nickname)),
-    updateSendToError: (toErrorObject) => {
-        dispatch(updateSendErrors(toErrorObject))
-    },
-  }
-}
diff --git a/ui/app/components/send/send-content/send-to-row/send-to-row.selectors.js b/ui/app/components/send/send-content/send-to-row/send-to-row.selectors.js
deleted file mode 100644
index 8919014be..000000000
--- a/ui/app/components/send/send-content/send-to-row/send-to-row.selectors.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const selectors = {
-  getToDropdownOpen,
-  sendToIsInError,
-}
-
-module.exports = selectors
-
-function getToDropdownOpen (state) {
-  return state.send.toDropdownOpen
-}
-
-function sendToIsInError (state) {
-    return Boolean(state.send.errors.to)
-}
diff --git a/ui/app/components/send/send-content/send-to-row/send-to-row.utils.js b/ui/app/components/send/send-content/send-to-row/send-to-row.utils.js
deleted file mode 100644
index 0eeaa3a11..000000000
--- a/ui/app/components/send/send-content/send-to-row/send-to-row.utils.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const {
-  REQUIRED_ERROR,
-  INVALID_RECIPIENT_ADDRESS_ERROR,
-} = require('../../send.constants')
-const { isValidAddress } = require('../../../../util')
-
-function getToErrorObject (to, toError = null, hasHexData = false) {
-  if (!to) {
-    if (!hasHexData) {
-      toError = REQUIRED_ERROR
-    }
-  } else if (!isValidAddress(to) && !toError) {
-    toError = INVALID_RECIPIENT_ADDRESS_ERROR
-  }
-
-  return { to: toError }
-}
-
-module.exports = {
-  getToErrorObject,
-}
diff --git a/ui/app/components/send/send-content/send-to-row/tests/send-to-row-component.test.js b/ui/app/components/send/send-content/send-to-row/tests/send-to-row-component.test.js
deleted file mode 100644
index 591229deb..000000000
--- a/ui/app/components/send/send-content/send-to-row/tests/send-to-row-component.test.js
+++ /dev/null
@@ -1,149 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import sinon from 'sinon'
-import proxyquire from 'proxyquire'
-
-const SendToRow = proxyquire('../send-to-row.component.js', {
-  './send-to-row.utils.js': {
-    getToErrorObject: (to, toError) => ({
-      to: to === false ? null : `mockToErrorObject:${to}${toError}`,
-    }),
-  },
-}).default
-
-import SendRowWrapper from '../../send-row-wrapper/send-row-wrapper.component'
-import EnsInput from '../../../../ens-input'
-
-const propsMethodSpies = {
-  closeToDropdown: sinon.spy(),
-  openToDropdown: sinon.spy(),
-  updateGas: sinon.spy(),
-  updateSendTo: sinon.spy(),
-  updateSendToError: sinon.spy(),
-}
-
-sinon.spy(SendToRow.prototype, 'handleToChange')
-
-describe('SendToRow Component', function () {
-  let wrapper
-  let instance
-
-  beforeEach(() => {
-    wrapper = shallow(<SendToRow
-      closeToDropdown={propsMethodSpies.closeToDropdown}
-      inError={false}
-      network={'mockNetwork'}
-      openToDropdown={propsMethodSpies.openToDropdown}
-      to={'mockTo'}
-      toAccounts={['mockAccount']}
-      toDropdownOpen={false}
-      updateGas={propsMethodSpies.updateGas}
-      updateSendTo={propsMethodSpies.updateSendTo}
-      updateSendToError={propsMethodSpies.updateSendToError}
-    />, { context: { t: str => str + '_t' } })
-    instance = wrapper.instance()
-  })
-
-  afterEach(() => {
-    propsMethodSpies.closeToDropdown.resetHistory()
-    propsMethodSpies.openToDropdown.resetHistory()
-    propsMethodSpies.updateSendTo.resetHistory()
-    propsMethodSpies.updateSendToError.resetHistory()
-    SendToRow.prototype.handleToChange.resetHistory()
-  })
-
-  describe('handleToChange', () => {
-
-    it('should call updateSendTo', () => {
-      assert.equal(propsMethodSpies.updateSendTo.callCount, 0)
-      instance.handleToChange('mockTo2', 'mockNickname')
-      assert.equal(propsMethodSpies.updateSendTo.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.updateSendTo.getCall(0).args,
-        ['mockTo2', 'mockNickname']
-      )
-    })
-
-    it('should call updateSendToError', () => {
-      assert.equal(propsMethodSpies.updateSendToError.callCount, 0)
-      instance.handleToChange('mockTo2', '', 'mockToError')
-      assert.equal(propsMethodSpies.updateSendToError.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.updateSendToError.getCall(0).args,
-        [{ to: 'mockToErrorObject:mockTo2mockToError' }]
-      )
-    })
-
-    it('should not call updateGas if there is a to error', () => {
-      assert.equal(propsMethodSpies.updateGas.callCount, 0)
-      instance.handleToChange('mockTo2')
-      assert.equal(propsMethodSpies.updateGas.callCount, 0)
-    })
-
-    it('should call updateGas if there is no to error', () => {
-      assert.equal(propsMethodSpies.updateGas.callCount, 0)
-      instance.handleToChange(false)
-      assert.equal(propsMethodSpies.updateGas.callCount, 1)
-    })
-  })
-
-  describe('render', () => {
-    it('should render a SendRowWrapper component', () => {
-      assert.equal(wrapper.find(SendRowWrapper).length, 1)
-    })
-
-    it('should pass the correct props to SendRowWrapper', () => {
-      const {
-        errorType,
-        label,
-        showError,
-      } = wrapper.find(SendRowWrapper).props()
-
-      assert.equal(errorType, 'to')
-
-      assert.equal(label, 'to_t: ')
-
-      assert.equal(showError, false)
-    })
-
-    it('should render an EnsInput as a child of the SendRowWrapper', () => {
-      assert(wrapper.find(SendRowWrapper).childAt(0).is(EnsInput))
-    })
-
-    it('should render the EnsInput with the correct props', () => {
-      const {
-        accounts,
-        closeDropdown,
-        dropdownOpen,
-        inError,
-        name,
-        network,
-        onChange,
-        openDropdown,
-        placeholder,
-        to,
-      } = wrapper.find(SendRowWrapper).childAt(0).props()
-      assert.deepEqual(accounts, ['mockAccount'])
-      assert.equal(dropdownOpen, false)
-      assert.equal(inError, false)
-      assert.equal(name, 'address')
-      assert.equal(network, 'mockNetwork')
-      assert.equal(placeholder, 'recipientAddress_t')
-      assert.equal(to, 'mockTo')
-      assert.equal(propsMethodSpies.closeToDropdown.callCount, 0)
-      closeDropdown()
-      assert.equal(propsMethodSpies.closeToDropdown.callCount, 1)
-      assert.equal(propsMethodSpies.openToDropdown.callCount, 0)
-      openDropdown()
-      assert.equal(propsMethodSpies.openToDropdown.callCount, 1)
-      assert.equal(SendToRow.prototype.handleToChange.callCount, 0)
-      onChange({ toAddress: 'mockNewTo', nickname: 'mockNewNickname', toError: 'mockToError' })
-      assert.equal(SendToRow.prototype.handleToChange.callCount, 1)
-      assert.deepEqual(
-        SendToRow.prototype.handleToChange.getCall(0).args,
-        ['mockNewTo', 'mockNewNickname', 'mockToError']
-      )
-    })
-  })
-})
diff --git a/ui/app/components/send/send-content/send-to-row/tests/send-to-row-container.test.js b/ui/app/components/send/send-content/send-to-row/tests/send-to-row-container.test.js
deleted file mode 100644
index dfce7652f..000000000
--- a/ui/app/components/send/send-content/send-to-row/tests/send-to-row-container.test.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-import sinon from 'sinon'
-
-let mapStateToProps
-let mapDispatchToProps
-
-const actionSpies = {
-  updateSendTo: sinon.spy(),
-}
-const duckActionSpies = {
-  closeToDropdown: sinon.spy(),
-  openToDropdown: sinon.spy(),
-  updateSendErrors: sinon.spy(),
-}
-
-proxyquire('../send-to-row.container.js', {
-  'react-redux': {
-    connect: (ms, md) => {
-      mapStateToProps = ms
-      mapDispatchToProps = md
-      return () => ({})
-    },
-  },
-  '../../send.selectors.js': {
-    getCurrentNetwork: (s) => `mockNetwork:${s}`,
-    getSendHexData: (s) => s,
-    getSendTo: (s) => `mockTo:${s}`,
-    getSendToAccounts: (s) => `mockToAccounts:${s}`,
-  },
-  './send-to-row.selectors.js': {
-    getToDropdownOpen: (s) => `mockToDropdownOpen:${s}`,
-    sendToIsInError: (s) => `mockInError:${s}`,
-  },
-  '../../../../actions': actionSpies,
-  '../../../../ducks/send.duck': duckActionSpies,
-})
-
-describe('send-to-row container', () => {
-
-  describe('mapStateToProps()', () => {
-
-    it('should map the correct properties to props', () => {
-      assert.deepEqual(mapStateToProps('mockState'), {
-        hasHexData: true,
-        inError: 'mockInError:mockState',
-        network: 'mockNetwork:mockState',
-        to: 'mockTo:mockState',
-        toAccounts: 'mockToAccounts:mockState',
-        toDropdownOpen: 'mockToDropdownOpen:mockState',
-      })
-    })
-
-  })
-
-  describe('mapDispatchToProps()', () => {
-    let dispatchSpy
-    let mapDispatchToPropsObject
-
-    beforeEach(() => {
-      dispatchSpy = sinon.spy()
-      mapDispatchToPropsObject = mapDispatchToProps(dispatchSpy)
-    })
-
-    describe('closeToDropdown()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.closeToDropdown()
-        assert(dispatchSpy.calledOnce)
-        assert(duckActionSpies.closeToDropdown.calledOnce)
-        assert.equal(
-          duckActionSpies.closeToDropdown.getCall(0).args[0],
-          undefined
-        )
-      })
-    })
-
-    describe('openToDropdown()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.openToDropdown()
-        assert(dispatchSpy.calledOnce)
-        assert(duckActionSpies.openToDropdown.calledOnce)
-        assert.equal(
-          duckActionSpies.openToDropdown.getCall(0).args[0],
-          undefined
-        )
-      })
-    })
-
-    describe('updateSendTo()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.updateSendTo('mockTo', 'mockNickname')
-        assert(dispatchSpy.calledOnce)
-        assert(actionSpies.updateSendTo.calledOnce)
-        assert.deepEqual(
-          actionSpies.updateSendTo.getCall(0).args,
-          ['mockTo', 'mockNickname']
-        )
-      })
-    })
-
-    describe('updateSendToError()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.updateSendToError('mockToErrorObject')
-        assert(dispatchSpy.calledOnce)
-        assert(duckActionSpies.updateSendErrors.calledOnce)
-        assert.equal(
-          duckActionSpies.updateSendErrors.getCall(0).args[0],
-          'mockToErrorObject'
-        )
-      })
-    })
-
-  })
-
-})
diff --git a/ui/app/components/send/send-content/send-to-row/tests/send-to-row-selectors.test.js b/ui/app/components/send/send-content/send-to-row/tests/send-to-row-selectors.test.js
deleted file mode 100644
index 122ad3265..000000000
--- a/ui/app/components/send/send-content/send-to-row/tests/send-to-row-selectors.test.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import assert from 'assert'
-import {
-  getToDropdownOpen,
-  sendToIsInError,
-} from '../send-to-row.selectors.js'
-
-describe('send-to-row selectors', () => {
-
-  describe('getToDropdownOpen()', () => {
-    it('should return send.getToDropdownOpen', () => {
-      const state = {
-        send: {
-          toDropdownOpen: false,
-        },
-      }
-
-      assert.equal(getToDropdownOpen(state), false)
-    })
-  })
-
-  describe('sendToIsInError()', () => {
-    it('should return true if send.errors.to is truthy', () => {
-      const state = {
-        send: {
-          errors: {
-            to: 'abc',
-          },
-        },
-      }
-
-      assert.equal(sendToIsInError(state), true)
-    })
-
-    it('should return false if send.errors.to is falsy', () => {
-      const state = {
-        send: {
-          errors: {
-            to: null,
-          },
-        },
-      }
-
-      assert.equal(sendToIsInError(state), false)
-    })
-  })
-
-})
diff --git a/ui/app/components/send/send-content/send-to-row/tests/send-to-row-utils.test.js b/ui/app/components/send/send-content/send-to-row/tests/send-to-row-utils.test.js
deleted file mode 100644
index c779aeb76..000000000
--- a/ui/app/components/send/send-content/send-to-row/tests/send-to-row-utils.test.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-import sinon from 'sinon'
-
-import {
-  REQUIRED_ERROR,
-  INVALID_RECIPIENT_ADDRESS_ERROR,
-} from '../../../send.constants'
-
-const stubs = {
-  isValidAddress: sinon.stub().callsFake(to => Boolean(to.match(/^[0xabcdef123456798]+$/))),
-}
-
-const toRowUtils = proxyquire('../send-to-row.utils.js', {
-  '../../../../util': {
-    isValidAddress: stubs.isValidAddress,
-  },
-})
-const {
-  getToErrorObject,
-} = toRowUtils
-
-describe('send-to-row utils', () => {
-
-  describe('getToErrorObject()', () => {
-    it('should return a required error if to is falsy', () => {
-      assert.deepEqual(getToErrorObject(null), {
-        to: REQUIRED_ERROR,
-      })
-    })
-
-    it('should return null if to is falsy and hexData is truthy', () => {
-      assert.deepEqual(getToErrorObject(null, undefined, true), {
-        to: null,
-      })
-    })
-
-    it('should return an invalid recipient error if to is truthy but invalid', () => {
-      assert.deepEqual(getToErrorObject('mockInvalidTo'), {
-        to: INVALID_RECIPIENT_ADDRESS_ERROR,
-      })
-    })
-
-    it('should return null if to is truthy and valid', () => {
-      assert.deepEqual(getToErrorObject('0xabc123'), {
-        to: null,
-      })
-    })
-
-    it('should return the passed error if to is truthy but invalid if to is truthy and valid', () => {
-      assert.deepEqual(getToErrorObject('invalid #$ 345878', 'someExplicitError'), {
-        to: 'someExplicitError',
-      })
-    })
-  })
-
-})
diff --git a/ui/app/components/send/send-content/tests/send-content-component.test.js b/ui/app/components/send/send-content/tests/send-content-component.test.js
deleted file mode 100644
index c5a11c8bb..000000000
--- a/ui/app/components/send/send-content/tests/send-content-component.test.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import SendContent from '../send-content.component.js'
-
-import PageContainerContent from '../../../page-container/page-container-content.component'
-import SendAmountRow from '../send-amount-row/send-amount-row.container'
-import SendFromRow from '../send-from-row/send-from-row.container'
-import SendGasRow from '../send-gas-row/send-gas-row.container'
-import SendToRow from '../send-to-row/send-to-row.container'
-import SendHexDataRow from '../send-hex-data-row/send-hex-data-row.container'
-
-describe('SendContent Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(<SendContent showHexData={true} />)
-  })
-
-  describe('render', () => {
-    it('should render a PageContainerContent component', () => {
-      assert.equal(wrapper.find(PageContainerContent).length, 1)
-    })
-
-    it('should render a div with a .send-v2__form class as a child of PageContainerContent', () => {
-      const PageContainerContentChild = wrapper.find(PageContainerContent).children()
-      PageContainerContentChild.is('div')
-      PageContainerContentChild.is('.send-v2__form')
-    })
-
-    it('should render the correct row components as grandchildren of the PageContainerContent component', () => {
-      const PageContainerContentChild = wrapper.find(PageContainerContent).children()
-      assert(PageContainerContentChild.childAt(0).is(SendFromRow))
-      assert(PageContainerContentChild.childAt(1).is(SendToRow))
-      assert(PageContainerContentChild.childAt(2).is(SendAmountRow))
-      assert(PageContainerContentChild.childAt(3).is(SendGasRow))
-      assert(PageContainerContentChild.childAt(4).is(SendHexDataRow))
-    })
-
-    it('should not render the SendHexDataRow if props.showHexData is false', () => {
-      wrapper.setProps({ showHexData: false })
-      const PageContainerContentChild = wrapper.find(PageContainerContent).children()
-      assert(PageContainerContentChild.childAt(0).is(SendFromRow))
-      assert(PageContainerContentChild.childAt(1).is(SendToRow))
-      assert(PageContainerContentChild.childAt(2).is(SendAmountRow))
-      assert(PageContainerContentChild.childAt(3).is(SendGasRow))
-      assert.equal(PageContainerContentChild.childAt(4).exists(), false)
-    })
-  })
-})
diff --git a/ui/app/components/send/send-footer/README.md b/ui/app/components/send/send-footer/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-footer/index.js b/ui/app/components/send/send-footer/index.js
deleted file mode 100644
index 58e91d622..000000000
--- a/ui/app/components/send/send-footer/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './send-footer.container'
diff --git a/ui/app/components/send/send-footer/send-footer.component.js b/ui/app/components/send/send-footer/send-footer.component.js
deleted file mode 100644
index 230bf450f..000000000
--- a/ui/app/components/send/send-footer/send-footer.component.js
+++ /dev/null
@@ -1,104 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import PageContainerFooter from '../../page-container/page-container-footer'
-import { CONFIRM_TRANSACTION_ROUTE, DEFAULT_ROUTE } from '../../../routes'
-
-export default class SendFooter extends Component {
-
-  static propTypes = {
-    addToAddressBookIfNew: PropTypes.func,
-    amount: PropTypes.string,
-    data: PropTypes.string,
-    clearSend: PropTypes.func,
-    disabled: PropTypes.bool,
-    editingTransactionId: PropTypes.string,
-    errors: PropTypes.object,
-    from: PropTypes.object,
-    gasLimit: PropTypes.string,
-    gasPrice: PropTypes.string,
-    gasTotal: PropTypes.string,
-    history: PropTypes.object,
-    inError: PropTypes.bool,
-    selectedToken: PropTypes.object,
-    sign: PropTypes.func,
-    to: PropTypes.string,
-    toAccounts: PropTypes.array,
-    tokenBalance: PropTypes.string,
-    unapprovedTxs: PropTypes.object,
-    update: PropTypes.func,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  onCancel () {
-    this.props.clearSend()
-    this.props.history.push(DEFAULT_ROUTE)
-  }
-
-  onSubmit (event) {
-    event.preventDefault()
-    const {
-      addToAddressBookIfNew,
-      amount,
-      data,
-      editingTransactionId,
-      from: {address: from},
-      gasLimit: gas,
-      gasPrice,
-      selectedToken,
-      sign,
-      to,
-      unapprovedTxs,
-      // updateTx,
-      update,
-      toAccounts,
-      history,
-    } = this.props
-
-    // Should not be needed because submit should be disabled if there are errors.
-    // const noErrors = !amountError && toError === null
-
-    // if (!noErrors) {
-    //   return
-    // }
-
-    // TODO: add nickname functionality
-    addToAddressBookIfNew(to, toAccounts)
-
-    const promise = editingTransactionId
-      ? update({
-        amount,
-        data,
-        editingTransactionId,
-        from,
-        gas,
-        gasPrice,
-        selectedToken,
-        to,
-        unapprovedTxs,
-      })
-      : sign({ data, selectedToken, to, amount, from, gas, gasPrice })
-
-    Promise.resolve(promise)
-      .then(() => history.push(CONFIRM_TRANSACTION_ROUTE))
-  }
-
-  formShouldBeDisabled () {
-    const { data, inError, selectedToken, tokenBalance, gasTotal, to } = this.props
-    const missingTokenBalance = selectedToken && !tokenBalance
-    return inError || !gasTotal || missingTokenBalance || !(data || to)
-  }
-
-  render () {
-    return (
-      <PageContainerFooter
-        onCancel={() => this.onCancel()}
-        onSubmit={e => this.onSubmit(e)}
-        disabled={this.formShouldBeDisabled()}
-      />
-    )
-  }
-
-}
diff --git a/ui/app/components/send/send-footer/send-footer.container.js b/ui/app/components/send/send-footer/send-footer.container.js
deleted file mode 100644
index 60de4d030..000000000
--- a/ui/app/components/send/send-footer/send-footer.container.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import { connect } from 'react-redux'
-import ethUtil from 'ethereumjs-util'
-import {
-  addToAddressBook,
-  clearSend,
-  signTokenTx,
-  signTx,
-  updateTransaction,
-} from '../../../actions'
-import SendFooter from './send-footer.component'
-import {
-  getGasLimit,
-  getGasPrice,
-  getGasTotal,
-  getSelectedToken,
-  getSendAmount,
-  getSendEditingTransactionId,
-  getSendFromObject,
-  getSendTo,
-  getSendToAccounts,
-  getSendHexData,
-  getTokenBalance,
-  getUnapprovedTxs,
-} from '../send.selectors'
-import {
-  isSendFormInError,
-} from './send-footer.selectors'
-import {
-  addressIsNew,
-  constructTxParams,
-  constructUpdatedTx,
-} from './send-footer.utils'
-
-export default connect(mapStateToProps, mapDispatchToProps)(SendFooter)
-
-function mapStateToProps (state) {
-  return {
-    amount: getSendAmount(state),
-    data: getSendHexData(state),
-    editingTransactionId: getSendEditingTransactionId(state),
-    from: getSendFromObject(state),
-    gasLimit: getGasLimit(state),
-    gasPrice: getGasPrice(state),
-    gasTotal: getGasTotal(state),
-    inError: isSendFormInError(state),
-    selectedToken: getSelectedToken(state),
-    to: getSendTo(state),
-    toAccounts: getSendToAccounts(state),
-    tokenBalance: getTokenBalance(state),
-    unapprovedTxs: getUnapprovedTxs(state),
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return {
-    clearSend: () => dispatch(clearSend()),
-    sign: ({ selectedToken, to, amount, from, gas, gasPrice, data }) => {
-      const txParams = constructTxParams({
-        amount,
-        data,
-        from,
-        gas,
-        gasPrice,
-        selectedToken,
-        to,
-      })
-
-      selectedToken
-        ? dispatch(signTokenTx(selectedToken.address, to, amount, txParams))
-        : dispatch(signTx(txParams))
-    },
-    update: ({
-      amount,
-      data,
-      editingTransactionId,
-      from,
-      gas,
-      gasPrice,
-      selectedToken,
-      to,
-      unapprovedTxs,
-    }) => {
-      const editingTx = constructUpdatedTx({
-        amount,
-        data,
-        editingTransactionId,
-        from,
-        gas,
-        gasPrice,
-        selectedToken,
-        to,
-        unapprovedTxs,
-      })
-
-      return dispatch(updateTransaction(editingTx))
-    },
-    addToAddressBookIfNew: (newAddress, toAccounts, nickname = '') => {
-      const hexPrefixedAddress = ethUtil.addHexPrefix(newAddress)
-      if (addressIsNew(toAccounts)) {
-        // TODO: nickname, i.e. addToAddressBook(recipient, nickname)
-        dispatch(addToAddressBook(hexPrefixedAddress, nickname))
-      }
-    },
-  }
-}
diff --git a/ui/app/components/send/send-footer/send-footer.scss b/ui/app/components/send/send-footer/send-footer.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-footer/send-footer.selectors.js b/ui/app/components/send/send-footer/send-footer.selectors.js
deleted file mode 100644
index e20addfdc..000000000
--- a/ui/app/components/send/send-footer/send-footer.selectors.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const { getSendErrors } = require('../send.selectors')
-
-const selectors = {
-  isSendFormInError,
-}
-
-module.exports = selectors
-
-function isSendFormInError (state) {
-  return Object.values(getSendErrors(state)).some(n => n)
-}
diff --git a/ui/app/components/send/send-footer/send-footer.utils.js b/ui/app/components/send/send-footer/send-footer.utils.js
deleted file mode 100644
index f82ff1e9b..000000000
--- a/ui/app/components/send/send-footer/send-footer.utils.js
+++ /dev/null
@@ -1,85 +0,0 @@
-const ethAbi = require('ethereumjs-abi')
-const ethUtil = require('ethereumjs-util')
-const { TOKEN_TRANSFER_FUNCTION_SIGNATURE } = require('../send.constants')
-
-function addHexPrefixToObjectValues (obj) {
-  return Object.keys(obj).reduce((newObj, key) => {
-    return { ...newObj, [key]: ethUtil.addHexPrefix(obj[key]) }
-  }, {})
-}
-
-function constructTxParams ({ selectedToken, data, to, amount, from, gas, gasPrice }) {
-  const txParams = {
-    data,
-    from,
-    value: '0',
-    gas,
-    gasPrice,
-  }
-
-  if (!selectedToken) {
-    txParams.value = amount
-    txParams.to = to
-  }
-
-  return addHexPrefixToObjectValues(txParams)
-}
-
-function constructUpdatedTx ({
-  amount,
-  data,
-  editingTransactionId,
-  from,
-  gas,
-  gasPrice,
-  selectedToken,
-  to,
-  unapprovedTxs,
-}) {
-  const unapprovedTx = unapprovedTxs[editingTransactionId]
-  const txParamsData = unapprovedTx.txParams.data ? unapprovedTx.txParams.data : data
-  const editingTx = {
-    ...unapprovedTx,
-    txParams: Object.assign(
-      unapprovedTx.txParams,
-      addHexPrefixToObjectValues({
-        data: txParamsData,
-        to,
-        from,
-        gas,
-        gasPrice,
-        value: amount,
-      })
-    ),
-  }
-
-  if (selectedToken) {
-    const data = TOKEN_TRANSFER_FUNCTION_SIGNATURE + Array.prototype.map.call(
-      ethAbi.rawEncode(['address', 'uint256'], [to, ethUtil.addHexPrefix(amount)]),
-      x => ('00' + x.toString(16)).slice(-2)
-    ).join('')
-
-    Object.assign(editingTx.txParams, addHexPrefixToObjectValues({
-      value: '0',
-      to: selectedToken.address,
-      data,
-    }))
-  }
-
-  if (typeof editingTx.txParams.data === 'undefined') {
-    delete editingTx.txParams.data
-  }
-
-  return editingTx
-}
-
-function addressIsNew (toAccounts, newAddress) {
-  return !toAccounts.find(({ address }) => newAddress === address)
-}
-
-module.exports = {
-  addressIsNew,
-  constructTxParams,
-  constructUpdatedTx,
-  addHexPrefixToObjectValues,
-}
diff --git a/ui/app/components/send/send-footer/tests/send-footer-component.test.js b/ui/app/components/send/send-footer/tests/send-footer-component.test.js
deleted file mode 100644
index 65e4bb654..000000000
--- a/ui/app/components/send/send-footer/tests/send-footer-component.test.js
+++ /dev/null
@@ -1,232 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import sinon from 'sinon'
-import { CONFIRM_TRANSACTION_ROUTE, DEFAULT_ROUTE } from '../../../../routes'
-import SendFooter from '../send-footer.component.js'
-
-import PageContainerFooter from '../../../page-container/page-container-footer'
-
-const propsMethodSpies = {
-  addToAddressBookIfNew: sinon.spy(),
-  clearSend: sinon.spy(),
-  sign: sinon.spy(),
-  update: sinon.spy(),
-}
-const historySpies = {
-  push: sinon.spy(),
-}
-const MOCK_EVENT = { preventDefault: () => {} }
-
-sinon.spy(SendFooter.prototype, 'onCancel')
-sinon.spy(SendFooter.prototype, 'onSubmit')
-
-describe('SendFooter Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(<SendFooter
-      addToAddressBookIfNew={propsMethodSpies.addToAddressBookIfNew}
-      amount={'mockAmount'}
-      clearSend={propsMethodSpies.clearSend}
-      disabled={true}
-      editingTransactionId={'mockEditingTransactionId'}
-      errors={{}}
-      from={ { address: 'mockAddress', balance: 'mockBalance' } }
-      gasLimit={'mockGasLimit'}
-      gasPrice={'mockGasPrice'}
-      gasTotal={'mockGasTotal'}
-      history={historySpies}
-      inError={false}
-      selectedToken={{ mockProp: 'mockSelectedTokenProp' }}
-      sign={propsMethodSpies.sign}
-      to={'mockTo'}
-      toAccounts={['mockAccount']}
-      tokenBalance={'mockTokenBalance'}
-      unapprovedTxs={['mockTx']}
-      update={propsMethodSpies.update}
-    />, { context: { t: str => str } })
-  })
-
-  afterEach(() => {
-    propsMethodSpies.clearSend.resetHistory()
-    propsMethodSpies.addToAddressBookIfNew.resetHistory()
-    propsMethodSpies.clearSend.resetHistory()
-    propsMethodSpies.sign.resetHistory()
-    propsMethodSpies.update.resetHistory()
-    historySpies.push.resetHistory()
-    SendFooter.prototype.onCancel.resetHistory()
-    SendFooter.prototype.onSubmit.resetHistory()
-  })
-
-  describe('onCancel', () => {
-    it('should call clearSend', () => {
-      assert.equal(propsMethodSpies.clearSend.callCount, 0)
-      wrapper.instance().onCancel()
-      assert.equal(propsMethodSpies.clearSend.callCount, 1)
-    })
-
-    it('should call history.push', () => {
-      assert.equal(historySpies.push.callCount, 0)
-      wrapper.instance().onCancel()
-      assert.equal(historySpies.push.callCount, 1)
-      assert.equal(historySpies.push.getCall(0).args[0], DEFAULT_ROUTE)
-    })
-  })
-
-
-  describe('formShouldBeDisabled()', () => {
-    const config = {
-      'should return true if inError is truthy': {
-        inError: true,
-        expectedResult: true,
-      },
-      'should return true if gasTotal is falsy': {
-        inError: false,
-        gasTotal: false,
-        expectedResult: true,
-      },
-      'should return true if to is truthy': {
-        to: '0xsomevalidAddress',
-        inError: false,
-        gasTotal: false,
-        expectedResult: true,
-      },
-      'should return true if selectedToken is truthy and tokenBalance is falsy': {
-        selectedToken: true,
-        tokenBalance: null,
-        expectedResult: true,
-      },
-      'should return false if inError is false and all other params are truthy': {
-        inError: false,
-        gasTotal: '0x123',
-        selectedToken: true,
-        tokenBalance: 123,
-        expectedResult: false,
-      },
-    }
-    Object.entries(config).map(([description, obj]) => {
-      it(description, () => {
-        wrapper.setProps(obj)
-        assert.equal(wrapper.instance().formShouldBeDisabled(), obj.expectedResult)
-      })
-    })
-  })
-
-  describe('onSubmit', () => {
-    it('should call addToAddressBookIfNew with the correct params', () => {
-      wrapper.instance().onSubmit(MOCK_EVENT)
-      assert(propsMethodSpies.addToAddressBookIfNew.calledOnce)
-      assert.deepEqual(
-        propsMethodSpies.addToAddressBookIfNew.getCall(0).args,
-        ['mockTo', ['mockAccount']]
-      )
-    })
-
-    it('should call props.update if editingTransactionId is truthy', () => {
-      wrapper.instance().onSubmit(MOCK_EVENT)
-      assert(propsMethodSpies.update.calledOnce)
-      assert.deepEqual(
-        propsMethodSpies.update.getCall(0).args[0],
-        {
-          data: undefined,
-          amount: 'mockAmount',
-          editingTransactionId: 'mockEditingTransactionId',
-          from: 'mockAddress',
-          gas: 'mockGasLimit',
-          gasPrice: 'mockGasPrice',
-          selectedToken: { mockProp: 'mockSelectedTokenProp' },
-          to: 'mockTo',
-          unapprovedTxs: ['mockTx'],
-        }
-      )
-    })
-
-    it('should not call props.sign if editingTransactionId is truthy', () => {
-      assert.equal(propsMethodSpies.sign.callCount, 0)
-    })
-
-    it('should call props.sign if editingTransactionId is falsy', () => {
-      wrapper.setProps({ editingTransactionId: null })
-      wrapper.instance().onSubmit(MOCK_EVENT)
-      assert(propsMethodSpies.sign.calledOnce)
-      assert.deepEqual(
-        propsMethodSpies.sign.getCall(0).args[0],
-        {
-          data: undefined,
-          amount: 'mockAmount',
-          from: 'mockAddress',
-          gas: 'mockGasLimit',
-          gasPrice: 'mockGasPrice',
-          selectedToken: { mockProp: 'mockSelectedTokenProp' },
-          to: 'mockTo',
-        }
-      )
-    })
-
-    it('should not call props.update if editingTransactionId is falsy', () => {
-      assert.equal(propsMethodSpies.update.callCount, 0)
-    })
-
-    it('should call history.push', done => {
-      Promise.resolve(wrapper.instance().onSubmit(MOCK_EVENT))
-        .then(() => {
-          assert.equal(historySpies.push.callCount, 1)
-          assert.equal(historySpies.push.getCall(0).args[0], CONFIRM_TRANSACTION_ROUTE)
-          done()
-        })
-    })
-  })
-
-  describe('render', () => {
-    beforeEach(() => {
-      sinon.stub(SendFooter.prototype, 'formShouldBeDisabled').returns('formShouldBeDisabledReturn')
-      wrapper = shallow(<SendFooter
-        addToAddressBookIfNew={propsMethodSpies.addToAddressBookIfNew}
-        amount={'mockAmount'}
-        clearSend={propsMethodSpies.clearSend}
-        disabled={true}
-        editingTransactionId={'mockEditingTransactionId'}
-        errors={{}}
-        from={ { address: 'mockAddress', balance: 'mockBalance' } }
-        gasLimit={'mockGasLimit'}
-        gasPrice={'mockGasPrice'}
-        gasTotal={'mockGasTotal'}
-        history={historySpies}
-        inError={false}
-        selectedToken={{ mockProp: 'mockSelectedTokenProp' }}
-        sign={propsMethodSpies.sign}
-        to={'mockTo'}
-        toAccounts={['mockAccount']}
-        tokenBalance={'mockTokenBalance'}
-        unapprovedTxs={['mockTx']}
-        update={propsMethodSpies.update}
-      />, { context: { t: str => str } })
-    })
-
-    afterEach(() => {
-      SendFooter.prototype.formShouldBeDisabled.restore()
-    })
-
-    it('should render a PageContainerFooter component', () => {
-      assert.equal(wrapper.find(PageContainerFooter).length, 1)
-    })
-
-    it('should pass the correct props to PageContainerFooter', () => {
-      const {
-        onCancel,
-        onSubmit,
-        disabled,
-      } = wrapper.find(PageContainerFooter).props()
-      assert.equal(disabled, 'formShouldBeDisabledReturn')
-
-      assert.equal(SendFooter.prototype.onSubmit.callCount, 0)
-      onSubmit(MOCK_EVENT)
-      assert.equal(SendFooter.prototype.onSubmit.callCount, 1)
-
-      assert.equal(SendFooter.prototype.onCancel.callCount, 0)
-      onCancel()
-      assert.equal(SendFooter.prototype.onCancel.callCount, 1)
-    })
-  })
-})
diff --git a/ui/app/components/send/send-footer/tests/send-footer-container.test.js b/ui/app/components/send/send-footer/tests/send-footer-container.test.js
deleted file mode 100644
index cf4c893ee..000000000
--- a/ui/app/components/send/send-footer/tests/send-footer-container.test.js
+++ /dev/null
@@ -1,196 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-import sinon from 'sinon'
-
-let mapStateToProps
-let mapDispatchToProps
-
-const actionSpies = {
-  addToAddressBook: sinon.spy(),
-  clearSend: sinon.spy(),
-  signTokenTx: sinon.spy(),
-  signTx: sinon.spy(),
-  updateTransaction: sinon.spy(),
-}
-const utilsStubs = {
-  addressIsNew: sinon.stub().returns(true),
-  constructTxParams: sinon.stub().returns('mockConstructedTxParams'),
-  constructUpdatedTx: sinon.stub().returns('mockConstructedUpdatedTxParams'),
-}
-
-proxyquire('../send-footer.container.js', {
-  'react-redux': {
-    connect: (ms, md) => {
-      mapStateToProps = ms
-      mapDispatchToProps = md
-      return () => ({})
-    },
-  },
-  '../../../actions': actionSpies,
-  '../send.selectors': {
-    getGasLimit: (s) => `mockGasLimit:${s}`,
-    getGasPrice: (s) => `mockGasPrice:${s}`,
-    getGasTotal: (s) => `mockGasTotal:${s}`,
-    getSelectedToken: (s) => `mockSelectedToken:${s}`,
-    getSendAmount: (s) => `mockAmount:${s}`,
-    getSendEditingTransactionId: (s) => `mockEditingTransactionId:${s}`,
-    getSendFromObject: (s) => `mockFromObject:${s}`,
-    getSendTo: (s) => `mockTo:${s}`,
-    getSendToAccounts: (s) => `mockToAccounts:${s}`,
-    getTokenBalance: (s) => `mockTokenBalance:${s}`,
-    getSendHexData: (s) => `mockHexData:${s}`,
-    getUnapprovedTxs: (s) => `mockUnapprovedTxs:${s}`,
-  },
-  './send-footer.selectors': { isSendFormInError: (s) => `mockInError:${s}` },
-  './send-footer.utils': utilsStubs,
-})
-
-describe('send-footer container', () => {
-
-  describe('mapStateToProps()', () => {
-
-    it('should map the correct properties to props', () => {
-      assert.deepEqual(mapStateToProps('mockState'), {
-        amount: 'mockAmount:mockState',
-        data: 'mockHexData:mockState',
-        selectedToken: 'mockSelectedToken:mockState',
-        editingTransactionId: 'mockEditingTransactionId:mockState',
-        from: 'mockFromObject:mockState',
-        gasLimit: 'mockGasLimit:mockState',
-        gasPrice: 'mockGasPrice:mockState',
-        gasTotal: 'mockGasTotal:mockState',
-        inError: 'mockInError:mockState',
-        to: 'mockTo:mockState',
-        toAccounts: 'mockToAccounts:mockState',
-        tokenBalance: 'mockTokenBalance:mockState',
-        unapprovedTxs: 'mockUnapprovedTxs:mockState',
-      })
-    })
-
-  })
-
-  describe('mapDispatchToProps()', () => {
-    let dispatchSpy
-    let mapDispatchToPropsObject
-
-    beforeEach(() => {
-      dispatchSpy = sinon.spy()
-      mapDispatchToPropsObject = mapDispatchToProps(dispatchSpy)
-    })
-
-    describe('clearSend()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.clearSend()
-        assert(dispatchSpy.calledOnce)
-        assert(actionSpies.clearSend.calledOnce)
-      })
-    })
-
-    describe('sign()', () => {
-      it('should dispatch a signTokenTx action if selectedToken is defined', () => {
-        mapDispatchToPropsObject.sign({
-          selectedToken: {
-            address: '0xabc',
-          },
-          to: 'mockTo',
-          amount: 'mockAmount',
-          from: 'mockFrom',
-          gas: 'mockGas',
-          gasPrice: 'mockGasPrice',
-        })
-        assert(dispatchSpy.calledOnce)
-        assert.deepEqual(
-          utilsStubs.constructTxParams.getCall(0).args[0],
-          {
-            data: undefined,
-            selectedToken: {
-              address: '0xabc',
-            },
-            to: 'mockTo',
-            amount: 'mockAmount',
-            from: 'mockFrom',
-            gas: 'mockGas',
-            gasPrice: 'mockGasPrice',
-          }
-        )
-        assert.deepEqual(
-          actionSpies.signTokenTx.getCall(0).args,
-          [ '0xabc', 'mockTo', 'mockAmount', 'mockConstructedTxParams' ]
-        )
-      })
-
-      it('should dispatch a sign action if selectedToken is not defined', () => {
-        utilsStubs.constructTxParams.resetHistory()
-        mapDispatchToPropsObject.sign({
-          to: 'mockTo',
-          amount: 'mockAmount',
-          from: 'mockFrom',
-          gas: 'mockGas',
-          gasPrice: 'mockGasPrice',
-        })
-        assert(dispatchSpy.calledOnce)
-        assert.deepEqual(
-          utilsStubs.constructTxParams.getCall(0).args[0],
-          {
-            data: undefined,
-            selectedToken: undefined,
-            to: 'mockTo',
-            amount: 'mockAmount',
-            from: 'mockFrom',
-            gas: 'mockGas',
-            gasPrice: 'mockGasPrice',
-          }
-        )
-        assert.deepEqual(
-          actionSpies.signTx.getCall(0).args,
-          [ 'mockConstructedTxParams' ]
-        )
-      })
-    })
-
-    describe('update()', () => {
-      it('should dispatch an updateTransaction action', () => {
-        mapDispatchToPropsObject.update({
-          to: 'mockTo',
-          amount: 'mockAmount',
-          from: 'mockFrom',
-          gas: 'mockGas',
-          gasPrice: 'mockGasPrice',
-          editingTransactionId: 'mockEditingTransactionId',
-          selectedToken: 'mockSelectedToken',
-          unapprovedTxs: 'mockUnapprovedTxs',
-        })
-        assert(dispatchSpy.calledOnce)
-        assert.deepEqual(
-          utilsStubs.constructUpdatedTx.getCall(0).args[0],
-          {
-            data: undefined,
-            to: 'mockTo',
-            amount: 'mockAmount',
-            from: 'mockFrom',
-            gas: 'mockGas',
-            gasPrice: 'mockGasPrice',
-            editingTransactionId: 'mockEditingTransactionId',
-            selectedToken: 'mockSelectedToken',
-            unapprovedTxs: 'mockUnapprovedTxs',
-          }
-        )
-        assert.equal(actionSpies.updateTransaction.getCall(0).args[0], 'mockConstructedUpdatedTxParams')
-      })
-    })
-
-    describe('addToAddressBookIfNew()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.addToAddressBookIfNew('mockNewAddress', 'mockToAccounts', 'mockNickname')
-        assert(dispatchSpy.calledOnce)
-        assert.equal(utilsStubs.addressIsNew.getCall(0).args[0], 'mockToAccounts')
-        assert.deepEqual(
-          actionSpies.addToAddressBook.getCall(0).args,
-          [ '0xmockNewAddress', 'mockNickname' ]
-        )
-      })
-    })
-
-  })
-
-})
diff --git a/ui/app/components/send/send-footer/tests/send-footer-selectors.test.js b/ui/app/components/send/send-footer/tests/send-footer-selectors.test.js
deleted file mode 100644
index 8de032f57..000000000
--- a/ui/app/components/send/send-footer/tests/send-footer-selectors.test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-
-const {
-  isSendFormInError,
-} = proxyquire('../send-footer.selectors', {
-  '../send.selectors': {
-    getSendErrors: (mockState) => mockState.errors,
-  },
-})
-
-describe('send-footer selectors', () => {
-
-  describe('getTitleKey()', () => {
-    it('should return true if any of the values of the object returned by getSendErrors are truthy', () => {
-      assert.equal(isSendFormInError({ errors: { a: 'abc', b: false} }), true)
-    })
-
-    it('should return false if all of the values of the object returned by getSendErrors are falsy', () => {
-      assert.equal(isSendFormInError({ errors: { a: false, b: null} }), false)
-    })
-  })
-
-})
diff --git a/ui/app/components/send/send-footer/tests/send-footer-utils.test.js b/ui/app/components/send/send-footer/tests/send-footer-utils.test.js
deleted file mode 100644
index 28ff0c891..000000000
--- a/ui/app/components/send/send-footer/tests/send-footer-utils.test.js
+++ /dev/null
@@ -1,234 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-import sinon from 'sinon'
-const { TOKEN_TRANSFER_FUNCTION_SIGNATURE } = require('../../send.constants')
-
-const stubs = {
-  rawEncode: sinon.stub().callsFake((arr1, arr2) => {
-    return [ ...arr1, ...arr2 ]
-  }),
-}
-
-const sendUtils = proxyquire('../send-footer.utils.js', {
-  'ethereumjs-abi': {
-    rawEncode: stubs.rawEncode,
-  },
-})
-const {
-  addressIsNew,
-  constructTxParams,
-  constructUpdatedTx,
-  addHexPrefixToObjectValues,
-} = sendUtils
-
-describe('send-footer utils', () => {
-
-  describe('addHexPrefixToObjectValues()', () => {
-    it('should return a new object with the same properties with a 0x prefix', () => {
-      assert.deepEqual(
-        addHexPrefixToObjectValues({
-          prop1: '0x123',
-          prop2: '456',
-          prop3: 'x',
-        }),
-        {
-          prop1: '0x123',
-          prop2: '0x456',
-          prop3: '0xx',
-        }
-      )
-    })
-  })
-
-  describe('addressIsNew()', () => {
-    it('should return false if the address exists in toAccounts', () => {
-      assert.equal(
-        addressIsNew([
-          { address: '0xabc' },
-          { address: '0xdef' },
-          { address: '0xghi' },
-        ], '0xdef'),
-        false
-      )
-    })
-
-    it('should return true if the address does not exists in toAccounts', () => {
-      assert.equal(
-        addressIsNew([
-          { address: '0xabc' },
-          { address: '0xdef' },
-          { address: '0xghi' },
-        ], '0xxyz'),
-        true
-      )
-    })
-  })
-
-  describe('constructTxParams()', () => {
-    it('should return a new txParams object with data if there data is given', () => {
-      assert.deepEqual(
-        constructTxParams({
-          data: 'someData',
-          selectedToken: false,
-          to: 'mockTo',
-          amount: 'mockAmount',
-          from: 'mockFrom',
-          gas: 'mockGas',
-          gasPrice: 'mockGasPrice',
-        }),
-        {
-          data: '0xsomeData',
-          to: '0xmockTo',
-          value: '0xmockAmount',
-          from: '0xmockFrom',
-          gas: '0xmockGas',
-          gasPrice: '0xmockGasPrice',
-        }
-      )
-    })
-
-    it('should return a new txParams object with value and to properties if there is no selectedToken', () => {
-      assert.deepEqual(
-        constructTxParams({
-          selectedToken: false,
-          to: 'mockTo',
-          amount: 'mockAmount',
-          from: 'mockFrom',
-          gas: 'mockGas',
-          gasPrice: 'mockGasPrice',
-        }),
-        {
-          data: undefined,
-          to: '0xmockTo',
-          value: '0xmockAmount',
-          from: '0xmockFrom',
-          gas: '0xmockGas',
-          gasPrice: '0xmockGasPrice',
-        }
-      )
-    })
-
-    it('should return a new txParams object without a to property and a 0 value if there is a selectedToken', () => {
-      assert.deepEqual(
-        constructTxParams({
-          selectedToken: true,
-          to: 'mockTo',
-          amount: 'mockAmount',
-          from: 'mockFrom',
-          gas: 'mockGas',
-          gasPrice: 'mockGasPrice',
-        }),
-        {
-          data: undefined,
-          value: '0x0',
-          from: '0xmockFrom',
-          gas: '0xmockGas',
-          gasPrice: '0xmockGasPrice',
-        }
-      )
-    })
-  })
-
-  describe('constructUpdatedTx()', () => {
-    it('should return a new object with an updated txParams', () => {
-      const result = constructUpdatedTx({
-        amount: 'mockAmount',
-        editingTransactionId: '0x456',
-        from: 'mockFrom',
-        gas: 'mockGas',
-        gasPrice: 'mockGasPrice',
-        selectedToken: false,
-        to: 'mockTo',
-        unapprovedTxs: {
-          '0x123': {},
-          '0x456': {
-            unapprovedTxParam: 'someOtherParam',
-            txParams: {
-              data: 'someData',
-            },
-          },
-        },
-      })
-
-      assert.deepEqual(result, {
-        unapprovedTxParam: 'someOtherParam',
-        txParams: {
-          from: '0xmockFrom',
-          gas: '0xmockGas',
-          gasPrice: '0xmockGasPrice',
-          value: '0xmockAmount',
-          to: '0xmockTo',
-          data: '0xsomeData',
-        },
-      })
-    })
-
-    it('should not have data property if there is non in the original tx', () => {
-      const result = constructUpdatedTx({
-        amount: 'mockAmount',
-        editingTransactionId: '0x456',
-        from: 'mockFrom',
-        gas: 'mockGas',
-        gasPrice: 'mockGasPrice',
-        selectedToken: false,
-        to: 'mockTo',
-        unapprovedTxs: {
-          '0x123': {},
-          '0x456': {
-            unapprovedTxParam: 'someOtherParam',
-            txParams: {
-              from: 'oldFrom',
-              gas: 'oldGas',
-              gasPrice: 'oldGasPrice',
-            },
-          },
-        },
-      })
-
-      assert.deepEqual(result, {
-        unapprovedTxParam: 'someOtherParam',
-        txParams: {
-          from: '0xmockFrom',
-          gas: '0xmockGas',
-          gasPrice: '0xmockGasPrice',
-          value: '0xmockAmount',
-          to: '0xmockTo',
-        },
-      })
-    })
-
-    it('should have token property values if selectedToken is truthy', () => {
-      const result = constructUpdatedTx({
-        amount: 'mockAmount',
-        editingTransactionId: '0x456',
-        from: 'mockFrom',
-        gas: 'mockGas',
-        gasPrice: 'mockGasPrice',
-        selectedToken: {
-          address: 'mockTokenAddress',
-        },
-        to: 'mockTo',
-        unapprovedTxs: {
-          '0x123': {},
-          '0x456': {
-            unapprovedTxParam: 'someOtherParam',
-            txParams: {},
-          },
-        },
-      })
-
-      assert.deepEqual(result, {
-        unapprovedTxParam: 'someOtherParam',
-        txParams: {
-          from: '0xmockFrom',
-          gas: '0xmockGas',
-          gasPrice: '0xmockGasPrice',
-          value: '0x0',
-          to: '0xmockTokenAddress',
-          data: `${TOKEN_TRANSFER_FUNCTION_SIGNATURE}ss56Tont`,
-        },
-      })
-    })
-  })
-
-})
diff --git a/ui/app/components/send/send-header/README.md b/ui/app/components/send/send-header/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send-header/index.js b/ui/app/components/send/send-header/index.js
deleted file mode 100644
index 0b17f0b7d..000000000
--- a/ui/app/components/send/send-header/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './send-header.container'
diff --git a/ui/app/components/send/send-header/send-header.component.js b/ui/app/components/send/send-header/send-header.component.js
deleted file mode 100644
index efc4bbf27..000000000
--- a/ui/app/components/send/send-header/send-header.component.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import PageContainerHeader from '../../page-container/page-container-header'
-import { DEFAULT_ROUTE } from '../../../routes'
-
-export default class SendHeader extends Component {
-
-  static propTypes = {
-    clearSend: PropTypes.func,
-    history: PropTypes.object,
-    titleKey: PropTypes.string,
-    subtitleParams: PropTypes.array,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  onClose () {
-    this.props.clearSend()
-    this.props.history.push(DEFAULT_ROUTE)
-  }
-
-  render () {
-    return (
-      <PageContainerHeader
-        onClose={() => this.onClose()}
-        subtitle={this.context.t(...this.props.subtitleParams)}
-        title={this.context.t(this.props.titleKey)}
-      />
-    )
-  }
-
-}
diff --git a/ui/app/components/send/send-header/send-header.container.js b/ui/app/components/send/send-header/send-header.container.js
deleted file mode 100644
index 4bcd0d1b6..000000000
--- a/ui/app/components/send/send-header/send-header.container.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { connect } from 'react-redux'
-import { clearSend } from '../../../actions'
-import SendHeader from './send-header.component'
-import { getSubtitleParams, getTitleKey } from './send-header.selectors'
-
-export default connect(mapStateToProps, mapDispatchToProps)(SendHeader)
-
-function mapStateToProps (state) {
-  return {
-    titleKey: getTitleKey(state),
-    subtitleParams: getSubtitleParams(state),
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return {
-    clearSend: () => dispatch(clearSend()),
-  }
-}
diff --git a/ui/app/components/send/send-header/send-header.selectors.js b/ui/app/components/send/send-header/send-header.selectors.js
deleted file mode 100644
index d7c9d3766..000000000
--- a/ui/app/components/send/send-header/send-header.selectors.js
+++ /dev/null
@@ -1,37 +0,0 @@
-const {
-  getSelectedToken,
-  getSendEditingTransactionId,
-} = require('../send.selectors.js')
-
-const selectors = {
-  getTitleKey,
-  getSubtitleParams,
-}
-
-module.exports = selectors
-
-function getTitleKey (state) {
-  const isEditing = Boolean(getSendEditingTransactionId(state))
-  const isToken = Boolean(getSelectedToken(state))
-
-  if (isEditing) {
-    return 'edit'
-  } else if (isToken) {
-    return 'sendTokens'
-  } else {
-    return 'sendETH'
-  }
-}
-
-function getSubtitleParams (state) {
-    const isEditing = Boolean(getSendEditingTransactionId(state))
-    const token = getSelectedToken(state)
-
-    if (isEditing) {
-      return [ 'editingTransaction' ]
-    } else if (token) {
-      return [ 'onlySendTokensToAccountAddress', [ token.symbol ] ]
-    } else {
-      return [ 'onlySendToEtherAddress' ]
-    }
-}
diff --git a/ui/app/components/send/send-header/tests/send-header-component.test.js b/ui/app/components/send/send-header/tests/send-header-component.test.js
deleted file mode 100644
index 930bfa387..000000000
--- a/ui/app/components/send/send-header/tests/send-header-component.test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import sinon from 'sinon'
-import { DEFAULT_ROUTE } from '../../../../routes'
-import SendHeader from '../send-header.component.js'
-
-import PageContainerHeader from '../../../page-container/page-container-header'
-
-const propsMethodSpies = {
-  clearSend: sinon.spy(),
-}
-const historySpies = {
-  push: sinon.spy(),
-}
-
-sinon.spy(SendHeader.prototype, 'onClose')
-
-describe('SendHeader Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(<SendHeader
-      clearSend={propsMethodSpies.clearSend}
-      history={historySpies}
-      titleKey={'mockTitleKey'}
-      subtitleParams={[ 'mockSubtitleKey', 'mockVal']}
-    />, { context: { t: (str1, str2) => str2 ? str1 + str2 : str1 } })
-  })
-
-  afterEach(() => {
-    propsMethodSpies.clearSend.resetHistory()
-    historySpies.push.resetHistory()
-    SendHeader.prototype.onClose.resetHistory()
-  })
-
-  describe('onClose', () => {
-    it('should call clearSend', () => {
-      assert.equal(propsMethodSpies.clearSend.callCount, 0)
-      wrapper.instance().onClose()
-      assert.equal(propsMethodSpies.clearSend.callCount, 1)
-    })
-
-    it('should call history.push', () => {
-      assert.equal(historySpies.push.callCount, 0)
-      wrapper.instance().onClose()
-      assert.equal(historySpies.push.callCount, 1)
-      assert.equal(historySpies.push.getCall(0).args[0], DEFAULT_ROUTE)
-    })
-  })
-
-  describe('render', () => {
-    it('should render a PageContainerHeader compenent', () => {
-      assert.equal(wrapper.find(PageContainerHeader).length, 1)
-    })
-
-    it('should pass the correct props to PageContainerHeader', () => {
-      const {
-        onClose,
-        subtitle,
-        title,
-      } = wrapper.find(PageContainerHeader).props()
-      assert.equal(subtitle, 'mockSubtitleKeymockVal')
-      assert.equal(title, 'mockTitleKey')
-      assert.equal(SendHeader.prototype.onClose.callCount, 0)
-      onClose()
-      assert.equal(SendHeader.prototype.onClose.callCount, 1)
-    })
-  })
-})
diff --git a/ui/app/components/send/send-header/tests/send-header-container.test.js b/ui/app/components/send/send-header/tests/send-header-container.test.js
deleted file mode 100644
index 41a7e8a89..000000000
--- a/ui/app/components/send/send-header/tests/send-header-container.test.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-import sinon from 'sinon'
-
-let mapStateToProps
-let mapDispatchToProps
-
-const actionSpies = {
-  clearSend: sinon.spy(),
-}
-
-proxyquire('../send-header.container.js', {
-  'react-redux': {
-    connect: (ms, md) => {
-      mapStateToProps = ms
-      mapDispatchToProps = md
-      return () => ({})
-    },
-  },
-  '../../../actions': actionSpies,
-  './send-header.selectors': {
-    getTitleKey: (s) => `mockTitleKey:${s}`,
-    getSubtitleParams: (s) => `mockSubtitleParams:${s}`,
-  },
-})
-
-describe('send-header container', () => {
-
-  describe('mapStateToProps()', () => {
-
-    it('should map the correct properties to props', () => {
-      assert.deepEqual(mapStateToProps('mockState'), {
-        titleKey: 'mockTitleKey:mockState',
-        subtitleParams: 'mockSubtitleParams:mockState',
-      })
-    })
-
-  })
-
-  describe('mapDispatchToProps()', () => {
-    let dispatchSpy
-    let mapDispatchToPropsObject
-
-    beforeEach(() => {
-      dispatchSpy = sinon.spy()
-      mapDispatchToPropsObject = mapDispatchToProps(dispatchSpy)
-    })
-
-    describe('clearSend()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.clearSend()
-        assert(dispatchSpy.calledOnce)
-        assert(actionSpies.clearSend.calledOnce)
-      })
-    })
-
-  })
-
-})
diff --git a/ui/app/components/send/send-header/tests/send-header-selectors.test.js b/ui/app/components/send/send-header/tests/send-header-selectors.test.js
deleted file mode 100644
index e0c6a3ab3..000000000
--- a/ui/app/components/send/send-header/tests/send-header-selectors.test.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-
-const {
-  getTitleKey,
-  getSubtitleParams,
-} = proxyquire('../send-header.selectors', {
-  '../send.selectors': {
-    getSelectedToken: (mockState) => mockState.t,
-    getSendEditingTransactionId: (mockState) => mockState.e,
-  },
-})
-
-describe('send-header selectors', () => {
-
-  describe('getTitleKey()', () => {
-    it('should return the correct key when getSendEditingTransactionId is truthy', () => {
-      assert.equal(getTitleKey({ e: 1, t: true }), 'edit')
-    })
-
-    it('should return the correct key when getSendEditingTransactionId is falsy and getSelectedToken is truthy', () => {
-      assert.equal(getTitleKey({ e: null, t: 'abc' }), 'sendTokens')
-    })
-
-    it('should return the correct key when getSendEditingTransactionId is falsy and getSelectedToken is falsy', () => {
-      assert.equal(getTitleKey({ e: null }), 'sendETH')
-    })
-  })
-
-  describe('getSubtitleParams()', () => {
-    it('should return the correct params when getSendEditingTransactionId is truthy', () => {
-      assert.deepEqual(getSubtitleParams({ e: 1, t: true }), [ 'editingTransaction' ])
-    })
-
-    it('should return the correct params when getSendEditingTransactionId is falsy and getSelectedToken is truthy', () => {
-      assert.deepEqual(
-        getSubtitleParams({ e: null, t: { symbol: 'ABC' } }),
-        [ 'onlySendTokensToAccountAddress', [ 'ABC' ] ]
-      )
-    })
-
-    it('should return the correct params when getSendEditingTransactionId is falsy and getSelectedToken is falsy', () => {
-      assert.deepEqual(getSubtitleParams({ e: null }), [ 'onlySendToEtherAddress' ])
-    })
-  })
-
-})
diff --git a/ui/app/components/send/send.component.js b/ui/app/components/send/send.component.js
deleted file mode 100644
index fb7beca16..000000000
--- a/ui/app/components/send/send.component.js
+++ /dev/null
@@ -1,212 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import PersistentForm from '../../../lib/persistent-form'
-import {
-  getAmountErrorObject,
-  getGasFeeErrorObject,
-  getToAddressForGasUpdate,
-  doesAmountErrorRequireUpdate,
-} from './send.utils'
-
-import SendHeader from './send-header/'
-import SendContent from './send-content/'
-import SendFooter from './send-footer/'
-
-export default class SendTransactionScreen extends PersistentForm {
-
-  static propTypes = {
-    amount: PropTypes.string,
-    amountConversionRate: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.number,
-    ]),
-    blockGasLimit: PropTypes.string,
-    conversionRate: PropTypes.number,
-    editingTransactionId: PropTypes.string,
-    from: PropTypes.object,
-    gasLimit: PropTypes.string,
-    gasPrice: PropTypes.string,
-    gasTotal: PropTypes.string,
-    history: PropTypes.object,
-    network: PropTypes.string,
-    primaryCurrency: PropTypes.string,
-    recentBlocks: PropTypes.array,
-    selectedAddress: PropTypes.string,
-    selectedToken: PropTypes.object,
-    tokenBalance: PropTypes.string,
-    tokenContract: PropTypes.object,
-    updateAndSetGasTotal: PropTypes.func,
-    updateSendErrors: PropTypes.func,
-    updateSendTokenBalance: PropTypes.func,
-    scanQrCode: PropTypes.func,
-    qrCodeDetected: PropTypes.func,
-    qrCodeData: PropTypes.object,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  componentWillReceiveProps (nextProps) {
-    if (nextProps.qrCodeData) {
-      if (nextProps.qrCodeData.type === 'address') {
-        const scannedAddress = nextProps.qrCodeData.values.address.toLowerCase()
-        const currentAddress = this.props.to && this.props.to.toLowerCase()
-        if (currentAddress !== scannedAddress) {
-          this.props.updateSendTo(scannedAddress)
-          this.updateGas({ to: scannedAddress })
-          // Clean up QR code data after handling
-          this.props.qrCodeDetected(null)
-        }
-      }
-    }
-  }
-
-  updateGas ({ to: updatedToAddress, amount: value, data } = {}) {
-    const {
-      amount,
-      blockGasLimit,
-      editingTransactionId,
-      gasLimit,
-      gasPrice,
-      recentBlocks,
-      selectedAddress,
-      selectedToken = {},
-      to: currentToAddress,
-      updateAndSetGasTotal,
-    } = this.props
-
-    updateAndSetGasTotal({
-      blockGasLimit,
-      editingTransactionId,
-      gasLimit,
-      gasPrice,
-      recentBlocks,
-      selectedAddress,
-      selectedToken,
-      to: getToAddressForGasUpdate(updatedToAddress, currentToAddress),
-      value: value || amount,
-      data,
-    })
-  }
-
-  componentDidUpdate (prevProps) {
-    const {
-      amount,
-      amountConversionRate,
-      conversionRate,
-      from: { address, balance },
-      gasTotal,
-      network,
-      primaryCurrency,
-      selectedToken,
-      tokenBalance,
-      updateSendErrors,
-      updateSendTokenBalance,
-      tokenContract,
-    } = this.props
-
-    const {
-      from: { balance: prevBalance },
-      gasTotal: prevGasTotal,
-      tokenBalance: prevTokenBalance,
-      network: prevNetwork,
-    } = prevProps
-
-    const uninitialized = [prevBalance, prevGasTotal].every(n => n === null)
-
-    const amountErrorRequiresUpdate = doesAmountErrorRequireUpdate({
-      balance,
-      gasTotal,
-      prevBalance,
-      prevGasTotal,
-      prevTokenBalance,
-      selectedToken,
-      tokenBalance,
-    })
-
-    if (amountErrorRequiresUpdate) {
-      const amountErrorObject = getAmountErrorObject({
-        amount,
-        amountConversionRate,
-        balance,
-        conversionRate,
-        gasTotal,
-        primaryCurrency,
-        selectedToken,
-        tokenBalance,
-      })
-      const gasFeeErrorObject = selectedToken
-        ? getGasFeeErrorObject({
-          amount,
-          amountConversionRate,
-          balance,
-          conversionRate,
-          gasTotal,
-          primaryCurrency,
-          selectedToken,
-          tokenBalance,
-        })
-        : { gasFee: null }
-      updateSendErrors(Object.assign(amountErrorObject, gasFeeErrorObject))
-    }
-
-    if (!uninitialized) {
-
-      if (network !== prevNetwork && network !== 'loading') {
-        updateSendTokenBalance({
-          selectedToken,
-          tokenContract,
-          address,
-        })
-        this.updateGas()
-      }
-    }
-  }
-
-  componentWillMount () {
-    const {
-      from: { address },
-      selectedToken,
-      tokenContract,
-      updateSendTokenBalance,
-    } = this.props
-    updateSendTokenBalance({
-      selectedToken,
-      tokenContract,
-      address,
-    })
-    this.updateGas()
-
-    // Show QR Scanner modal  if ?scan=true
-    if (window.location.search === '?scan=true') {
-      this.props.scanQrCode()
-
-      // Clear the queryString param after showing the modal
-      const cleanUrl = location.href.split('?')[0]
-      history.pushState({}, null, `${cleanUrl}`)
-      window.location.hash = '#send'
-    }
-  }
-
-  componentWillUnmount () {
-    this.props.resetSendState()
-  }
-
-  render () {
-    const { history, showHexData } = this.props
-
-    return (
-      <div className="page-container">
-        <SendHeader history={history}/>
-        <SendContent
-          updateGas={(updateData) => this.updateGas(updateData)}
-          scanQrCode={_ => this.props.scanQrCode()}
-          showHexData={showHexData}
-        />
-        <SendFooter history={history}/>
-      </div>
-    )
-  }
-
-}
diff --git a/ui/app/components/send/send.container.js b/ui/app/components/send/send.container.js
deleted file mode 100644
index 87056499f..000000000
--- a/ui/app/components/send/send.container.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import { connect } from 'react-redux'
-import SendEther from './send.component'
-import { withRouter } from 'react-router-dom'
-import { compose } from 'recompose'
-import {
-  getAmountConversionRate,
-  getBlockGasLimit,
-  getConversionRate,
-  getCurrentNetwork,
-  getGasLimit,
-  getGasPrice,
-  getGasTotal,
-  getPrimaryCurrency,
-  getRecentBlocks,
-  getSelectedAddress,
-  getSelectedToken,
-  getSelectedTokenContract,
-  getSelectedTokenToFiatRate,
-  getSendAmount,
-  getSendEditingTransactionId,
-  getSendHexDataFeatureFlagState,
-  getSendFromObject,
-  getSendTo,
-  getTokenBalance,
-  getQrCodeData,
-} from './send.selectors'
-import {
-  updateSendTo,
-  updateSendTokenBalance,
-  updateGasData,
-  setGasTotal,
-  showQrScanner,
-  qrCodeDetected,
-} from '../../actions'
-import {
-  resetSendState,
-  updateSendErrors,
-} from '../../ducks/send.duck'
-import {
-  calcGasTotal,
-} from './send.utils.js'
-
-import {
-  SEND_ROUTE,
-} from '../../routes'
-
-module.exports = compose(
-  withRouter,
-  connect(mapStateToProps, mapDispatchToProps)
-)(SendEther)
-
-function mapStateToProps (state) {
-  return {
-    amount: getSendAmount(state),
-    amountConversionRate: getAmountConversionRate(state),
-    blockGasLimit: getBlockGasLimit(state),
-    conversionRate: getConversionRate(state),
-    editingTransactionId: getSendEditingTransactionId(state),
-    from: getSendFromObject(state),
-    gasLimit: getGasLimit(state),
-    gasPrice: getGasPrice(state),
-    gasTotal: getGasTotal(state),
-    network: getCurrentNetwork(state),
-    primaryCurrency: getPrimaryCurrency(state),
-    recentBlocks: getRecentBlocks(state),
-    selectedAddress: getSelectedAddress(state),
-    selectedToken: getSelectedToken(state),
-    showHexData: getSendHexDataFeatureFlagState(state),
-    to: getSendTo(state),
-    tokenBalance: getTokenBalance(state),
-    tokenContract: getSelectedTokenContract(state),
-    tokenToFiatRate: getSelectedTokenToFiatRate(state),
-    qrCodeData: getQrCodeData(state),
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return {
-    updateAndSetGasTotal: ({
-      blockGasLimit,
-      editingTransactionId,
-      gasLimit,
-      gasPrice,
-      recentBlocks,
-      selectedAddress,
-      selectedToken,
-      to,
-      value,
-      data,
-    }) => {
-      !editingTransactionId
-        ? dispatch(updateGasData({ recentBlocks, selectedAddress, selectedToken, blockGasLimit, to, value, data }))
-        : dispatch(setGasTotal(calcGasTotal(gasLimit, gasPrice)))
-    },
-    updateSendTokenBalance: ({ selectedToken, tokenContract, address }) => {
-      dispatch(updateSendTokenBalance({
-        selectedToken,
-        tokenContract,
-        address,
-      }))
-    },
-    updateSendErrors: newError => dispatch(updateSendErrors(newError)),
-    resetSendState: () => dispatch(resetSendState()),
-    scanQrCode: () => dispatch(showQrScanner(SEND_ROUTE)),
-    qrCodeDetected: (data) => dispatch(qrCodeDetected(data)),
-    updateSendTo: (to, nickname) => dispatch(updateSendTo(to, nickname)),
-  }
-}
diff --git a/ui/app/components/send/send.scss b/ui/app/components/send/send.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send/send.selectors.js b/ui/app/components/send/send.selectors.js
deleted file mode 100644
index ee702db9e..000000000
--- a/ui/app/components/send/send.selectors.js
+++ /dev/null
@@ -1,295 +0,0 @@
-const { valuesFor } = require('../../util')
-const abi = require('human-standard-token-abi')
-const {
-  multiplyCurrencies,
-} = require('../../conversion-util')
-const {
-  getMetaMaskAccounts,
-} = require('../../selectors')
-const {
-  estimateGasPriceFromRecentBlocks,
-} = require('./send.utils')
-
-const selectors = {
-  accountsWithSendEtherInfoSelector,
-  // autoAddToBetaUI,
-  getAddressBook,
-  getAmountConversionRate,
-  getBlockGasLimit,
-  getConversionRate,
-  getCurrentAccountWithSendEtherInfo,
-  getCurrentCurrency,
-  getCurrentNetwork,
-  getCurrentViewContext,
-  getForceGasMin,
-  getGasLimit,
-  getGasPrice,
-  getGasPriceFromRecentBlocks,
-  getGasTotal,
-  getPrimaryCurrency,
-  getRecentBlocks,
-  getSelectedAccount,
-  getSelectedAddress,
-  getSelectedIdentity,
-  getSelectedToken,
-  getSelectedTokenContract,
-  getSelectedTokenExchangeRate,
-  getSelectedTokenToFiatRate,
-  getSendAmount,
-  getSendHexData,
-  getSendHexDataFeatureFlagState,
-  getSendEditingTransactionId,
-  getSendErrors,
-  getSendFrom,
-  getSendFromBalance,
-  getSendFromObject,
-  getSendMaxModeState,
-  getSendTo,
-  getSendToAccounts,
-  getTokenBalance,
-  getTokenExchangeRate,
-  getUnapprovedTxs,
-  transactionsSelector,
-  getQrCodeData,
-}
-
-module.exports = selectors
-
-function accountsWithSendEtherInfoSelector (state) {
-  const accounts = getMetaMaskAccounts(state)
-  const { identities } = state.metamask
-
-  const accountsWithSendEtherInfo = Object.entries(accounts).map(([key, account]) => {
-    return Object.assign({}, account, identities[key])
-  })
-
-  return accountsWithSendEtherInfo
-}
-
-// function autoAddToBetaUI (state) {
-//   const autoAddTransactionThreshold = 12
-//   const autoAddAccountsThreshold = 2
-//   const autoAddTokensThreshold = 1
-
-//   const numberOfTransactions = state.metamask.selectedAddressTxList.length
-//   const numberOfAccounts = Object.keys(getMetaMaskAccounts(state)).length
-//   const numberOfTokensAdded = state.metamask.tokens.length
-
-//   const userPassesThreshold = (numberOfTransactions > autoAddTransactionThreshold) &&
-//     (numberOfAccounts > autoAddAccountsThreshold) &&
-//     (numberOfTokensAdded > autoAddTokensThreshold)
-//   const userIsNotInBeta = !state.metamask.featureFlags.betaUI
-
-//   return userIsNotInBeta && userPassesThreshold
-// }
-
-function getAddressBook (state) {
-  return state.metamask.addressBook
-}
-
-function getAmountConversionRate (state) {
-  return getSelectedToken(state)
-    ? getSelectedTokenToFiatRate(state)
-    : getConversionRate(state)
-}
-
-function getBlockGasLimit (state) {
-  return state.metamask.currentBlockGasLimit
-}
-
-function getConversionRate (state) {
-  return state.metamask.conversionRate
-}
-
-function getCurrentAccountWithSendEtherInfo (state) {
-  const currentAddress = getSelectedAddress(state)
-  const accounts = accountsWithSendEtherInfoSelector(state)
-
-  return accounts.find(({ address }) => address === currentAddress)
-}
-
-function getCurrentCurrency (state) {
-  return state.metamask.currentCurrency
-}
-
-function getCurrentNetwork (state) {
-  return state.metamask.network
-}
-
-function getCurrentViewContext (state) {
-  const { currentView = {} } = state.appState
-  return currentView.context
-}
-
-function getForceGasMin (state) {
-  return state.metamask.send.forceGasMin
-}
-
-function getGasLimit (state) {
-  return state.metamask.send.gasLimit
-}
-
-function getGasPrice (state) {
-  return state.metamask.send.gasPrice
-}
-
-function getGasPriceFromRecentBlocks (state) {
-  return estimateGasPriceFromRecentBlocks(state.metamask.recentBlocks)
-}
-
-function getGasTotal (state) {
-  return state.metamask.send.gasTotal
-}
-
-function getPrimaryCurrency (state) {
-  const selectedToken = getSelectedToken(state)
-  return selectedToken && selectedToken.symbol
-}
-
-function getRecentBlocks (state) {
-  return state.metamask.recentBlocks
-}
-
-function getSelectedAccount (state) {
-  const accounts = getMetaMaskAccounts(state)
-  const selectedAddress = getSelectedAddress(state)
-
-  return accounts[selectedAddress]
-}
-
-function getSelectedAddress (state) {
-  const selectedAddress = state.metamask.selectedAddress || Object.keys(getMetaMaskAccounts(state))[0]
-
-  return selectedAddress
-}
-
-function getSelectedIdentity (state) {
-  const selectedAddress = getSelectedAddress(state)
-  const identities = state.metamask.identities
-
-  return identities[selectedAddress]
-}
-
-function getSelectedToken (state) {
-  const tokens = state.metamask.tokens || []
-  const selectedTokenAddress = state.metamask.selectedTokenAddress
-  const selectedToken = tokens.filter(({ address }) => address === selectedTokenAddress)[0]
-  const sendToken = state.metamask.send.token
-
-  return selectedToken || sendToken || null
-}
-
-function getSelectedTokenContract (state) {
-  const selectedToken = getSelectedToken(state)
-
-  return selectedToken
-    ? global.eth.contract(abi).at(selectedToken.address)
-    : null
-}
-
-function getSelectedTokenExchangeRate (state) {
-  const tokenExchangeRates = state.metamask.tokenExchangeRates
-  const selectedToken = getSelectedToken(state) || {}
-  const { symbol = '' } = selectedToken
-  const pair = `${symbol.toLowerCase()}_eth`
-  const { rate: tokenExchangeRate = 0 } = tokenExchangeRates && tokenExchangeRates[pair] || {}
-
-  return tokenExchangeRate
-}
-
-function getSelectedTokenToFiatRate (state) {
-  const selectedTokenExchangeRate = getSelectedTokenExchangeRate(state)
-  const conversionRate = getConversionRate(state)
-
-  const tokenToFiatRate = multiplyCurrencies(
-    conversionRate,
-    selectedTokenExchangeRate,
-    { toNumericBase: 'dec' }
-  )
-
-  return tokenToFiatRate
-}
-
-function getSendAmount (state) {
-  return state.metamask.send.amount
-}
-
-function getSendHexData (state) {
-  return state.metamask.send.data
-}
-
-function getSendHexDataFeatureFlagState (state) {
-  return state.metamask.featureFlags.sendHexData
-}
-
-function getSendEditingTransactionId (state) {
-  return state.metamask.send.editingTransactionId
-}
-
-function getSendErrors (state) {
-  return state.send.errors
-}
-
-function getSendFrom (state) {
-  return state.metamask.send.from
-}
-
-function getSendFromBalance (state) {
-  const from = getSendFrom(state) || getSelectedAccount(state)
-  return from.balance
-}
-
-function getSendFromObject (state) {
-  return getSendFrom(state) || getCurrentAccountWithSendEtherInfo(state)
-}
-
-function getSendMaxModeState (state) {
-  return state.metamask.send.maxModeOn
-}
-
-function getSendTo (state) {
-  return state.metamask.send.to
-}
-
-function getSendToAccounts (state) {
-  const fromAccounts = accountsWithSendEtherInfoSelector(state)
-  const addressBookAccounts = getAddressBook(state)
-  const allAccounts = [...fromAccounts, ...addressBookAccounts]
-  // TODO: figure out exactly what the below returns and put a descriptive variable name on it
-  return Object.entries(allAccounts).map(([key, account]) => account)
-}
-
-function getTokenBalance (state) {
-  return state.metamask.send.tokenBalance
-}
-
-function getTokenExchangeRate (state, tokenSymbol) {
-  const pair = `${tokenSymbol.toLowerCase()}_eth`
-  const tokenExchangeRates = state.metamask.tokenExchangeRates
-  const { rate: tokenExchangeRate = 0 } = tokenExchangeRates[pair] || {}
-
-  return tokenExchangeRate
-}
-
-function getUnapprovedTxs (state) {
-  return state.metamask.unapprovedTxs
-}
-
-function transactionsSelector (state) {
-  const { network, selectedTokenAddress } = state.metamask
-  const unapprovedMsgs = valuesFor(state.metamask.unapprovedMsgs)
-  const shapeShiftTxList = (network === '1') ? state.metamask.shapeShiftTxList : undefined
-  const transactions = state.metamask.selectedAddressTxList || []
-  const txsToRender = !shapeShiftTxList ? transactions.concat(unapprovedMsgs) : transactions.concat(unapprovedMsgs, shapeShiftTxList)
-
-  return selectedTokenAddress
-    ? txsToRender
-      .filter(({ txParams }) => txParams && txParams.to === selectedTokenAddress)
-      .sort((a, b) => b.time - a.time)
-    : txsToRender
-      .sort((a, b) => b.time - a.time)
-}
-
-function getQrCodeData (state) {
-  return state.appState.qrCodeData
-}
diff --git a/ui/app/components/send/tests/send-component.test.js b/ui/app/components/send/tests/send-component.test.js
deleted file mode 100644
index f4943e707..000000000
--- a/ui/app/components/send/tests/send-component.test.js
+++ /dev/null
@@ -1,338 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-import { shallow } from 'enzyme'
-import sinon from 'sinon'
-
-import SendHeader from '../send-header/send-header.container'
-import SendContent from '../send-content/send-content.component'
-import SendFooter from '../send-footer/send-footer.container'
-
-const propsMethodSpies = {
-  updateAndSetGasTotal: sinon.spy(),
-  updateSendErrors: sinon.spy(),
-  updateSendTokenBalance: sinon.spy(),
-  resetSendState: sinon.spy(),
-}
-const utilsMethodStubs = {
-  getAmountErrorObject: sinon.stub().returns({ amount: 'mockAmountError' }),
-  getGasFeeErrorObject: sinon.stub().returns({ gasFee: 'mockGasFeeError' }),
-  doesAmountErrorRequireUpdate: sinon.stub().callsFake(obj => obj.balance !== obj.prevBalance),
-}
-
-const SendTransactionScreen = proxyquire('../send.component.js', {
-  './send.utils': utilsMethodStubs,
-}).default
-
-sinon.spy(SendTransactionScreen.prototype, 'componentDidMount')
-sinon.spy(SendTransactionScreen.prototype, 'updateGas')
-
-describe('Send Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(<SendTransactionScreen
-      amount={'mockAmount'}
-      amountConversionRate={'mockAmountConversionRate'}
-      blockGasLimit={'mockBlockGasLimit'}
-      conversionRate={10}
-      editingTransactionId={'mockEditingTransactionId'}
-      from={ { address: 'mockAddress', balance: 'mockBalance' } }
-      gasLimit={'mockGasLimit'}
-      gasPrice={'mockGasPrice'}
-      gasTotal={'mockGasTotal'}
-      history={{ mockProp: 'history-abc'}}
-      network={'3'}
-      primaryCurrency={'mockPrimaryCurrency'}
-      recentBlocks={['mockBlock']}
-      selectedAddress={'mockSelectedAddress'}
-      selectedToken={'mockSelectedToken'}
-      showHexData={true}
-      tokenBalance={'mockTokenBalance'}
-      tokenContract={'mockTokenContract'}
-      updateAndSetGasTotal={propsMethodSpies.updateAndSetGasTotal}
-      updateSendErrors={propsMethodSpies.updateSendErrors}
-      updateSendTokenBalance={propsMethodSpies.updateSendTokenBalance}
-      resetSendState={propsMethodSpies.resetSendState}
-    />)
-  })
-
-  afterEach(() => {
-    SendTransactionScreen.prototype.componentDidMount.resetHistory()
-    SendTransactionScreen.prototype.updateGas.resetHistory()
-    utilsMethodStubs.doesAmountErrorRequireUpdate.resetHistory()
-    utilsMethodStubs.getAmountErrorObject.resetHistory()
-    utilsMethodStubs.getGasFeeErrorObject.resetHistory()
-    propsMethodSpies.updateAndSetGasTotal.resetHistory()
-    propsMethodSpies.updateSendErrors.resetHistory()
-    propsMethodSpies.updateSendTokenBalance.resetHistory()
-  })
-
-  it('should call componentDidMount', () => {
-    assert(SendTransactionScreen.prototype.componentDidMount.calledOnce)
-  })
-
-  describe('componentWillMount', () => {
-    it('should call this.updateGas', () => {
-      SendTransactionScreen.prototype.updateGas.resetHistory()
-      propsMethodSpies.updateSendErrors.resetHistory()
-      assert.equal(SendTransactionScreen.prototype.updateGas.callCount, 0)
-      wrapper.instance().componentWillMount()
-      assert.equal(SendTransactionScreen.prototype.updateGas.callCount, 1)
-    })
-  })
-
-  describe('componentWillUnmount', () => {
-    it('should call this.props.resetSendState', () => {
-      propsMethodSpies.resetSendState.resetHistory()
-      assert.equal(propsMethodSpies.resetSendState.callCount, 0)
-      wrapper.instance().componentWillUnmount()
-      assert.equal(propsMethodSpies.resetSendState.callCount, 1)
-    })
-  })
-
-  describe('componentDidUpdate', () => {
-    it('should call doesAmountErrorRequireUpdate with the expected params', () => {
-      utilsMethodStubs.getAmountErrorObject.resetHistory()
-      wrapper.instance().componentDidUpdate({
-        from: {
-          balance: '',
-        },
-      })
-      assert(utilsMethodStubs.doesAmountErrorRequireUpdate.calledOnce)
-      assert.deepEqual(
-        utilsMethodStubs.doesAmountErrorRequireUpdate.getCall(0).args[0],
-        {
-          balance: 'mockBalance',
-          gasTotal: 'mockGasTotal',
-          prevBalance: '',
-          prevGasTotal: undefined,
-          prevTokenBalance: undefined,
-          selectedToken: 'mockSelectedToken',
-          tokenBalance: 'mockTokenBalance',
-        }
-      )
-    })
-
-    it('should not call getAmountErrorObject if doesAmountErrorRequireUpdate returns false', () => {
-      utilsMethodStubs.getAmountErrorObject.resetHistory()
-      wrapper.instance().componentDidUpdate({
-        from: {
-          balance: 'mockBalance',
-        },
-      })
-      assert.equal(utilsMethodStubs.getAmountErrorObject.callCount, 0)
-    })
-
-    it('should call getAmountErrorObject if doesAmountErrorRequireUpdate returns true', () => {
-      utilsMethodStubs.getAmountErrorObject.resetHistory()
-      wrapper.instance().componentDidUpdate({
-        from: {
-          balance: 'balanceChanged',
-        },
-      })
-      assert.equal(utilsMethodStubs.getAmountErrorObject.callCount, 1)
-      assert.deepEqual(
-        utilsMethodStubs.getAmountErrorObject.getCall(0).args[0],
-        {
-          amount: 'mockAmount',
-          amountConversionRate: 'mockAmountConversionRate',
-          balance: 'mockBalance',
-          conversionRate: 10,
-          gasTotal: 'mockGasTotal',
-          primaryCurrency: 'mockPrimaryCurrency',
-          selectedToken: 'mockSelectedToken',
-          tokenBalance: 'mockTokenBalance',
-        }
-      )
-    })
-
-    it('should call getGasFeeErrorObject if doesAmountErrorRequireUpdate returns true and selectedToken is truthy', () => {
-      utilsMethodStubs.getGasFeeErrorObject.resetHistory()
-      wrapper.instance().componentDidUpdate({
-        from: {
-          balance: 'balanceChanged',
-        },
-      })
-      assert.equal(utilsMethodStubs.getGasFeeErrorObject.callCount, 1)
-      assert.deepEqual(
-        utilsMethodStubs.getGasFeeErrorObject.getCall(0).args[0],
-        {
-          amount: 'mockAmount',
-          amountConversionRate: 'mockAmountConversionRate',
-          balance: 'mockBalance',
-          conversionRate: 10,
-          gasTotal: 'mockGasTotal',
-          primaryCurrency: 'mockPrimaryCurrency',
-          selectedToken: 'mockSelectedToken',
-          tokenBalance: 'mockTokenBalance',
-        }
-      )
-    })
-
-    it('should not call getGasFeeErrorObject if doesAmountErrorRequireUpdate returns false', () => {
-      utilsMethodStubs.getGasFeeErrorObject.resetHistory()
-      wrapper.instance().componentDidUpdate({
-        from: { address: 'mockAddress', balance: 'mockBalance' },
-      })
-      assert.equal(utilsMethodStubs.getGasFeeErrorObject.callCount, 0)
-    })
-
-    it('should not call getGasFeeErrorObject if doesAmountErrorRequireUpdate returns true but selectedToken is falsy', () => {
-      utilsMethodStubs.getGasFeeErrorObject.resetHistory()
-      wrapper.setProps({ selectedToken: null })
-      wrapper.instance().componentDidUpdate({
-        from: {
-          balance: 'balanceChanged',
-        },
-      })
-      assert.equal(utilsMethodStubs.getGasFeeErrorObject.callCount, 0)
-    })
-
-    it('should call updateSendErrors with the expected params if selectedToken is falsy', () => {
-      propsMethodSpies.updateSendErrors.resetHistory()
-      wrapper.setProps({ selectedToken: null })
-      wrapper.instance().componentDidUpdate({
-        from: {
-          balance: 'balanceChanged',
-        },
-      })
-      assert.equal(propsMethodSpies.updateSendErrors.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.updateSendErrors.getCall(0).args[0],
-        { amount: 'mockAmountError', gasFee: null }
-      )
-    })
-
-    it('should call updateSendErrors with the expected params if selectedToken is truthy', () => {
-      propsMethodSpies.updateSendErrors.resetHistory()
-      wrapper.setProps({ selectedToken: 'someToken' })
-      wrapper.instance().componentDidUpdate({
-        from: {
-          balance: 'balanceChanged',
-        },
-      })
-      assert.equal(propsMethodSpies.updateSendErrors.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.updateSendErrors.getCall(0).args[0],
-        { amount: 'mockAmountError', gasFee: 'mockGasFeeError' }
-      )
-    })
-
-    it('should not call updateSendTokenBalance or this.updateGas if network === prevNetwork', () => {
-      SendTransactionScreen.prototype.updateGas.resetHistory()
-      propsMethodSpies.updateSendTokenBalance.resetHistory()
-      wrapper.instance().componentDidUpdate({
-        from: {
-          balance: 'balanceChanged',
-        },
-        network: '3',
-      })
-      assert.equal(propsMethodSpies.updateSendTokenBalance.callCount, 0)
-      assert.equal(SendTransactionScreen.prototype.updateGas.callCount, 0)
-    })
-
-    it('should not call updateSendTokenBalance or this.updateGas if network === loading', () => {
-      wrapper.setProps({ network: 'loading' })
-      SendTransactionScreen.prototype.updateGas.resetHistory()
-      propsMethodSpies.updateSendTokenBalance.resetHistory()
-      wrapper.instance().componentDidUpdate({
-        from: {
-          balance: 'balanceChanged',
-        },
-        network: '3',
-      })
-      assert.equal(propsMethodSpies.updateSendTokenBalance.callCount, 0)
-      assert.equal(SendTransactionScreen.prototype.updateGas.callCount, 0)
-    })
-
-    it('should call updateSendTokenBalance and this.updateGas with the correct params', () => {
-      SendTransactionScreen.prototype.updateGas.resetHistory()
-      propsMethodSpies.updateSendTokenBalance.resetHistory()
-      wrapper.instance().componentDidUpdate({
-        from: {
-          balance: 'balanceChanged',
-        },
-        network: '2',
-      })
-      assert.equal(propsMethodSpies.updateSendTokenBalance.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.updateSendTokenBalance.getCall(0).args[0],
-        {
-          selectedToken: 'mockSelectedToken',
-          tokenContract: 'mockTokenContract',
-          address: 'mockAddress',
-        }
-      )
-      assert.equal(SendTransactionScreen.prototype.updateGas.callCount, 1)
-      assert.deepEqual(
-        SendTransactionScreen.prototype.updateGas.getCall(0).args,
-        []
-      )
-    })
-  })
-
-  describe('updateGas', () => {
-    it('should call updateAndSetGasTotal with the correct params if no to prop is passed', () => {
-      propsMethodSpies.updateAndSetGasTotal.resetHistory()
-      wrapper.instance().updateGas()
-      assert.equal(propsMethodSpies.updateAndSetGasTotal.callCount, 1)
-      assert.deepEqual(
-        propsMethodSpies.updateAndSetGasTotal.getCall(0).args[0],
-        {
-          blockGasLimit: 'mockBlockGasLimit',
-          editingTransactionId: 'mockEditingTransactionId',
-          gasLimit: 'mockGasLimit',
-          gasPrice: 'mockGasPrice',
-          recentBlocks: ['mockBlock'],
-          selectedAddress: 'mockSelectedAddress',
-          selectedToken: 'mockSelectedToken',
-          to: '',
-          value: 'mockAmount',
-          data: undefined,
-        }
-      )
-    })
-
-    it('should call updateAndSetGasTotal with the correct params if a to prop is passed', () => {
-      propsMethodSpies.updateAndSetGasTotal.resetHistory()
-      wrapper.setProps({ to: 'someAddress' })
-      wrapper.instance().updateGas()
-      assert.equal(
-        propsMethodSpies.updateAndSetGasTotal.getCall(0).args[0].to,
-        'someaddress',
-      )
-    })
-
-    it('should call updateAndSetGasTotal with to set to lowercase if passed', () => {
-      propsMethodSpies.updateAndSetGasTotal.resetHistory()
-      wrapper.instance().updateGas({ to: '0xABC' })
-      assert.equal(propsMethodSpies.updateAndSetGasTotal.getCall(0).args[0].to, '0xabc')
-    })
-  })
-
-  describe('render', () => {
-    it('should render a page-container class', () => {
-      assert.equal(wrapper.find('.page-container').length, 1)
-    })
-
-    it('should render SendHeader, SendContent and SendFooter', () => {
-      assert.equal(wrapper.find(SendHeader).length, 1)
-      assert.equal(wrapper.find(SendContent).length, 1)
-      assert.equal(wrapper.find(SendFooter).length, 1)
-    })
-
-    it('should pass the history prop to SendHeader and SendFooter', () => {
-      assert.deepEqual(
-        wrapper.find(SendFooter).props(),
-        {
-          history: { mockProp: 'history-abc' },
-        }
-      )
-    })
-
-    it('should pass showHexData to SendContent', () => {
-      assert.equal(wrapper.find(SendContent).props().showHexData, true)
-    })
-  })
-})
diff --git a/ui/app/components/send/tests/send-container.test.js b/ui/app/components/send/tests/send-container.test.js
deleted file mode 100644
index 6aa4bf826..000000000
--- a/ui/app/components/send/tests/send-container.test.js
+++ /dev/null
@@ -1,174 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-import sinon from 'sinon'
-
-let mapStateToProps
-let mapDispatchToProps
-
-const actionSpies = {
-  updateSendTokenBalance: sinon.spy(),
-  updateGasData: sinon.spy(),
-  setGasTotal: sinon.spy(),
-}
-const duckActionSpies = {
-  updateSendErrors: sinon.spy(),
-  resetSendState: sinon.spy(),
-}
-
-proxyquire('../send.container.js', {
-  'react-redux': {
-    connect: (ms, md) => {
-      mapStateToProps = ms
-      mapDispatchToProps = md
-      return () => ({})
-    },
-  },
-  'react-router-dom': { withRouter: () => {} },
-  'recompose': { compose: (arg1, arg2) => () => arg2() },
-  './send.selectors': {
-    getAmountConversionRate: (s) => `mockAmountConversionRate:${s}`,
-    getBlockGasLimit: (s) => `mockBlockGasLimit:${s}`,
-    getConversionRate: (s) => `mockConversionRate:${s}`,
-    getCurrentNetwork: (s) => `mockNetwork:${s}`,
-    getGasLimit: (s) => `mockGasLimit:${s}`,
-    getGasPrice: (s) => `mockGasPrice:${s}`,
-    getGasTotal: (s) => `mockGasTotal:${s}`,
-    getPrimaryCurrency: (s) => `mockPrimaryCurrency:${s}`,
-    getRecentBlocks: (s) => `mockRecentBlocks:${s}`,
-    getSelectedAddress: (s) => `mockSelectedAddress:${s}`,
-    getSelectedToken: (s) => `mockSelectedToken:${s}`,
-    getSelectedTokenContract: (s) => `mockTokenContract:${s}`,
-    getSelectedTokenToFiatRate: (s) => `mockTokenToFiatRate:${s}`,
-    getSendHexDataFeatureFlagState: (s) => `mockSendHexDataFeatureFlagState:${s}`,
-    getSendAmount: (s) => `mockAmount:${s}`,
-    getSendTo: (s) => `mockTo:${s}`,
-    getSendEditingTransactionId: (s) => `mockEditingTransactionId:${s}`,
-    getSendFromObject: (s) => `mockFrom:${s}`,
-    getTokenBalance: (s) => `mockTokenBalance:${s}`,
-    getQrCodeData: (s) => `mockQrCodeData:${s}`,
-  },
-  '../../actions': actionSpies,
-  '../../ducks/send.duck': duckActionSpies,
-  './send.utils.js': {
-    calcGasTotal: (gasLimit, gasPrice) => gasLimit + gasPrice,
-  },
-})
-
-describe('send container', () => {
-
-  describe('mapStateToProps()', () => {
-
-    it('should map the correct properties to props', () => {
-      assert.deepEqual(mapStateToProps('mockState'), {
-        amount: 'mockAmount:mockState',
-        amountConversionRate: 'mockAmountConversionRate:mockState',
-        blockGasLimit: 'mockBlockGasLimit:mockState',
-        conversionRate: 'mockConversionRate:mockState',
-        editingTransactionId: 'mockEditingTransactionId:mockState',
-        from: 'mockFrom:mockState',
-        gasLimit: 'mockGasLimit:mockState',
-        gasPrice: 'mockGasPrice:mockState',
-        gasTotal: 'mockGasTotal:mockState',
-        network: 'mockNetwork:mockState',
-        primaryCurrency: 'mockPrimaryCurrency:mockState',
-        recentBlocks: 'mockRecentBlocks:mockState',
-        selectedAddress: 'mockSelectedAddress:mockState',
-        selectedToken: 'mockSelectedToken:mockState',
-        showHexData: 'mockSendHexDataFeatureFlagState:mockState',
-        to: 'mockTo:mockState',
-        tokenBalance: 'mockTokenBalance:mockState',
-        tokenContract: 'mockTokenContract:mockState',
-        tokenToFiatRate: 'mockTokenToFiatRate:mockState',
-        qrCodeData: 'mockQrCodeData:mockState',
-      })
-    })
-
-  })
-
-  describe('mapDispatchToProps()', () => {
-    let dispatchSpy
-    let mapDispatchToPropsObject
-
-    beforeEach(() => {
-      dispatchSpy = sinon.spy()
-      mapDispatchToPropsObject = mapDispatchToProps(dispatchSpy)
-    })
-
-    describe('updateAndSetGasTotal()', () => {
-      const mockProps = {
-        blockGasLimit: 'mockBlockGasLimit',
-        editingTransactionId: '0x2',
-        gasLimit: '0x3',
-        gasPrice: '0x4',
-        recentBlocks: ['mockBlock'],
-        selectedAddress: '0x4',
-        selectedToken: { address: '0x1' },
-        to: 'mockTo',
-        value: 'mockValue',
-        data: undefined,
-      }
-
-      it('should dispatch a setGasTotal action when editingTransactionId is truthy', () => {
-        mapDispatchToPropsObject.updateAndSetGasTotal(mockProps)
-        assert(dispatchSpy.calledOnce)
-        assert.equal(
-          actionSpies.setGasTotal.getCall(0).args[0],
-          '0x30x4'
-        )
-      })
-
-      it('should dispatch an updateGasData action when editingTransactionId is falsy', () => {
-        const { selectedAddress, selectedToken, recentBlocks, blockGasLimit, to, value, data } = mockProps
-        mapDispatchToPropsObject.updateAndSetGasTotal(
-          Object.assign({}, mockProps, {editingTransactionId: false})
-        )
-        assert(dispatchSpy.calledOnce)
-        assert.deepEqual(
-          actionSpies.updateGasData.getCall(0).args[0],
-          { selectedAddress, selectedToken, recentBlocks, blockGasLimit, to, value, data }
-        )
-      })
-    })
-
-    describe('updateSendTokenBalance()', () => {
-      const mockProps = {
-        address: '0x10',
-        tokenContract: '0x00a',
-        selectedToken: {address: '0x1'},
-      }
-
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.updateSendTokenBalance(Object.assign({}, mockProps))
-        assert(dispatchSpy.calledOnce)
-        assert.deepEqual(
-          actionSpies.updateSendTokenBalance.getCall(0).args[0],
-          mockProps
-        )
-      })
-    })
-
-    describe('updateSendErrors()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.updateSendErrors('mockError')
-        assert(dispatchSpy.calledOnce)
-        assert.equal(
-          duckActionSpies.updateSendErrors.getCall(0).args[0],
-          'mockError'
-        )
-      })
-    })
-
-    describe('resetSendState()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.resetSendState()
-        assert(dispatchSpy.calledOnce)
-        assert.equal(
-          duckActionSpies.resetSendState.getCall(0).args.length,
-          0
-        )
-      })
-    })
-
-  })
-
-})
diff --git a/ui/app/components/send/tests/send-selectors-test-data.js b/ui/app/components/send/tests/send-selectors-test-data.js
deleted file mode 100644
index 8b939dadb..000000000
--- a/ui/app/components/send/tests/send-selectors-test-data.js
+++ /dev/null
@@ -1,230 +0,0 @@
-module.exports = {
-  'metamask': {
-    'isInitialized': true,
-    'isUnlocked': true,
-    'featureFlags': {'betaUI': true, 'sendHexData': true},
-    'rpcTarget': 'https://rawtestrpc.metamask.io/',
-    'identities': {
-      '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825': {
-        'address': '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825',
-        'name': 'Send Account 1',
-      },
-      '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb': {
-        'address': '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb',
-        'name': 'Send Account 2',
-      },
-      '0x2f8d4a878cfa04a6e60d46362f5644deab66572d': {
-        'address': '0x2f8d4a878cfa04a6e60d46362f5644deab66572d',
-        'name': 'Send Account 3',
-      },
-      '0xd85a4b6a394794842887b8284293d69163007bbb': {
-        'address': '0xd85a4b6a394794842887b8284293d69163007bbb',
-        'name': 'Send Account 4',
-      },
-    },
-    'currentBlockGasLimit': '0x4c1878',
-    'currentCurrency': 'USD',
-    'conversionRate': 1200.88200327,
-    'conversionDate': 1489013762,
-    'noActiveNotices': true,
-    'frequentRpcList': [],
-    'network': '3',
-    'accounts': {
-      '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825': {
-        'code': '0x',
-        'balance': '0x47c9d71831c76efe',
-        'nonce': '0x1b',
-        'address': '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825',
-      },
-      '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb': {
-        'code': '0x',
-        'balance': '0x37452b1315889f80',
-        'nonce': '0xa',
-        'address': '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb',
-      },
-      '0x2f8d4a878cfa04a6e60d46362f5644deab66572d': {
-        'code': '0x',
-        'balance': '0x30c9d71831c76efe',
-        'nonce': '0x1c',
-        'address': '0x2f8d4a878cfa04a6e60d46362f5644deab66572d',
-      },
-      '0xd85a4b6a394794842887b8284293d69163007bbb': {
-        'code': '0x',
-        'balance': '0x0',
-        'nonce': '0x0',
-        'address': '0xd85a4b6a394794842887b8284293d69163007bbb',
-      },
-    },
-    'addressBook': [
-      {
-        'address': '0x06195827297c7a80a443b6894d3bdb8824b43896',
-        'name': 'Address Book Account 1',
-      },
-    ],
-    'tokens': [
-      {
-        'address': '0x1a195821297c7a80a433b6894d3bdb8824b43896',
-        'decimals': 18,
-        'symbol': 'ABC',
-      },
-      {
-        'address': '0x8d6b81208414189a58339873ab429b6c47ab92d3',
-        'decimals': 4,
-        'symbol': 'DEF',
-      },
-      {
-        'address': '0xa42084c8d1d9a2198631988579bb36b48433a72b',
-        'decimals': 18,
-        'symbol': 'GHI',
-      },
-    ],
-    'tokenExchangeRates': {
-      'def_eth': {
-        rate: 2.0,
-      },
-      'ghi_eth': {
-        rate: 31.01,
-      },
-    },
-    'transactions': {},
-    'selectedAddressTxList': [
-      {
-        'id': 'mockTokenTx1',
-        'txParams': {
-          'to': '0x8d6b81208414189a58339873ab429b6c47ab92d3',
-        },
-        'time': 1700000000000,
-      },
-      {
-        'id': 'mockTokenTx2',
-        'txParams': {
-          'to': '0xafaketokenaddress',
-        },
-        'time': 1600000000000,
-      },
-      {
-        'id': 'mockTokenTx3',
-        'txParams': {
-          'to': '0x8d6b81208414189a58339873ab429b6c47ab92d3',
-        },
-        'time': 1500000000000,
-      },
-      {
-        'id': 'mockEthTx1',
-        'txParams': {
-          'to': '0xd85a4b6a394794842887b8284293d69163007bbb',
-        },
-        'time': 1400000000000,
-      },
-    ],
-    'selectedTokenAddress': '0x8d6b81208414189a58339873ab429b6c47ab92d3',
-    'unapprovedMsgs': {
-      '0xabc': { id: 'unapprovedMessage1', 'time': 1650000000000 },
-      '0xdef': { id: 'unapprovedMessage2', 'time': 1550000000000 },
-      '0xghi': { id: 'unapprovedMessage3', 'time': 1450000000000 },
-    },
-    'unapprovedMsgCount': 0,
-    'unapprovedPersonalMsgs': {},
-    'unapprovedPersonalMsgCount': 0,
-    'keyringTypes': [
-      'Simple Key Pair',
-      'HD Key Tree',
-    ],
-    'keyrings': [
-      {
-        'type': 'HD Key Tree',
-        'accounts': [
-          'fdea65c8e26263f6d9a1b5de9555d2931a33b825',
-          'c5b8dbac4c1d3f152cdeb400e2313f309c410acb',
-          '2f8d4a878cfa04a6e60d46362f5644deab66572d',
-        ],
-      },
-      {
-        'type': 'Simple Key Pair',
-        'accounts': [
-          '0xd85a4b6a394794842887b8284293d69163007bbb',
-        ],
-      },
-    ],
-    'selectedAddress': '0xd85a4b6a394794842887b8284293d69163007bbb',
-    'provider': {
-      'type': 'testnet',
-    },
-    'shapeShiftTxList': [
-      { id: 'shapeShiftTx1', 'time': 1675000000000 },
-      { id: 'shapeShiftTx2', 'time': 1575000000000 },
-      { id: 'shapeShiftTx3', 'time': 1475000000000 },
-    ],
-    'lostAccounts': [],
-    'send': {
-      'gasLimit': '0xFFFF',
-      'gasPrice': '0xaa',
-      'gasTotal': '0xb451dc41b578',
-      'tokenBalance': 3434,
-      'from': {
-        'address': '0xabcdefg',
-        'balance': '0x5f4e3d2c1',
-      },
-      'to': '0x987fedabc',
-      'amount': '0x080',
-      'memo': '',
-      'errors': {
-        'someError': null,
-      },
-      'maxModeOn': false,
-      'editingTransactionId': 97531,
-      'forceGasMin': true,
-    },
-    'unapprovedTxs': {
-      '4768706228115573': {
-        'id': 4768706228115573,
-        'time': 1487363153561,
-        'status': 'unapproved',
-        'gasMultiplier': 1,
-        'metamaskNetworkId': '3',
-        'txParams': {
-          'from': '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb',
-          'to': '0x18a3462427bcc9133bb46e88bcbe39cd7ef0e761',
-          'value': '0xde0b6b3a7640000',
-          'metamaskId': 4768706228115573,
-          'metamaskNetworkId': '3',
-          'gas': '0x5209',
-        },
-        'gasLimitSpecified': false,
-        'estimatedGas': '0x5209',
-        'txFee': '17e0186e60800',
-        'txValue': 'de0b6b3a7640000',
-        'maxCost': 'de234b52e4a0800',
-        'gasPrice': '4a817c800',
-      },
-    },
-    'currentLocale': 'en',
-    recentBlocks: ['mockBlock1', 'mockBlock2', 'mockBlock3'],
-  },
-  'appState': {
-    'menuOpen': false,
-    'currentView': {
-      'name': 'accountDetail',
-      'detailView': null,
-      'context': '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-    },
-    'accountDetail': {
-      'subview': 'transactions',
-    },
-    'modal': {
-      'modalState': {},
-      'previousModalState': {},
-    },
-    'transForward': true,
-    'isLoading': false,
-    'warning': null,
-    'scrollToBottom': false,
-    'forgottenPassword': null,
-  },
-  'identities': {},
-  'send': {
-    'fromDropdownOpen': false,
-    'toDropdownOpen': false,
-    'errors': { 'someError': null },
-  },
-}
diff --git a/ui/app/components/send/tests/send-selectors.test.js b/ui/app/components/send/tests/send-selectors.test.js
deleted file mode 100644
index 1a47cd209..000000000
--- a/ui/app/components/send/tests/send-selectors.test.js
+++ /dev/null
@@ -1,695 +0,0 @@
-import assert from 'assert'
-import sinon from 'sinon'
-import selectors from '../send.selectors.js'
-const {
-  accountsWithSendEtherInfoSelector,
-  // autoAddToBetaUI,
-  getAddressBook,
-  getBlockGasLimit,
-  getAmountConversionRate,
-  getConversionRate,
-  getCurrentAccountWithSendEtherInfo,
-  getCurrentCurrency,
-  getCurrentNetwork,
-  getCurrentViewContext,
-  getForceGasMin,
-  getGasLimit,
-  getGasPrice,
-  getGasTotal,
-  getPrimaryCurrency,
-  getRecentBlocks,
-  getSelectedAccount,
-  getSelectedAddress,
-  getSelectedIdentity,
-  getSelectedToken,
-  getSelectedTokenContract,
-  getSelectedTokenExchangeRate,
-  getSelectedTokenToFiatRate,
-  getSendAmount,
-  getSendEditingTransactionId,
-  getSendErrors,
-  getSendFrom,
-  getSendFromBalance,
-  getSendFromObject,
-  getSendHexDataFeatureFlagState,
-  getSendMaxModeState,
-  getSendTo,
-  getSendToAccounts,
-  getTokenBalance,
-  getTokenExchangeRate,
-  getUnapprovedTxs,
-  transactionsSelector,
-} = selectors
-import mockState from './send-selectors-test-data'
-
-describe('send selectors', () => {
-  const tempGlobalEth = Object.assign({}, global.eth)
-  beforeEach(() => {
-    global.eth = {
-      contract: sinon.stub().returns({
-        at: address => 'mockAt:' + address,
-      }),
-    }
-  })
-
-  afterEach(() => {
-    global.eth = tempGlobalEth
-  })
-
-  describe('accountsWithSendEtherInfoSelector()', () => {
-    it('should return an array of account objects with name info from identities', () => {
-      assert.deepEqual(
-        accountsWithSendEtherInfoSelector(mockState),
-        [
-          {
-            code: '0x',
-            balance: '0x47c9d71831c76efe',
-            nonce: '0x1b',
-            address: '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825',
-            name: 'Send Account 1',
-          },
-          {
-            code: '0x',
-            balance: '0x37452b1315889f80',
-            nonce: '0xa',
-            address: '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb',
-            name: 'Send Account 2',
-          },
-          {
-            code: '0x',
-            balance: '0x30c9d71831c76efe',
-            nonce: '0x1c',
-            address: '0x2f8d4a878cfa04a6e60d46362f5644deab66572d',
-            name: 'Send Account 3',
-          },
-          {
-            code: '0x',
-            balance: '0x0',
-            nonce: '0x0',
-            address: '0xd85a4b6a394794842887b8284293d69163007bbb',
-            name: 'Send Account 4',
-          },
-        ]
-      )
-    })
-  })
-
-  // describe('autoAddToBetaUI()', () => {
-  //   it('should', () => {
-  //     assert.deepEqual(
-  //       autoAddToBetaUI(mockState),
-
-  //     )
-  //   })
-  // })
-
-  describe('getAddressBook()', () => {
-    it('should return the address book', () => {
-      assert.deepEqual(
-        getAddressBook(mockState),
-        [
-          {
-            address: '0x06195827297c7a80a443b6894d3bdb8824b43896',
-            name: 'Address Book Account 1',
-          },
-        ],
-      )
-    })
-  })
-
-  describe('getAmountConversionRate()', () => {
-    it('should return the token conversion rate if a token is selected', () => {
-      assert.equal(
-        getAmountConversionRate(mockState),
-        2401.76400654
-      )
-    })
-
-    it('should return the eth conversion rate if no token is selected', () => {
-      const editedMockState = {
-        metamask: Object.assign({}, mockState.metamask, { selectedTokenAddress: null }),
-      }
-      assert.equal(
-        getAmountConversionRate(editedMockState),
-        1200.88200327
-      )
-    })
-  })
-
-  describe('getBlockGasLimit', () => {
-    it('should return the current block gas limit', () => {
-      assert.deepEqual(
-        getBlockGasLimit(mockState),
-        '0x4c1878'
-      )
-    })
-  })
-
-  describe('getConversionRate()', () => {
-    it('should return the eth conversion rate', () => {
-      assert.deepEqual(
-        getConversionRate(mockState),
-        1200.88200327
-      )
-    })
-  })
-
-  describe('getCurrentAccountWithSendEtherInfo()', () => {
-    it('should return the currently selected account with identity info', () => {
-      assert.deepEqual(
-        getCurrentAccountWithSendEtherInfo(mockState),
-        {
-          code: '0x',
-          balance: '0x0',
-          nonce: '0x0',
-          address: '0xd85a4b6a394794842887b8284293d69163007bbb',
-          name: 'Send Account 4',
-        }
-      )
-    })
-  })
-
-  describe('getCurrentCurrency()', () => {
-    it('should return the currently selected currency', () => {
-      assert.equal(
-        getCurrentCurrency(mockState),
-        'USD'
-      )
-    })
-  })
-
-  describe('getCurrentNetwork()', () => {
-    it('should return the id of the currently selected network', () => {
-      assert.equal(
-        getCurrentNetwork(mockState),
-        '3'
-      )
-    })
-  })
-
-  describe('getCurrentViewContext()', () => {
-    it('should return the context of the current view', () => {
-      assert.equal(
-        getCurrentViewContext(mockState),
-        '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'
-      )
-    })
-  })
-
-  describe('getForceGasMin()', () => {
-    it('should get the send.forceGasMin property', () => {
-      assert.equal(
-        getForceGasMin(mockState),
-        true
-      )
-    })
-  })
-
-  describe('getGasLimit()', () => {
-    it('should return the send.gasLimit', () => {
-      assert.equal(
-        getGasLimit(mockState),
-        '0xFFFF'
-      )
-    })
-  })
-
-  describe('getGasPrice()', () => {
-    it('should return the send.gasPrice', () => {
-      assert.equal(
-        getGasPrice(mockState),
-        '0xaa'
-      )
-    })
-  })
-
-  describe('getGasTotal()', () => {
-    it('should return the send.gasTotal', () => {
-      assert.equal(
-        getGasTotal(mockState),
-        '0xb451dc41b578'
-      )
-    })
-  })
-
-  describe('getPrimaryCurrency()', () => {
-    it('should return the symbol of the selected token', () => {
-      assert.equal(
-        getPrimaryCurrency(mockState),
-        'DEF'
-      )
-    })
-  })
-
-  describe('getRecentBlocks()', () => {
-    it('should return the recent blocks', () => {
-      assert.deepEqual(
-        getRecentBlocks(mockState),
-        ['mockBlock1', 'mockBlock2', 'mockBlock3']
-      )
-    })
-  })
-
-  describe('getSelectedAccount()', () => {
-    it('should return the currently selected account', () => {
-      assert.deepEqual(
-        getSelectedAccount(mockState),
-        {
-          code: '0x',
-          balance: '0x0',
-          nonce: '0x0',
-          address: '0xd85a4b6a394794842887b8284293d69163007bbb',
-        }
-      )
-    })
-  })
-
-  describe('getSelectedAddress()', () => {
-    it('should', () => {
-      assert.equal(
-        getSelectedAddress(mockState),
-        '0xd85a4b6a394794842887b8284293d69163007bbb'
-      )
-    })
-  })
-
-  describe('getSelectedIdentity()', () => {
-    it('should return the identity object of the currently selected address', () => {
-      assert.deepEqual(
-        getSelectedIdentity(mockState),
-        {
-          address: '0xd85a4b6a394794842887b8284293d69163007bbb',
-          name: 'Send Account 4',
-        }
-      )
-    })
-  })
-
-  describe('getSelectedToken()', () => {
-    it('should return the currently selected token if selected', () => {
-      assert.deepEqual(
-        getSelectedToken(mockState),
-        {
-          address: '0x8d6b81208414189a58339873ab429b6c47ab92d3',
-          decimals: 4,
-          symbol: 'DEF',
-        }
-      )
-    })
-
-    it('should return the send token if none is currently selected, but a send token exists', () => {
-      const mockSendToken = {
-        address: '0x123456708414189a58339873ab429b6c47ab92d3',
-        decimals: 4,
-        symbol: 'JKL',
-      }
-      const editedMockState = {
-        metamask: Object.assign({}, mockState.metamask, {
-          selectedTokenAddress: null,
-          send: {
-            token: mockSendToken,
-          },
-        }),
-      }
-      assert.deepEqual(
-        getSelectedToken(editedMockState),
-        Object.assign({}, mockSendToken)
-      )
-    })
-  })
-
-  describe('getSelectedTokenContract()', () => {
-    it('should return the contract at the selected token address', () => {
-      assert.equal(
-        getSelectedTokenContract(mockState),
-        'mockAt:0x8d6b81208414189a58339873ab429b6c47ab92d3'
-      )
-    })
-
-    it('should return null if no token is selected', () => {
-      const modifiedMetamaskState = Object.assign({}, mockState.metamask, { selectedTokenAddress: false })
-      assert.equal(
-        getSelectedTokenContract(Object.assign({}, mockState, { metamask: modifiedMetamaskState })),
-        null
-      )
-    })
-  })
-
-  describe('getSelectedTokenExchangeRate()', () => {
-    it('should return the exchange rate for the selected token', () => {
-      assert.equal(
-        getSelectedTokenExchangeRate(mockState),
-        2.0
-      )
-    })
-  })
-
-  describe('getSelectedTokenToFiatRate()', () => {
-    it('should return rate for converting the selected token to fiat', () => {
-      assert.equal(
-        getSelectedTokenToFiatRate(mockState),
-        2401.76400654
-      )
-    })
-  })
-
-  describe('getSendAmount()', () => {
-    it('should return the send.amount', () => {
-      assert.equal(
-        getSendAmount(mockState),
-        '0x080'
-      )
-    })
-  })
-
-  describe('getSendEditingTransactionId()', () => {
-    it('should return the send.editingTransactionId', () => {
-      assert.equal(
-        getSendEditingTransactionId(mockState),
-        97531
-      )
-    })
-  })
-
-  describe('getSendErrors()', () => {
-    it('should return the send.errors', () => {
-      assert.deepEqual(
-        getSendErrors(mockState),
-        { someError: null }
-      )
-    })
-  })
-
-  describe('getSendHexDataFeatureFlagState()', () => {
-    it('should return the sendHexData feature flag state', () => {
-      assert.deepEqual(
-        getSendHexDataFeatureFlagState(mockState),
-        true
-      )
-    })
-  })
-
-  describe('getSendFrom()', () => {
-    it('should return the send.from', () => {
-      assert.deepEqual(
-        getSendFrom(mockState),
-        {
-          address: '0xabcdefg',
-          balance: '0x5f4e3d2c1',
-        }
-      )
-    })
-  })
-
-  describe('getSendFromBalance()', () => {
-    it('should get the send.from balance if it exists', () => {
-      assert.equal(
-        getSendFromBalance(mockState),
-        '0x5f4e3d2c1'
-      )
-    })
-
-    it('should get the selected account balance if the send.from does not exist', () => {
-      const editedMockState = {
-        metamask: Object.assign({}, mockState.metamask, {
-          send: {
-            from: null,
-          },
-        }),
-      }
-      assert.equal(
-        getSendFromBalance(editedMockState),
-        '0x0'
-      )
-    })
-  })
-
-  describe('getSendFromObject()', () => {
-    it('should return send.from if it exists', () => {
-      assert.deepEqual(
-        getSendFromObject(mockState),
-        {
-          address: '0xabcdefg',
-          balance: '0x5f4e3d2c1',
-        }
-      )
-    })
-
-    it('should return the current account with send ether info if send.from does not exist', () => {
-      const editedMockState = {
-        metamask: Object.assign({}, mockState.metamask, {
-          send: {
-            from: null,
-          },
-        }),
-      }
-      assert.deepEqual(
-        getSendFromObject(editedMockState),
-        {
-          code: '0x',
-          balance: '0x0',
-          nonce: '0x0',
-          address: '0xd85a4b6a394794842887b8284293d69163007bbb',
-          name: 'Send Account 4',
-        }
-      )
-    })
-  })
-
-  describe('getSendMaxModeState()', () => {
-    it('should return send.maxModeOn', () => {
-      assert.equal(
-        getSendMaxModeState(mockState),
-        false
-      )
-    })
-  })
-
-  describe('getSendTo()', () => {
-    it('should return send.to', () => {
-      assert.equal(
-        getSendTo(mockState),
-        '0x987fedabc'
-      )
-    })
-  })
-
-  describe('getSendToAccounts()', () => {
-    it('should return an array including all the users accounts and the address book', () => {
-      assert.deepEqual(
-        getSendToAccounts(mockState),
-        [
-          {
-            code: '0x',
-            balance: '0x47c9d71831c76efe',
-            nonce: '0x1b',
-            address: '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825',
-            name: 'Send Account 1',
-          },
-          {
-            code: '0x',
-            balance: '0x37452b1315889f80',
-            nonce: '0xa',
-            address: '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb',
-            name: 'Send Account 2',
-          },
-          {
-            code: '0x',
-            balance: '0x30c9d71831c76efe',
-            nonce: '0x1c',
-            address: '0x2f8d4a878cfa04a6e60d46362f5644deab66572d',
-            name: 'Send Account 3',
-          },
-          {
-            code: '0x',
-            balance: '0x0',
-            nonce: '0x0',
-            address: '0xd85a4b6a394794842887b8284293d69163007bbb',
-            name: 'Send Account 4',
-          },
-          {
-            address: '0x06195827297c7a80a443b6894d3bdb8824b43896',
-            name: 'Address Book Account 1',
-          },
-        ]
-      )
-    })
-  })
-
-  describe('getTokenBalance()', () => {
-    it('should', () => {
-      assert.equal(
-        getTokenBalance(mockState),
-        3434
-      )
-    })
-  })
-
-  describe('getTokenExchangeRate()', () => {
-    it('should return the passed tokens exchange rates', () => {
-      assert.equal(
-        getTokenExchangeRate(mockState, 'GHI'),
-        31.01
-      )
-    })
-  })
-
-  describe('getUnapprovedTxs()', () => {
-    it('should return the unapproved txs', () => {
-      assert.deepEqual(
-        getUnapprovedTxs(mockState),
-        {
-          4768706228115573: {
-            id: 4768706228115573,
-            time: 1487363153561,
-            status: 'unapproved',
-            gasMultiplier: 1,
-            metamaskNetworkId: '3',
-            txParams: {
-              from: '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb',
-              to: '0x18a3462427bcc9133bb46e88bcbe39cd7ef0e761',
-              value: '0xde0b6b3a7640000',
-              metamaskId: 4768706228115573,
-              metamaskNetworkId: '3',
-              gas: '0x5209',
-            },
-            gasLimitSpecified: false,
-            estimatedGas: '0x5209',
-            txFee: '17e0186e60800',
-            txValue: 'de0b6b3a7640000',
-            maxCost: 'de234b52e4a0800',
-            gasPrice: '4a817c800',
-          },
-        }
-      )
-    })
-  })
-
-  describe('transactionsSelector()', () => {
-    it('should return the selected addresses selected token transactions', () => {
-      assert.deepEqual(
-        transactionsSelector(mockState),
-        [
-          {
-            id: 'mockTokenTx1',
-            txParams: {
-              to: '0x8d6b81208414189a58339873ab429b6c47ab92d3',
-            },
-            time: 1700000000000,
-          },
-          {
-            id: 'mockTokenTx3',
-            txParams: {
-              to: '0x8d6b81208414189a58339873ab429b6c47ab92d3',
-            },
-            time: 1500000000000,
-          },
-        ]
-      )
-    })
-
-    it('should return all transactions if no token is selected', () => {
-      const modifiedMetamaskState = Object.assign({}, mockState.metamask, { selectedTokenAddress: false })
-      const modifiedState = Object.assign({}, mockState, { metamask: modifiedMetamaskState })
-      assert.deepEqual(
-        transactionsSelector(modifiedState),
-        [
-          {
-            id: 'mockTokenTx1',
-            time: 1700000000000,
-            txParams: {
-              to: '0x8d6b81208414189a58339873ab429b6c47ab92d3',
-            },
-          },
-          {
-            id: 'unapprovedMessage1',
-            time: 1650000000000,
-          },
-          {
-            id: 'mockTokenTx2',
-            time: 1600000000000,
-            txParams: {
-              to: '0xafaketokenaddress',
-            },
-          },
-          {
-            id: 'unapprovedMessage2',
-            time: 1550000000000,
-          },
-          {
-            id: 'mockTokenTx3',
-            time: 1500000000000,
-            txParams: {
-              to: '0x8d6b81208414189a58339873ab429b6c47ab92d3',
-            },
-          },
-          {
-            id: 'unapprovedMessage3',
-            time: 1450000000000,
-          },
-          {
-            id: 'mockEthTx1',
-            time: 1400000000000,
-            txParams: {
-              to: '0xd85a4b6a394794842887b8284293d69163007bbb',
-            },
-          },
-        ]
-      )
-    })
-
-    it('should return shapeshift transactions if current network is 1', () => {
-      const modifiedMetamaskState = Object.assign({}, mockState.metamask, { selectedTokenAddress: false, network: '1' })
-      const modifiedState = Object.assign({}, mockState, { metamask: modifiedMetamaskState })
-      assert.deepEqual(
-        transactionsSelector(modifiedState),
-        [
-          {
-            id: 'mockTokenTx1',
-            time: 1700000000000,
-            txParams: {
-              to: '0x8d6b81208414189a58339873ab429b6c47ab92d3',
-            },
-          },
-          { id: 'shapeShiftTx1', 'time': 1675000000000 },
-          {
-            id: 'unapprovedMessage1',
-            time: 1650000000000,
-          },
-          {
-            id: 'mockTokenTx2',
-            time: 1600000000000,
-            txParams: {
-              to: '0xafaketokenaddress',
-            },
-          },
-          { id: 'shapeShiftTx2', 'time': 1575000000000 },
-          {
-            id: 'unapprovedMessage2',
-            time: 1550000000000,
-          },
-          {
-            id: 'mockTokenTx3',
-            time: 1500000000000,
-            txParams: {
-              to: '0x8d6b81208414189a58339873ab429b6c47ab92d3',
-            },
-          },
-          { id: 'shapeShiftTx3', 'time': 1475000000000 },
-          {
-            id: 'unapprovedMessage3',
-            time: 1450000000000,
-          },
-          {
-            id: 'mockEthTx1',
-            time: 1400000000000,
-            txParams: {
-              to: '0xd85a4b6a394794842887b8284293d69163007bbb',
-            },
-          },
-        ]
-      )
-    })
-  })
-
-})
diff --git a/ui/app/components/send/tests/send-utils.test.js b/ui/app/components/send/tests/send-utils.test.js
deleted file mode 100644
index b72d87eee..000000000
--- a/ui/app/components/send/tests/send-utils.test.js
+++ /dev/null
@@ -1,527 +0,0 @@
-import assert from 'assert'
-import sinon from 'sinon'
-import proxyquire from 'proxyquire'
-import {
-  BASE_TOKEN_GAS_COST,
-  ONE_GWEI_IN_WEI_HEX,
-  SIMPLE_GAS_COST,
-} from '../send.constants'
-const {
-  addCurrencies,
-  subtractCurrencies,
-} = require('../../../conversion-util')
-
-const {
-  INSUFFICIENT_FUNDS_ERROR,
-  INSUFFICIENT_TOKENS_ERROR,
-} = require('../send.constants')
-
-const stubs = {
-  addCurrencies: sinon.stub().callsFake((a, b, obj) => {
-    if (String(a).match(/^0x.+/)) a = Number(String(a).slice(2))
-    if (String(b).match(/^0x.+/)) b = Number(String(b).slice(2))
-    return a + b
-  }),
-  conversionUtil: sinon.stub().callsFake((val, obj) => parseInt(val, 16)),
-  conversionGTE: sinon.stub().callsFake((obj1, obj2) => obj1.value >= obj2.value),
-  multiplyCurrencies: sinon.stub().callsFake((a, b) => `${a}x${b}`),
-  calcTokenAmount: sinon.stub().callsFake((a, d) => 'calc:' + a + d),
-  rawEncode: sinon.stub().returns([16, 1100]),
-  conversionGreaterThan: sinon.stub().callsFake((obj1, obj2) => obj1.value > obj2.value),
-  conversionLessThan: sinon.stub().callsFake((obj1, obj2) => obj1.value < obj2.value),
-}
-
-const sendUtils = proxyquire('../send.utils.js', {
-  '../../conversion-util': {
-    addCurrencies: stubs.addCurrencies,
-    conversionUtil: stubs.conversionUtil,
-    conversionGTE: stubs.conversionGTE,
-    multiplyCurrencies: stubs.multiplyCurrencies,
-    conversionGreaterThan: stubs.conversionGreaterThan,
-    conversionLessThan: stubs.conversionLessThan,
-  },
-  '../../token-util': { calcTokenAmount: stubs.calcTokenAmount },
-  'ethereumjs-abi': {
-    rawEncode: stubs.rawEncode,
-  },
-})
-
-const {
-  calcGasTotal,
-  estimateGas,
-  doesAmountErrorRequireUpdate,
-  estimateGasPriceFromRecentBlocks,
-  generateTokenTransferData,
-  getAmountErrorObject,
-  getGasFeeErrorObject,
-  getToAddressForGasUpdate,
-  calcTokenBalance,
-  isBalanceSufficient,
-  isTokenBalanceSufficient,
-  removeLeadingZeroes,
-} = sendUtils
-
-describe('send utils', () => {
-
-  describe('calcGasTotal()', () => {
-    it('should call multiplyCurrencies with the correct params and return the multiplyCurrencies return', () => {
-      const result = calcGasTotal(12, 15)
-      assert.equal(result, '12x15')
-      const call_ = stubs.multiplyCurrencies.getCall(0).args
-      assert.deepEqual(
-        call_,
-        [12, 15, {
-          toNumericBase: 'hex',
-           multiplicandBase: 16,
-           multiplierBase: 16,
-         } ]
-      )
-    })
-  })
-
-  describe('doesAmountErrorRequireUpdate()', () => {
-    const config = {
-      'should return true if balances are different': {
-        balance: 0,
-        prevBalance: 1,
-        expectedResult: true,
-      },
-      'should return true if gasTotals are different': {
-        gasTotal: 0,
-        prevGasTotal: 1,
-        expectedResult: true,
-      },
-      'should return true if token balances are different': {
-        tokenBalance: 0,
-        prevTokenBalance: 1,
-        selectedToken: 'someToken',
-        expectedResult: true,
-      },
-      'should return false if they are all the same': {
-        balance: 1,
-        prevBalance: 1,
-        gasTotal: 1,
-        prevGasTotal: 1,
-        tokenBalance: 1,
-        prevTokenBalance: 1,
-        selectedToken: 'someToken',
-        expectedResult: false,
-      },
-    }
-    Object.entries(config).map(([description, obj]) => {
-      it(description, () => {
-        assert.equal(doesAmountErrorRequireUpdate(obj), obj.expectedResult)
-      })
-    })
-
-  })
-
-  describe('generateTokenTransferData()', () => {
-    it('should return undefined if not passed a selected token', () => {
-      assert.equal(generateTokenTransferData({ toAddress: 'mockAddress', amount: '0xa', selectedToken: false}), undefined)
-    })
-
-    it('should call abi.rawEncode with the correct params', () => {
-      stubs.rawEncode.resetHistory()
-      generateTokenTransferData({ toAddress: 'mockAddress', amount: 'ab', selectedToken: true})
-      assert.deepEqual(
-        stubs.rawEncode.getCall(0).args,
-        [['address', 'uint256'], ['mockAddress', '0xab']]
-      )
-    })
-
-    it('should return encoded token transfer data', () => {
-      assert.equal(
-        generateTokenTransferData({ toAddress: 'mockAddress', amount: '0xa', selectedToken: true}),
-        '0xa9059cbb104c'
-      )
-    })
-  })
-
-  describe('getAmountErrorObject()', () => {
-    const config = {
-      'should return insufficientFunds error if isBalanceSufficient returns false': {
-        amount: 15,
-        amountConversionRate: 2,
-        balance: 1,
-        conversionRate: 3,
-        gasTotal: 17,
-        primaryCurrency: 'ABC',
-        expectedResult: { amount: INSUFFICIENT_FUNDS_ERROR },
-      },
-      'should not return insufficientFunds error if selectedToken is truthy': {
-        amount: '0x0',
-        amountConversionRate: 2,
-        balance: 1,
-        conversionRate: 3,
-        gasTotal: 17,
-        primaryCurrency: 'ABC',
-        selectedToken: { symbole: 'DEF', decimals: 0 },
-        decimals: 0,
-        tokenBalance: 'sometokenbalance',
-        expectedResult: { amount: null },
-      },
-      'should return insufficientTokens error if token is selected and isTokenBalanceSufficient returns false': {
-        amount: '0x10',
-        amountConversionRate: 2,
-        balance: 100,
-        conversionRate: 3,
-        decimals: 10,
-        gasTotal: 17,
-        primaryCurrency: 'ABC',
-        selectedToken: 'someToken',
-        tokenBalance: 123,
-        expectedResult: { amount: INSUFFICIENT_TOKENS_ERROR },
-      },
-    }
-    Object.entries(config).map(([description, obj]) => {
-      it(description, () => {
-        assert.deepEqual(getAmountErrorObject(obj), obj.expectedResult)
-      })
-    })
-  })
-
-  describe('getGasFeeErrorObject()', () => {
-    const config = {
-      'should return insufficientFunds error if isBalanceSufficient returns false': {
-        amountConversionRate: 2,
-        balance: 16,
-        conversionRate: 3,
-        gasTotal: 17,
-        primaryCurrency: 'ABC',
-        expectedResult: { gasFee: INSUFFICIENT_FUNDS_ERROR },
-      },
-      'should return null error if isBalanceSufficient returns true': {
-        amountConversionRate: 2,
-        balance: 16,
-        conversionRate: 3,
-        gasTotal: 15,
-        primaryCurrency: 'ABC',
-        expectedResult: { gasFee: null },
-      },
-    }
-    Object.entries(config).map(([description, obj]) => {
-      it(description, () => {
-        assert.deepEqual(getGasFeeErrorObject(obj), obj.expectedResult)
-      })
-    })
-  })
-
-  describe('calcTokenBalance()', () => {
-    it('should return the calculated token blance', () => {
-      assert.equal(calcTokenBalance({
-        selectedToken: {
-          decimals: 11,
-        },
-        usersToken: {
-          balance: 20,
-        },
-      }), 'calc:2011')
-    })
-  })
-
-  describe('isBalanceSufficient()', () => {
-    it('should correctly call addCurrencies and return the result of calling conversionGTE', () => {
-      stubs.conversionGTE.resetHistory()
-      const result = isBalanceSufficient({
-        amount: 15,
-        amountConversionRate: 2,
-        balance: 100,
-        conversionRate: 3,
-        gasTotal: 17,
-        primaryCurrency: 'ABC',
-      })
-      assert.deepEqual(
-        stubs.addCurrencies.getCall(0).args,
-        [
-          15, 17, {
-            aBase: 16,
-            bBase: 16,
-            toNumericBase: 'hex',
-          },
-        ]
-      )
-      assert.deepEqual(
-        stubs.conversionGTE.getCall(0).args,
-        [
-          {
-            value: 100,
-            fromNumericBase: 'hex',
-            fromCurrency: 'ABC',
-            conversionRate: 3,
-          },
-          {
-            value: 32,
-            fromNumericBase: 'hex',
-            conversionRate: 2,
-            fromCurrency: 'ABC',
-          },
-        ]
-      )
-
-      assert.equal(result, true)
-    })
-  })
-
-  describe('isTokenBalanceSufficient()', () => {
-    it('should correctly call conversionUtil and return the result of calling conversionGTE', () => {
-      stubs.conversionGTE.resetHistory()
-      stubs.conversionUtil.resetHistory()
-      const result = isTokenBalanceSufficient({
-        amount: '0x10',
-        tokenBalance: 123,
-        decimals: 10,
-      })
-      assert.deepEqual(
-        stubs.conversionUtil.getCall(0).args,
-        [
-          '0x10', {
-            fromNumericBase: 'hex',
-          },
-        ]
-      )
-      assert.deepEqual(
-        stubs.conversionGTE.getCall(0).args,
-        [
-          {
-            value: 123,
-            fromNumericBase: 'dec',
-          },
-          {
-            value: 'calc:1610',
-            fromNumericBase: 'dec',
-          },
-        ]
-      )
-
-      assert.equal(result, false)
-    })
-  })
-
-  describe('estimateGas', () => {
-    const baseMockParams = {
-      blockGasLimit: '0x64',
-      selectedAddress: 'mockAddress',
-      to: '0xisContract',
-      estimateGasMethod: sinon.stub().callsFake(
-        ({to}, cb) => {
-          const err = typeof to === 'string' && to.match(/willFailBecauseOf:/)
-            ? new Error(to.match(/:(.+)$/)[1])
-            : null
-          const result = { toString: (n) => `0xabc${n}` }
-          return cb(err, result)
-        }
-      ),
-    }
-    const baseExpectedCall = {
-      from: 'mockAddress',
-      gas: '0x64x0.95',
-      to: '0xisContract',
-    }
-
-    beforeEach(() => {
-      global.eth = {
-        getCode: sinon.stub().callsFake(
-          (address) => Promise.resolve(address.match(/isContract/) ? 'not-0x' : '0x')
-        ),
-      }
-    })
-
-    afterEach(() => {
-      baseMockParams.estimateGasMethod.resetHistory()
-      global.eth.getCode.resetHistory()
-    })
-
-    it('should call ethQuery.estimateGas with the expected params', async () => {
-      const result = await sendUtils.estimateGas(baseMockParams)
-      assert.equal(baseMockParams.estimateGasMethod.callCount, 1)
-      assert.deepEqual(
-        baseMockParams.estimateGasMethod.getCall(0).args[0],
-        Object.assign({ gasPrice: undefined, value: undefined }, baseExpectedCall)
-      )
-      assert.equal(result, '0xabc16')
-    })
-
-    it('should call ethQuery.estimateGas with the expected params when initialGasLimitHex is lower than the upperGasLimit', async () => {
-      const result = await estimateGas(Object.assign({}, baseMockParams, { blockGasLimit: '0xbcd' }))
-      assert.equal(baseMockParams.estimateGasMethod.callCount, 1)
-      assert.deepEqual(
-        baseMockParams.estimateGasMethod.getCall(0).args[0],
-        Object.assign({ gasPrice: undefined, value: undefined }, baseExpectedCall, { gas: '0xbcdx0.95' })
-      )
-      assert.equal(result, '0xabc16x1.5')
-    })
-
-    it('should call ethQuery.estimateGas with a value of 0x0 and the expected data and to if passed a selectedToken', async () => {
-      const result = await estimateGas(Object.assign({ data: 'mockData', selectedToken: { address: 'mockAddress' } }, baseMockParams))
-      assert.equal(baseMockParams.estimateGasMethod.callCount, 1)
-      assert.deepEqual(
-        baseMockParams.estimateGasMethod.getCall(0).args[0],
-        Object.assign({}, baseExpectedCall, {
-          gasPrice: undefined,
-          value: '0x0',
-          data: '0xa9059cbb104c',
-          to: 'mockAddress',
-        })
-      )
-      assert.equal(result, '0xabc16')
-    })
-
-    it('should call ethQuery.estimateGas without a recipient if the recipient is empty and data passed', async () => {
-      const data = 'mockData'
-      const to = ''
-      const result = await estimateGas({...baseMockParams, data, to})
-      assert.equal(baseMockParams.estimateGasMethod.callCount, 1)
-      assert.deepEqual(
-        baseMockParams.estimateGasMethod.getCall(0).args[0],
-        { gasPrice: undefined, value: undefined, data, from: baseExpectedCall.from, gas: baseExpectedCall.gas},
-      )
-      assert.equal(result, '0xabc16')
-    })
-
-    it(`should return ${SIMPLE_GAS_COST} if ethQuery.getCode does not return '0x'`, async () => {
-      assert.equal(baseMockParams.estimateGasMethod.callCount, 0)
-      const result = await estimateGas(Object.assign({}, baseMockParams, { to: '0x123' }))
-      assert.equal(result, SIMPLE_GAS_COST)
-    })
-
-    it(`should return ${SIMPLE_GAS_COST} if not passed a selectedToken or truthy to address`, async () => {
-      assert.equal(baseMockParams.estimateGasMethod.callCount, 0)
-      const result = await estimateGas(Object.assign({}, baseMockParams, { to: null }))
-      assert.equal(result, SIMPLE_GAS_COST)
-    })
-
-    it(`should not return ${SIMPLE_GAS_COST} if passed a selectedToken`, async () => {
-      assert.equal(baseMockParams.estimateGasMethod.callCount, 0)
-      const result = await estimateGas(Object.assign({}, baseMockParams, { to: '0x123', selectedToken: { address: '' } }))
-      assert.notEqual(result, SIMPLE_GAS_COST)
-    })
-
-    it(`should return ${BASE_TOKEN_GAS_COST} if passed a selectedToken but no to address`, async () => {
-      const result = await estimateGas(Object.assign({}, baseMockParams, { to: null, selectedToken: { address: '' } }))
-      assert.equal(result, BASE_TOKEN_GAS_COST)
-    })
-
-    it(`should return the adjusted blockGasLimit if it fails with a 'Transaction execution error.'`, async () => {
-      const result = await estimateGas(Object.assign({}, baseMockParams, {
-        to: 'isContract willFailBecauseOf:Transaction execution error.',
-      }))
-      assert.equal(result, '0x64x0.95')
-    })
-
-    it(`should return the adjusted blockGasLimit if it fails with a 'gas required exceeds allowance or always failing transaction.'`, async () => {
-      const result = await estimateGas(Object.assign({}, baseMockParams, {
-        to: 'isContract willFailBecauseOf:gas required exceeds allowance or always failing transaction.',
-      }))
-      assert.equal(result, '0x64x0.95')
-    })
-
-    it(`should reject other errors`, async () => {
-      try {
-        await estimateGas(Object.assign({}, baseMockParams, {
-          to: 'isContract willFailBecauseOf:some other error',
-        }))
-      } catch (err) {
-        assert.equal(err.message, 'some other error')
-      }
-    })
-  })
-
-  describe('estimateGasPriceFromRecentBlocks', () => {
-    const ONE_GWEI_IN_WEI_HEX_PLUS_ONE = addCurrencies(ONE_GWEI_IN_WEI_HEX, '0x1', {
-      aBase: 16,
-      bBase: 16,
-      toNumericBase: 'hex',
-    })
-    const ONE_GWEI_IN_WEI_HEX_PLUS_TWO = addCurrencies(ONE_GWEI_IN_WEI_HEX, '0x2', {
-      aBase: 16,
-      bBase: 16,
-      toNumericBase: 'hex',
-    })
-    const ONE_GWEI_IN_WEI_HEX_MINUS_ONE = subtractCurrencies(ONE_GWEI_IN_WEI_HEX, '0x1', {
-      aBase: 16,
-      bBase: 16,
-      toNumericBase: 'hex',
-    })
-
-    it(`should return ${ONE_GWEI_IN_WEI_HEX} if recentBlocks is falsy`, () => {
-      assert.equal(estimateGasPriceFromRecentBlocks(), ONE_GWEI_IN_WEI_HEX)
-    })
-
-    it(`should return ${ONE_GWEI_IN_WEI_HEX} if recentBlocks is empty`, () => {
-      assert.equal(estimateGasPriceFromRecentBlocks([]), ONE_GWEI_IN_WEI_HEX)
-    })
-
-    it(`should estimate a block's gasPrice as ${ONE_GWEI_IN_WEI_HEX} if it has no gas prices`, () => {
-      const mockRecentBlocks = [
-        { gasPrices: null },
-        { gasPrices: [ ONE_GWEI_IN_WEI_HEX_PLUS_ONE ] },
-        { gasPrices: [ ONE_GWEI_IN_WEI_HEX_MINUS_ONE ] },
-      ]
-      assert.equal(estimateGasPriceFromRecentBlocks(mockRecentBlocks), ONE_GWEI_IN_WEI_HEX)
-    })
-
-    it(`should estimate a block's gasPrice as ${ONE_GWEI_IN_WEI_HEX} if it has empty gas prices`, () => {
-      const mockRecentBlocks = [
-        { gasPrices: [] },
-        { gasPrices: [ ONE_GWEI_IN_WEI_HEX_PLUS_ONE ] },
-        { gasPrices: [ ONE_GWEI_IN_WEI_HEX_MINUS_ONE ] },
-      ]
-      assert.equal(estimateGasPriceFromRecentBlocks(mockRecentBlocks), ONE_GWEI_IN_WEI_HEX)
-    })
-
-    it(`should return the middle value of all blocks lowest prices`, () => {
-      const mockRecentBlocks = [
-        { gasPrices: [ ONE_GWEI_IN_WEI_HEX_PLUS_TWO ] },
-        { gasPrices: [ ONE_GWEI_IN_WEI_HEX_MINUS_ONE ] },
-        { gasPrices: [ ONE_GWEI_IN_WEI_HEX_PLUS_ONE ] },
-      ]
-      assert.equal(estimateGasPriceFromRecentBlocks(mockRecentBlocks), ONE_GWEI_IN_WEI_HEX_PLUS_ONE)
-    })
-
-    it(`should work if a block has multiple gas prices`, () => {
-      const mockRecentBlocks = [
-        { gasPrices: [ '0x1', '0x2', '0x3', '0x4', '0x5' ] },
-        { gasPrices: [ '0x101', '0x100', '0x103', '0x104', '0x102' ] },
-        { gasPrices: [ '0x150', '0x50', '0x100', '0x200', '0x5' ] },
-      ]
-      assert.equal(estimateGasPriceFromRecentBlocks(mockRecentBlocks), '0x5')
-    })
-  })
-
-  describe('getToAddressForGasUpdate()', () => {
-    it('should return empty string if all params are undefined or null', () => {
-      assert.equal(getToAddressForGasUpdate(undefined, null), '')
-    })
-
-    it('should return the first string that is not defined or null in lower case', () => {
-      assert.equal(getToAddressForGasUpdate('A', null), 'a')
-      assert.equal(getToAddressForGasUpdate(undefined, 'B'), 'b')
-    })
-  })
-
-  describe('removeLeadingZeroes()', () => {
-    it('should remove leading zeroes from int when user types', () => {
-      assert.equal(removeLeadingZeroes('0'), '0')
-      assert.equal(removeLeadingZeroes('1'), '1')
-      assert.equal(removeLeadingZeroes('00'), '0')
-      assert.equal(removeLeadingZeroes('01'), '1')
-    })
-
-    it('should remove leading zeroes from int when user copy/paste', () => {
-      assert.equal(removeLeadingZeroes('001'), '1')
-    })
-
-    it('should remove leading zeroes from float when user types', () => {
-      assert.equal(removeLeadingZeroes('0.'), '0.')
-      assert.equal(removeLeadingZeroes('0.0'), '0.0')
-      assert.equal(removeLeadingZeroes('0.00'), '0.00')
-      assert.equal(removeLeadingZeroes('0.001'), '0.001')
-      assert.equal(removeLeadingZeroes('0.10'), '0.10')
-    })
-
-    it('should remove leading zeroes from float when user copy/paste', () => {
-      assert.equal(removeLeadingZeroes('00.1'), '0.1')
-    })
-  })
-})
diff --git a/ui/app/components/send/to-autocomplete.component.js b/ui/app/components/send/to-autocomplete.component.js
deleted file mode 100644
index 9e270db75..000000000
--- a/ui/app/components/send/to-autocomplete.component.js
+++ /dev/null
@@ -1,141 +0,0 @@
-import React, {Component} from 'react'
-import PropTypes from 'prop-types'
-import classnames from 'classnames'
-import AccountListItem from '../send/account-list-item/account-list-item.component'
-
-
-export default class ToAutoComplete extends Component {
-
-  static propTypes = {
-    dropdownOpen: PropTypes.bool,
-    openDropdown: PropTypes.func,
-    closeDropdown: PropTypes.func,
-    onChange: PropTypes.func,
-    to: PropTypes.string,
-    accounts: PropTypes.array,
-    inError: PropTypes.bool,
-  }
-
-  static contextTypes = {
-    t: PropTypes.func,
-  }
-
-  state = {
-    accountsToRender: [],
-  }
-
-  getListItemIcon (listItemAddress, toAddress) {
-    return toAddress && listItemAddress === toAddress
-      ? <i className={'fa fa-check fa-lg'}
-          style={{
-            color: '#02c9b1',
-          }}
-        />
-      : null
-  }
-
-  renderDropdown () {
-    const {
-      closeDropdown,
-      onChange,
-      to,
-    } = this.props
-    const {accountsToRender} = this.state
-
-    if (!accountsToRender.length) {
-      return null
-    }
-
-    return (
-      <div>
-        <div className={'send-v2__from-dropdown__close-area'} onClick={closeDropdown} />
-        <div className={'send-v2__from-dropdown__list'}>
-          {accountsToRender.map((account, i) => (
-            <AccountListItem
-              key={i}
-              account={account}
-              className={'account-list-item__dropdown'}
-              handleClick={() => {
-                onChange(account.address)
-                closeDropdown()
-              }}
-              icon={this.getListItemIcon(account.address, to)}
-              displayBalance={false}
-              displayAddress={true}
-            />
-          ))}
-        </div>
-      </div>
-    )
-  }
-
-  handleInputEvent (event = {}, cb) {
-    const {
-      to,
-      accounts,
-      closeDropdown,
-      openDropdown,
-    } = this.props
-
-    const matchingAccounts = accounts.filter(({address}) => address.match(to || ''))
-    const matches = matchingAccounts.length
-
-    if (!matches || matchingAccounts[0].address === to) {
-      this.setState({accountsToRender: []})
-      event.target && event.target.select()
-      closeDropdown()
-    } else {
-      this.setState({accountsToRender: matchingAccounts})
-      openDropdown()
-    }
-    cb && cb(event.target.value)
-  }
-
-  componentDidUpdate (nextProps) {
-    if (this.props.to !== nextProps.to) {
-      this.handleInputEvent()
-    }
-  }
-
-  render () {
-    const {
-      to,
-      dropdownOpen,
-      onChange,
-      inError,
-    } = this.props
-
-    return (
-      <div className={'send-v2__to-autocomplete'}>
-        <input
-          className={classnames('send-v2__to-autocomplete__input', {
-            'send-v2__error-border': inError,
-          })}
-          placeholder={this.context.t('recipientAddress')}
-          value={to}
-          onChange={event => onChange(event.target.value)}
-          onFocus={event => this.handleInputEvent(event)}
-          style={{
-            borderColor: inError ? 'red' : null,
-          }}
-        />
-        {
-          to
-          ? null
-          : <i className={'fa fa-caret-down fa-lg send-v2__to-autocomplete__down-caret'}
-              onClick={() => this.handleInputEvent()}
-              style={{
-                style: {color: '#dedede'},
-              }}
-            />
-        }
-        {
-          dropdownOpen
-          ? this.renderDropdown()
-          : null
-        }
-      </div>
-    )
-  }
-
-}
diff --git a/ui/app/components/send/to-autocomplete/index.js b/ui/app/components/send/to-autocomplete/index.js
deleted file mode 100644
index 244d301d1..000000000
--- a/ui/app/components/send/to-autocomplete/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './to-autocomplete.js'
diff --git a/ui/app/components/send/to-autocomplete/to-autocomplete.js b/ui/app/components/send/to-autocomplete/to-autocomplete.js
deleted file mode 100644
index 39d15dfa7..000000000
--- a/ui/app/components/send/to-autocomplete/to-autocomplete.js
+++ /dev/null
@@ -1,129 +0,0 @@
-const Component = require('react').Component
-const PropTypes = require('prop-types')
-const h = require('react-hyperscript')
-const inherits = require('util').inherits
-const AccountListItem = require('../account-list-item/account-list-item.component').default
-const connect = require('react-redux').connect
-const Tooltip = require('../../tooltip')
-const checksumAddress = require('../../../util').checksumAddress
-
-ToAutoComplete.contextTypes = {
-  t: PropTypes.func,
-}
-
-module.exports = connect()(ToAutoComplete)
-
-
-inherits(ToAutoComplete, Component)
-function ToAutoComplete () {
-  Component.call(this)
-
-  this.state = { accountsToRender: [] }
-}
-
-ToAutoComplete.prototype.getListItemIcon = function (listItemAddress, toAddress) {
-  const listItemIcon = h(`i.fa.fa-check.fa-lg`, { style: { color: '#02c9b1' } })
-
-  return toAddress && listItemAddress === toAddress
-    ? listItemIcon
-    : null
-}
-
-ToAutoComplete.prototype.renderDropdown = function () {
-  const {
-    closeDropdown,
-    onChange,
-    to,
-  } = this.props
-  const { accountsToRender } = this.state
-
-  return accountsToRender.length && h('div', {}, [
-
-    h('div.send-v2__from-dropdown__close-area', {
-      onClick: closeDropdown,
-    }),
-
-    h('div.send-v2__from-dropdown__list', {}, [
-
-      ...accountsToRender.map(account => h(AccountListItem, {
-        account,
-        className: 'account-list-item__dropdown',
-        handleClick: () => {
-          onChange(checksumAddress(account.address))
-          closeDropdown()
-        },
-        icon: this.getListItemIcon(account.address, to),
-        displayBalance: false,
-        displayAddress: true,
-      })),
-
-    ]),
-
-  ])
-}
-
-ToAutoComplete.prototype.handleInputEvent = function (event = {}, cb) {
-  const {
-    to,
-    accounts,
-    closeDropdown,
-    openDropdown,
-  } = this.props
-
-  const matchingAccounts = accounts.filter(({ address }) => address.match(to || ''))
-  const matches = matchingAccounts.length
-
-  if (!matches || matchingAccounts[0].address === to) {
-    this.setState({ accountsToRender: [] })
-    event.target && event.target.select()
-    closeDropdown()
-  } else {
-    this.setState({ accountsToRender: matchingAccounts })
-    openDropdown()
-  }
-  cb && cb(event.target.value)
-}
-
-ToAutoComplete.prototype.componentDidUpdate = function (nextProps, nextState) {
-  if (this.props.to !== nextProps.to) {
-    this.handleInputEvent()
-  }
-}
-
-ToAutoComplete.prototype.render = function () {
-  const {
-    to,
-    dropdownOpen,
-    onChange,
-    inError,
-    qrScanner,
-  } = this.props
-
-  return h('div.send-v2__to-autocomplete', {}, [
-
-    h(`input.send-v2__to-autocomplete__input${qrScanner ? '.with-qr' : ''}`, {
-      placeholder: this.context.t('recipientAddress'),
-      className: inError ? `send-v2__error-border` : '',
-      value: to,
-      onChange: event => onChange(event.target.value),
-      onFocus: event => this.handleInputEvent(event),
-      style: {
-        borderColor: inError ? 'red' : null,
-      },
-    }),
-    qrScanner && h(Tooltip, {
-      title: this.context.t('scanQrCode'),
-      position: 'bottom',
-    }, h(`i.fa.fa-qrcode.fa-lg.send-v2__to-autocomplete__qr-code`, {
-      style: { color: '#33333' },
-      onClick: () => this.props.scanQrCode(),
-    })),
-    !to && h(`i.fa.fa-caret-down.fa-lg.send-v2__to-autocomplete__down-caret`, {
-      style: { color: '#dedede' },
-      onClick: () => this.handleInputEvent(),
-    }),
-
-    dropdownOpen && this.renderDropdown(),
-
-  ])
-}
diff --git a/ui/app/components/token-input/index.js b/ui/app/components/token-input/index.js
deleted file mode 100644
index 22c06111e..000000000
--- a/ui/app/components/token-input/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './token-input.container'
diff --git a/ui/app/components/token-input/tests/token-input.component.test.js b/ui/app/components/token-input/tests/token-input.component.test.js
deleted file mode 100644
index 2131e7705..000000000
--- a/ui/app/components/token-input/tests/token-input.component.test.js
+++ /dev/null
@@ -1,308 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import assert from 'assert'
-import { shallow, mount } from 'enzyme'
-import sinon from 'sinon'
-import { Provider } from 'react-redux'
-import configureMockStore from 'redux-mock-store'
-import TokenInput from '../token-input.component'
-import UnitInput from '../../unit-input'
-import CurrencyDisplay from '../../currency-display'
-
-describe('TokenInput Component', () => {
-  const t = key => `translate ${key}`
-
-  describe('rendering', () => {
-    it('should render properly without a token', () => {
-      const wrapper = shallow(
-        <TokenInput />,
-        { context: { t } }
-      )
-
-      assert.ok(wrapper)
-      assert.equal(wrapper.find(UnitInput).length, 1)
-    })
-
-    it('should render properly with a token', () => {
-      const mockStore = {
-        metamask: {
-          currentCurrency: 'usd',
-          conversionRate: 231.06,
-        },
-      }
-      const store = configureMockStore()(mockStore)
-
-      const wrapper = mount(
-        <Provider store={store}>
-          <TokenInput
-            selectedToken={{
-              address: '0x1',
-              decimals: '4',
-              symbol: 'ABC',
-            }}
-            suffix="ABC"
-          />
-        </Provider>,
-        { context: { t },
-          childContextTypes: {
-            t: PropTypes.func,
-          },
-        },
-      )
-
-      assert.ok(wrapper)
-      assert.equal(wrapper.find('.unit-input__suffix').length, 1)
-      assert.equal(wrapper.find('.unit-input__suffix').text(), 'ABC')
-      assert.equal(wrapper.find('.currency-input__conversion-component').length, 1)
-      assert.equal(wrapper.find('.currency-input__conversion-component').text(), 'translate noConversionRateAvailable')
-    })
-
-    it('should render properly with a token and selectedTokenExchangeRate', () => {
-      const mockStore = {
-        metamask: {
-          currentCurrency: 'usd',
-          conversionRate: 231.06,
-        },
-      }
-      const store = configureMockStore()(mockStore)
-
-      const wrapper = mount(
-        <Provider store={store}>
-          <TokenInput
-            selectedToken={{
-              address: '0x1',
-              decimals: '4',
-              symbol: 'ABC',
-            }}
-            suffix="ABC"
-            selectedTokenExchangeRate={2}
-          />
-        </Provider>,
-        { context: { t },
-          childContextTypes: {
-            t: PropTypes.func,
-          },
-        },
-      )
-
-      assert.ok(wrapper)
-      assert.equal(wrapper.find('.unit-input__suffix').length, 1)
-      assert.equal(wrapper.find('.unit-input__suffix').text(), 'ABC')
-      assert.equal(wrapper.find(CurrencyDisplay).length, 1)
-    })
-
-    it('should render properly with a token value for ETH', () => {
-      const mockStore = {
-        metamask: {
-          currentCurrency: 'usd',
-          conversionRate: 231.06,
-        },
-      }
-      const store = configureMockStore()(mockStore)
-
-      const wrapper = mount(
-        <Provider store={store}>
-          <TokenInput
-            value="2710"
-            selectedToken={{
-              address: '0x1',
-              decimals: '4',
-              symbol: 'ABC',
-            }}
-            suffix="ABC"
-            selectedTokenExchangeRate={2}
-          />
-        </Provider>
-      )
-
-      assert.ok(wrapper)
-      const tokenInputInstance = wrapper.find(TokenInput).at(0).instance()
-      assert.equal(tokenInputInstance.state.decimalValue, 1)
-      assert.equal(tokenInputInstance.state.hexValue, '2710')
-      assert.equal(wrapper.find('.unit-input__suffix').length, 1)
-      assert.equal(wrapper.find('.unit-input__suffix').text(), 'ABC')
-      assert.equal(wrapper.find('.unit-input__input').props().value, '1')
-      assert.equal(wrapper.find('.currency-display-component').text(), '2 ETH')
-    })
-
-    it('should render properly with a token value for fiat', () => {
-      const mockStore = {
-        metamask: {
-          currentCurrency: 'usd',
-          conversionRate: 231.06,
-        },
-      }
-      const store = configureMockStore()(mockStore)
-
-      const wrapper = mount(
-        <Provider store={store}>
-          <TokenInput
-            value="2710"
-            selectedToken={{
-              address: '0x1',
-              decimals: '4',
-              symbol: 'ABC',
-            }}
-            suffix="ABC"
-            selectedTokenExchangeRate={2}
-            showFiat
-          />
-        </Provider>
-      )
-
-      assert.ok(wrapper)
-      const tokenInputInstance = wrapper.find(TokenInput).at(0).instance()
-      assert.equal(tokenInputInstance.state.decimalValue, 1)
-      assert.equal(tokenInputInstance.state.hexValue, '2710')
-      assert.equal(wrapper.find('.unit-input__suffix').length, 1)
-      assert.equal(wrapper.find('.unit-input__suffix').text(), 'ABC')
-      assert.equal(wrapper.find('.unit-input__input').props().value, '1')
-      assert.equal(wrapper.find('.currency-display-component').text(), '$462.12 USD')
-    })
-  })
-
-  describe('handling actions', () => {
-    const handleChangeSpy = sinon.spy()
-    const handleBlurSpy = sinon.spy()
-
-    afterEach(() => {
-      handleChangeSpy.resetHistory()
-      handleBlurSpy.resetHistory()
-    })
-
-    it('should call onChange and onBlur on input changes with the hex value for ETH', () => {
-      const mockStore = {
-        metamask: {
-          currentCurrency: 'usd',
-          conversionRate: 231.06,
-        },
-      }
-      const store = configureMockStore()(mockStore)
-      const wrapper = mount(
-        <Provider store={store}>
-          <TokenInput
-            onChange={handleChangeSpy}
-            onBlur={handleBlurSpy}
-            selectedToken={{
-              address: '0x1',
-              decimals: '4',
-              symbol: 'ABC',
-            }}
-            suffix="ABC"
-            selectedTokenExchangeRate={2}
-          />
-        </Provider>
-      )
-
-      assert.ok(wrapper)
-      assert.equal(handleChangeSpy.callCount, 0)
-      assert.equal(handleBlurSpy.callCount, 0)
-
-      const tokenInputInstance = wrapper.find(TokenInput).at(0).instance()
-      assert.equal(tokenInputInstance.state.decimalValue, 0)
-      assert.equal(tokenInputInstance.state.hexValue, undefined)
-      assert.equal(wrapper.find('.currency-display-component').text(), '0 ETH')
-      const input = wrapper.find('input')
-      assert.equal(input.props().value, 0)
-
-      input.simulate('change', { target: { value: 1 } })
-      assert.equal(handleChangeSpy.callCount, 1)
-      assert.ok(handleChangeSpy.calledWith('2710'))
-      assert.equal(wrapper.find('.currency-display-component').text(), '2 ETH')
-      assert.equal(tokenInputInstance.state.decimalValue, 1)
-      assert.equal(tokenInputInstance.state.hexValue, '2710')
-
-      assert.equal(handleBlurSpy.callCount, 0)
-      input.simulate('blur')
-      assert.equal(handleBlurSpy.callCount, 1)
-      assert.ok(handleBlurSpy.calledWith('2710'))
-    })
-
-    it('should call onChange and onBlur on input changes with the hex value for fiat', () => {
-      const mockStore = {
-        metamask: {
-          currentCurrency: 'usd',
-          conversionRate: 231.06,
-        },
-      }
-      const store = configureMockStore()(mockStore)
-      const wrapper = mount(
-        <Provider store={store}>
-          <TokenInput
-            onChange={handleChangeSpy}
-            onBlur={handleBlurSpy}
-            selectedToken={{
-              address: '0x1',
-              decimals: '4',
-              symbol: 'ABC',
-            }}
-            suffix="ABC"
-            selectedTokenExchangeRate={2}
-            showFiat
-          />
-        </Provider>
-      )
-
-      assert.ok(wrapper)
-      assert.equal(handleChangeSpy.callCount, 0)
-      assert.equal(handleBlurSpy.callCount, 0)
-
-      const tokenInputInstance = wrapper.find(TokenInput).at(0).instance()
-      assert.equal(tokenInputInstance.state.decimalValue, 0)
-      assert.equal(tokenInputInstance.state.hexValue, undefined)
-      assert.equal(wrapper.find('.currency-display-component').text(), '$0.00 USD')
-      const input = wrapper.find('input')
-      assert.equal(input.props().value, 0)
-
-      input.simulate('change', { target: { value: 1 } })
-      assert.equal(handleChangeSpy.callCount, 1)
-      assert.ok(handleChangeSpy.calledWith('2710'))
-      assert.equal(wrapper.find('.currency-display-component').text(), '$462.12 USD')
-      assert.equal(tokenInputInstance.state.decimalValue, 1)
-      assert.equal(tokenInputInstance.state.hexValue, '2710')
-
-      assert.equal(handleBlurSpy.callCount, 0)
-      input.simulate('blur')
-      assert.equal(handleBlurSpy.callCount, 1)
-      assert.ok(handleBlurSpy.calledWith('2710'))
-    })
-
-    it('should change the state and pass in a new decimalValue when props.value changes', () => {
-      const mockStore = {
-        metamask: {
-          currentCurrency: 'usd',
-          conversionRate: 231.06,
-        },
-      }
-      const store = configureMockStore()(mockStore)
-      const wrapper = shallow(
-        <Provider store={store}>
-          <TokenInput
-            onChange={handleChangeSpy}
-            onBlur={handleBlurSpy}
-            selectedToken={{
-              address: '0x1',
-              decimals: '4',
-              symbol: 'ABC',
-            }}
-            suffix="ABC"
-            selectedTokenExchangeRate={2}
-            showFiat
-          />
-        </Provider>
-      )
-
-      assert.ok(wrapper)
-      const tokenInputInstance = wrapper.find(TokenInput).dive()
-      assert.equal(tokenInputInstance.state('decimalValue'), 0)
-      assert.equal(tokenInputInstance.state('hexValue'), undefined)
-      assert.equal(tokenInputInstance.find(UnitInput).props().value, 0)
-
-      tokenInputInstance.setProps({ value: '2710' })
-      tokenInputInstance.update()
-      assert.equal(tokenInputInstance.state('decimalValue'), 1)
-      assert.equal(tokenInputInstance.state('hexValue'), '2710')
-      assert.equal(tokenInputInstance.find(UnitInput).props().value, 1)
-    })
-  })
-})
diff --git a/ui/app/components/token-input/tests/token-input.container.test.js b/ui/app/components/token-input/tests/token-input.container.test.js
deleted file mode 100644
index d73bc9a94..000000000
--- a/ui/app/components/token-input/tests/token-input.container.test.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-
-let mapStateToProps, mergeProps
-
-proxyquire('../token-input.container.js', {
-  'react-redux': {
-    connect: (ms, md, mp) => {
-      mapStateToProps = ms
-      mergeProps = mp
-      return () => ({})
-    },
-  },
-})
-
-describe('TokenInput container', () => {
-  describe('mapStateToProps()', () => {
-    it('should return the correct props when send is empty', () => {
-      const mockState = {
-        metamask: {
-          currentCurrency: 'usd',
-          tokens: [
-            {
-              address: '0x1',
-              decimals: '4',
-              symbol: 'ABC',
-            },
-          ],
-          selectedTokenAddress: '0x1',
-          contractExchangeRates: {},
-          send: {},
-        },
-      }
-
-      assert.deepEqual(mapStateToProps(mockState), {
-        currentCurrency: 'usd',
-        selectedToken: {
-          address: '0x1',
-          decimals: '4',
-          symbol: 'ABC',
-        },
-        selectedTokenExchangeRate: 0,
-      })
-    })
-
-    it('should return the correct props when selectedTokenAddress is not found and send is populated', () => {
-      const mockState = {
-        metamask: {
-          currentCurrency: 'usd',
-          tokens: [
-            {
-              address: '0x1',
-              decimals: '4',
-              symbol: 'ABC',
-            },
-          ],
-          selectedTokenAddress: '0x2',
-          contractExchangeRates: {},
-          send: {
-            token: { address: 'test' },
-          },
-        },
-      }
-
-      assert.deepEqual(mapStateToProps(mockState), {
-        currentCurrency: 'usd',
-        selectedToken: {
-          address: 'test',
-        },
-        selectedTokenExchangeRate: 0,
-      })
-    })
-
-    it('should return the correct props when contractExchangeRates is populated', () => {
-      const mockState = {
-        metamask: {
-          currentCurrency: 'usd',
-          tokens: [
-            {
-              address: '0x1',
-              decimals: '4',
-              symbol: 'ABC',
-            },
-          ],
-          selectedTokenAddress: '0x1',
-          contractExchangeRates: {
-            '0x1': 5,
-          },
-          send: {},
-        },
-      }
-
-      assert.deepEqual(mapStateToProps(mockState), {
-        currentCurrency: 'usd',
-        selectedToken: {
-          address: '0x1',
-          decimals: '4',
-          symbol: 'ABC',
-        },
-        selectedTokenExchangeRate: 5,
-      })
-    })
-  })
-
-  describe('mergeProps()', () => {
-    it('should return the correct props', () => {
-      const mockStateProps = {
-        currentCurrency: 'usd',
-        selectedToken: {
-          address: '0x1',
-          decimals: '4',
-          symbol: 'ABC',
-        },
-        selectedTokenExchangeRate: 5,
-      }
-
-      assert.deepEqual(mergeProps(mockStateProps, {}, {}), {
-        currentCurrency: 'usd',
-        selectedToken: {
-          address: '0x1',
-          decimals: '4',
-          symbol: 'ABC',
-        },
-        selectedTokenExchangeRate: 5,
-        suffix: 'ABC',
-      })
-    })
-  })
-})
diff --git a/ui/app/components/token-input/token-input.component.js b/ui/app/components/token-input/token-input.component.js
deleted file mode 100644
index d1388945b..000000000
--- a/ui/app/components/token-input/token-input.component.js
+++ /dev/null
@@ -1,136 +0,0 @@
-import React, { PureComponent } from 'react'
-import PropTypes from 'prop-types'
-import UnitInput from '../unit-input'
-import CurrencyDisplay from '../currency-display'
-import { getWeiHexFromDecimalValue } from '../../helpers/conversions.util'
-import ethUtil from 'ethereumjs-util'
-import { conversionUtil, multiplyCurrencies } from '../../conversion-util'
-import { ETH } from '../../constants/common'
-
-/**
- * Component that allows user to enter token values as a number, and props receive a converted
- * hex value. props.value, used as a default or forced value, should be a hex value, which
- * gets converted into a decimal value.
- */
-export default class TokenInput extends PureComponent {
-  static contextTypes = {
-    t: PropTypes.func,
-  }
-
-  static propTypes = {
-    currentCurrency: PropTypes.string,
-    onChange: PropTypes.func,
-    onBlur: PropTypes.func,
-    value: PropTypes.string,
-    suffix: PropTypes.string,
-    showFiat: PropTypes.bool,
-    selectedToken: PropTypes.object,
-    selectedTokenExchangeRate: PropTypes.number,
-  }
-
-  constructor (props) {
-    super(props)
-
-    const { value: hexValue } = props
-    const decimalValue = hexValue ? this.getDecimalValue(props) : 0
-
-    this.state = {
-      decimalValue,
-      hexValue,
-    }
-  }
-
-  componentDidUpdate (prevProps) {
-    const { value: prevPropsHexValue } = prevProps
-    const { value: propsHexValue } = this.props
-    const { hexValue: stateHexValue } = this.state
-
-    if (prevPropsHexValue !== propsHexValue && propsHexValue !== stateHexValue) {
-      const decimalValue = this.getDecimalValue(this.props)
-      this.setState({ hexValue: propsHexValue, decimalValue })
-    }
-  }
-
-  getDecimalValue (props) {
-    const { value: hexValue, selectedToken: { decimals, symbol } = {} } = props
-
-    const multiplier = Math.pow(10, Number(decimals || 0))
-    const decimalValueString = conversionUtil(ethUtil.addHexPrefix(hexValue), {
-      fromNumericBase: 'hex',
-      toNumericBase: 'dec',
-      toCurrency: symbol,
-      conversionRate: multiplier,
-      invertConversionRate: true,
-    })
-
-    return Number(decimalValueString) || 0
-  }
-
-  handleChange = decimalValue => {
-    const { selectedToken: { decimals } = {}, onChange } = this.props
-
-    const multiplier = Math.pow(10, Number(decimals || 0))
-    const hexValue = multiplyCurrencies(decimalValue || 0, multiplier, { toNumericBase: 'hex' })
-
-    this.setState({ hexValue, decimalValue })
-    onChange(hexValue)
-  }
-
-  handleBlur = () => {
-    this.props.onBlur(this.state.hexValue)
-  }
-
-  renderConversionComponent () {
-    const { selectedTokenExchangeRate, showFiat, currentCurrency } = this.props
-    const { decimalValue } = this.state
-    let currency, numberOfDecimals
-
-    if (showFiat) {
-      // Display Fiat
-      currency = currentCurrency
-      numberOfDecimals = 2
-    } else {
-      // Display ETH
-      currency = ETH
-      numberOfDecimals = 6
-    }
-
-    const decimalEthValue = (decimalValue * selectedTokenExchangeRate) || 0
-    const hexWeiValue = getWeiHexFromDecimalValue({
-      value: decimalEthValue,
-      fromCurrency: ETH,
-      fromDenomination: ETH,
-    })
-
-    return selectedTokenExchangeRate
-      ? (
-        <CurrencyDisplay
-          className="currency-input__conversion-component"
-          currency={currency}
-          value={hexWeiValue}
-          numberOfDecimals={numberOfDecimals}
-        />
-      ) : (
-        <div className="currency-input__conversion-component">
-          { this.context.t('noConversionRateAvailable') }
-        </div>
-      )
-  }
-
-  render () {
-    const { suffix, ...restProps } = this.props
-    const { decimalValue } = this.state
-
-    return (
-      <UnitInput
-        {...restProps}
-        suffix={suffix}
-        onChange={this.handleChange}
-        onBlur={this.handleBlur}
-        value={decimalValue}
-      >
-        { this.renderConversionComponent() }
-      </UnitInput>
-    )
-  }
-}
diff --git a/ui/app/components/token-input/token-input.container.js b/ui/app/components/token-input/token-input.container.js
deleted file mode 100644
index ec233b1b8..000000000
--- a/ui/app/components/token-input/token-input.container.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { connect } from 'react-redux'
-import TokenInput from './token-input.component'
-import { getSelectedToken, getSelectedTokenExchangeRate } from '../../selectors'
-
-const mapStateToProps = state => {
-  const { metamask: { currentCurrency } } = state
-
-  return {
-    currentCurrency,
-    selectedToken: getSelectedToken(state),
-    selectedTokenExchangeRate: getSelectedTokenExchangeRate(state),
-  }
-}
-
-const mergeProps = (stateProps, dispatchProps, ownProps) => {
-  const { selectedToken } = stateProps
-  const suffix = selectedToken && selectedToken.symbol
-
-  return {
-    ...stateProps,
-    ...dispatchProps,
-    ...ownProps,
-    suffix,
-  }
-}
-
-export default connect(mapStateToProps, null, mergeProps)(TokenInput)
diff --git a/ui/app/components/tooltip-v2.js b/ui/app/components/tooltip-v2.js
deleted file mode 100644
index 054782203..000000000
--- a/ui/app/components/tooltip-v2.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import PropTypes from 'prop-types'
-import React, {PureComponent} from 'react'
-import {Tooltip as ReactTippy} from 'react-tippy'
-
-export default class Tooltip extends PureComponent {
-  static defaultProps = {
-    arrow: true,
-    children: null,
-    containerClassName: '',
-    hideOnClick: false,
-    onHidden: null,
-    position: 'left',
-    size: 'small',
-    title: null,
-    trigger: 'mouseenter',
-    wrapperClassName: '',
-  }
-
-  static propTypes = {
-    arrow: PropTypes.bool,
-    children: PropTypes.node,
-    containerClassName: PropTypes.string,
-    onHidden: PropTypes.func,
-    position: PropTypes.oneOf([
-      'top',
-      'right',
-      'bottom',
-      'left',
-    ]),
-    size: PropTypes.oneOf([
-      'small', 'regular', 'big',
-    ]),
-    title: PropTypes.string,
-    trigger: PropTypes.any,
-    wrapperClassName: PropTypes.string,
-  }
-
-  render () {
-    const {arrow, children, containerClassName, position, size, title, trigger, onHidden, wrapperClassName } = this.props
-
-    if (!title) {
-      return (
-        <div className={wrapperClassName}>
-          {children}
-        </div>
-      )
-    }
-
-    return (
-      <div className={wrapperClassName}>
-        <ReactTippy
-          className={containerClassName}
-          title={title}
-          position={position}
-          trigger={trigger}
-          hideOnClick={false}
-          size={size}
-          arrow={arrow}
-          onHidden={onHidden}
-        >
-          {children}
-        </ReactTippy>
-      </div>
-    )
-  }
-}
diff --git a/ui/app/components/unit-input/index.js b/ui/app/components/unit-input/index.js
deleted file mode 100644
index 7c33c9e5c..000000000
--- a/ui/app/components/unit-input/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './unit-input.component'
diff --git a/ui/app/components/unit-input/index.scss b/ui/app/components/unit-input/index.scss
deleted file mode 100644
index 28c5bf6f0..000000000
--- a/ui/app/components/unit-input/index.scss
+++ /dev/null
@@ -1,44 +0,0 @@
-.unit-input {
-  min-height: 54px;
-  border: 1px solid #dedede;
-  border-radius: 4px;
-  background-color: #fff;
-  color: #4d4d4d;
-  font-size: 1rem;
-  padding: 8px 10px;
-  position: relative;
-
-  input[type="number"] {
-    -moz-appearance: textfield;
-  }
-
-  input[type="number"]::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    display: none;
-  }
-
-  input[type="number"]:hover::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    display: none;
-  }
-
-  &__input {
-    color: #4d4d4d;
-    font-size: 1rem;
-    font-family: Roboto;
-    border: none;
-    outline: 0 !important;
-    max-width: 22ch;
-  }
-
-  &__input-container {
-    display: flex;
-    align-items: center;
-  }
-
-  &--error {
-    border-color: $red;
-  }
-}
diff --git a/ui/app/components/unit-input/tests/unit-input.component.test.js b/ui/app/components/unit-input/tests/unit-input.component.test.js
deleted file mode 100644
index 97d987bc7..000000000
--- a/ui/app/components/unit-input/tests/unit-input.component.test.js
+++ /dev/null
@@ -1,146 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow, mount } from 'enzyme'
-import sinon from 'sinon'
-import UnitInput from '../unit-input.component'
-
-describe('UnitInput Component', () => {
-  describe('rendering', () => {
-    it('should render properly without a suffix', () => {
-      const wrapper = shallow(
-        <UnitInput />
-      )
-
-      assert.ok(wrapper)
-      assert.equal(wrapper.find('.unit-input__suffix').length, 0)
-    })
-
-    it('should render properly with a suffix', () => {
-      const wrapper = shallow(
-        <UnitInput
-          suffix="ETH"
-        />
-      )
-
-      assert.ok(wrapper)
-      assert.equal(wrapper.find('.unit-input__suffix').length, 1)
-      assert.equal(wrapper.find('.unit-input__suffix').text(), 'ETH')
-    })
-
-    it('should render properly with a child omponent', () => {
-      const wrapper = shallow(
-        <UnitInput>
-          <div className="testing">
-            TESTCOMPONENT
-          </div>
-        </UnitInput>
-      )
-
-      assert.ok(wrapper)
-      assert.equal(wrapper.find('.testing').length, 1)
-      assert.equal(wrapper.find('.testing').text(), 'TESTCOMPONENT')
-    })
-
-    it('should render with an error class when props.error === true', () => {
-      const wrapper = shallow(
-        <UnitInput
-          error
-        />
-      )
-
-      assert.ok(wrapper)
-      assert.equal(wrapper.find('.unit-input--error').length, 1)
-    })
-  })
-
-  describe('handling actions', () => {
-    const handleChangeSpy = sinon.spy()
-    const handleBlurSpy = sinon.spy()
-
-    afterEach(() => {
-      handleChangeSpy.resetHistory()
-      handleBlurSpy.resetHistory()
-    })
-
-    it('should focus the input on component click', () => {
-      const wrapper = mount(
-        <UnitInput />
-      )
-
-      assert.ok(wrapper)
-      const handleFocusSpy = sinon.spy(wrapper.instance(), 'handleFocus')
-      wrapper.instance().forceUpdate()
-      wrapper.update()
-      assert.equal(handleFocusSpy.callCount, 0)
-      wrapper.find('.unit-input').simulate('click')
-      assert.equal(handleFocusSpy.callCount, 1)
-    })
-
-    it('should call onChange on input changes with the value', () => {
-      const wrapper = mount(
-        <UnitInput
-          onChange={handleChangeSpy}
-        />
-      )
-
-      assert.ok(wrapper)
-      assert.equal(handleChangeSpy.callCount, 0)
-      const input = wrapper.find('input')
-      input.simulate('change', { target: { value: 123 } })
-      assert.equal(handleChangeSpy.callCount, 1)
-      assert.ok(handleChangeSpy.calledWith(123))
-      assert.equal(wrapper.state('value'), 123)
-    })
-
-    it('should call onBlur on blur with the value', () => {
-      const wrapper = mount(
-        <UnitInput
-          onChange={handleChangeSpy}
-          onBlur={handleBlurSpy}
-        />
-      )
-
-      assert.ok(wrapper)
-      assert.equal(handleChangeSpy.callCount, 0)
-      assert.equal(handleBlurSpy.callCount, 0)
-      const input = wrapper.find('input')
-      input.simulate('change', { target: { value: 123 } })
-      assert.equal(handleChangeSpy.callCount, 1)
-      assert.ok(handleChangeSpy.calledWith(123))
-      assert.equal(wrapper.state('value'), 123)
-      input.simulate('blur')
-      assert.equal(handleBlurSpy.callCount, 1)
-      assert.ok(handleBlurSpy.calledWith(123))
-    })
-
-    it('should set the component state value with props.value', () => {
-      const wrapper = mount(
-        <UnitInput
-          value={123}
-        />
-      )
-
-      assert.ok(wrapper)
-      assert.equal(wrapper.state('value'), 123)
-    })
-
-    it('should update the component state value with props.value', () => {
-      const wrapper = mount(
-        <UnitInput
-          onChange={handleChangeSpy}
-        />
-      )
-
-      assert.ok(wrapper)
-      assert.equal(handleChangeSpy.callCount, 0)
-      const input = wrapper.find('input')
-      input.simulate('change', { target: { value: 123 } })
-      assert.equal(wrapper.state('value'), 123)
-      assert.equal(handleChangeSpy.callCount, 1)
-      assert.ok(handleChangeSpy.calledWith(123))
-      wrapper.setProps({ value: 456 })
-      assert.equal(wrapper.state('value'), 456)
-      assert.equal(handleChangeSpy.callCount, 1)
-    })
-  })
-})
diff --git a/ui/app/components/unit-input/unit-input.component.js b/ui/app/components/unit-input/unit-input.component.js
deleted file mode 100644
index f1ebf4d77..000000000
--- a/ui/app/components/unit-input/unit-input.component.js
+++ /dev/null
@@ -1,104 +0,0 @@
-import React, { PureComponent } from 'react'
-import PropTypes from 'prop-types'
-import classnames from 'classnames'
-import { removeLeadingZeroes } from '../send/send.utils'
-
-/**
- * Component that attaches a suffix or unit of measurement trailing user input, ex. 'ETH'. Also
- * allows rendering a child component underneath the input to, for example, display conversions of
- * the shown suffix.
- */
-export default class UnitInput extends PureComponent {
-  static propTypes = {
-    children: PropTypes.node,
-    error: PropTypes.bool,
-    onBlur: PropTypes.func,
-    onChange: PropTypes.func,
-    placeholder: PropTypes.string,
-    suffix: PropTypes.string,
-    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  }
-
-  static defaultProps = {
-    placeholder: '0',
-  }
-
-  constructor (props) {
-    super(props)
-
-    this.state = {
-      value: props.value || '',
-    }
-  }
-
-  componentDidUpdate (prevProps) {
-    const { value: prevPropsValue } = prevProps
-    const { value: propsValue } = this.props
-    const { value: stateValue } = this.state
-
-    if (prevPropsValue !== propsValue && propsValue !== stateValue) {
-      this.setState({ value: propsValue })
-    }
-  }
-
-  handleFocus = () => {
-    this.unitInput.focus()
-  }
-
-  handleChange = event => {
-    const { value: userInput } = event.target
-    let value = userInput
-
-    if (userInput.length && userInput.length > 1) {
-      value = removeLeadingZeroes(userInput)
-    }
-
-    this.setState({ value })
-    this.props.onChange(value)
-  }
-
-  handleBlur = event => {
-    const { onBlur } = this.props
-    typeof onBlur === 'function' && onBlur(this.state.value)
-  }
-
-  getInputWidth (value) {
-    const valueString = String(value)
-    const valueLength = valueString.length || 1
-    const decimalPointDeficit = valueString.match(/\./) ? -0.5 : 0
-    return (valueLength + decimalPointDeficit + 0.75) + 'ch'
-  }
-
-  render () {
-    const { error, placeholder, suffix, children } = this.props
-    const { value } = this.state
-
-    return (
-      <div
-        className={classnames('unit-input', { 'unit-input--error': error })}
-        onClick={this.handleFocus}
-      >
-        <div className="unit-input__input-container">
-          <input
-            type="number"
-            className="unit-input__input"
-            value={value}
-            placeholder={placeholder}
-            onChange={this.handleChange}
-            onBlur={this.handleBlur}
-            style={{ width: this.getInputWidth(value) }}
-            ref={ref => { this.unitInput = ref }}
-          />
-          {
-            suffix && (
-              <div className="unit-input__suffix">
-                { suffix }
-              </div>
-            )
-          }
-        </div>
-        { children }
-      </div>
-    )
-  }
-}
diff --git a/ui/app/components/user-preferenced-currency-display/index.js b/ui/app/components/user-preferenced-currency-display/index.js
deleted file mode 100644
index 0deddaecf..000000000
--- a/ui/app/components/user-preferenced-currency-display/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './user-preferenced-currency-display.container'
diff --git a/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.component.test.js b/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.component.test.js
deleted file mode 100644
index ead584c26..000000000
--- a/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.component.test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display.component'
-import CurrencyDisplay from '../../currency-display'
-
-describe('UserPreferencedCurrencyDisplay Component', () => {
-  describe('rendering', () => {
-    it('should render properly', () => {
-      const wrapper = shallow(
-        <UserPreferencedCurrencyDisplay />
-      )
-
-      assert.ok(wrapper)
-      assert.equal(wrapper.find(CurrencyDisplay).length, 1)
-    })
-
-    it('should pass all props to the CurrencyDisplay child component', () => {
-      const wrapper = shallow(
-        <UserPreferencedCurrencyDisplay
-          prop1={true}
-          prop2="test"
-          prop3={1}
-        />
-      )
-
-      assert.ok(wrapper)
-      assert.equal(wrapper.find(CurrencyDisplay).length, 1)
-      assert.equal(wrapper.find(CurrencyDisplay).props().prop1, true)
-      assert.equal(wrapper.find(CurrencyDisplay).props().prop2, 'test')
-      assert.equal(wrapper.find(CurrencyDisplay).props().prop3, 1)
-    })
-  })
-})
diff --git a/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js b/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js
deleted file mode 100644
index 41ad3b73e..000000000
--- a/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-
-let mapStateToProps, mergeProps
-
-proxyquire('../user-preferenced-currency-display.container.js', {
-  'react-redux': {
-    connect: (ms, md, mp) => {
-      mapStateToProps = ms
-      mergeProps = mp
-      return () => ({})
-    },
-  },
-})
-
-describe('UserPreferencedCurrencyDisplay container', () => {
-  describe('mapStateToProps()', () => {
-    it('should return the correct props', () => {
-      const mockState = {
-        metamask: {
-          preferences: {
-            useETHAsPrimaryCurrency: true,
-          },
-        },
-      }
-
-      assert.deepEqual(mapStateToProps(mockState), {
-        useETHAsPrimaryCurrency: true,
-      })
-    })
-  })
-
-  describe('mergeProps()', () => {
-    it('should return the correct props', () => {
-      const mockDispatchProps = {}
-
-      const tests = [
-        {
-          stateProps: {
-            useETHAsPrimaryCurrency: true,
-          },
-          ownProps: {
-            type: 'PRIMARY',
-          },
-          result: {
-            currency: 'ETH',
-            numberOfDecimals: 6,
-            prefix: undefined,
-          },
-        },
-        {
-          stateProps: {
-            useETHAsPrimaryCurrency: false,
-          },
-          ownProps: {
-            type: 'PRIMARY',
-          },
-          result: {
-            currency: undefined,
-            numberOfDecimals: 2,
-            prefix: undefined,
-          },
-        },
-        {
-          stateProps: {
-            useETHAsPrimaryCurrency: true,
-          },
-          ownProps: {
-            type: 'SECONDARY',
-            fiatNumberOfDecimals: 4,
-            fiatPrefix: '-',
-          },
-          result: {
-            currency: undefined,
-            numberOfDecimals: 4,
-            prefix: '-',
-          },
-        },
-        {
-          stateProps: {
-            useETHAsPrimaryCurrency: false,
-          },
-          ownProps: {
-            type: 'SECONDARY',
-            fiatNumberOfDecimals: 4,
-            numberOfDecimals: 3,
-            fiatPrefix: 'a',
-            prefix: 'b',
-          },
-          result: {
-            currency: 'ETH',
-            numberOfDecimals: 3,
-            prefix: 'b',
-          },
-        },
-      ]
-
-      tests.forEach(({ stateProps, ownProps, result }) => {
-        assert.deepEqual(mergeProps({ ...stateProps }, mockDispatchProps, { ...ownProps }), {
-          ...result,
-        })
-      })
-    })
-  })
-})
diff --git a/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.component.js b/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.component.js
deleted file mode 100644
index 4d948ca6a..000000000
--- a/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.component.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import React, { PureComponent } from 'react'
-import PropTypes from 'prop-types'
-import { PRIMARY, SECONDARY, ETH } from '../../constants/common'
-import CurrencyDisplay from '../currency-display'
-
-export default class UserPreferencedCurrencyDisplay extends PureComponent {
-  static propTypes = {
-    className: PropTypes.string,
-    prefix: PropTypes.string,
-    value: PropTypes.string,
-    numberOfDecimals: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    hideLabel: PropTypes.bool,
-    style: PropTypes.object,
-    showEthLogo: PropTypes.bool,
-    ethLogoHeight: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    // Used in container
-    type: PropTypes.oneOf([PRIMARY, SECONDARY]),
-    ethNumberOfDecimals: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    fiatNumberOfDecimals: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    ethPrefix: PropTypes.string,
-    fiatPrefix: PropTypes.string,
-    // From container
-    currency: PropTypes.string,
-  }
-
-  renderEthLogo () {
-    const { currency, showEthLogo, ethLogoHeight = 12 } = this.props
-
-    return currency === ETH && showEthLogo && (
-      <img
-        src="/images/eth.svg"
-        height={ethLogoHeight}
-      />
-    )
-  }
-
-  render () {
-    return (
-      <CurrencyDisplay
-        {...this.props}
-        prefixComponent={this.renderEthLogo()}
-      />
-    )
-  }
-}
diff --git a/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js b/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js
deleted file mode 100644
index 23240c649..000000000
--- a/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { connect } from 'react-redux'
-import UserPreferencedCurrencyDisplay from './user-preferenced-currency-display.component'
-import { preferencesSelector } from '../../selectors'
-import { ETH, PRIMARY, SECONDARY } from '../../constants/common'
-
-const mapStateToProps = (state, ownProps) => {
-  const { useETHAsPrimaryCurrency } = preferencesSelector(state)
-
-  return {
-    useETHAsPrimaryCurrency,
-  }
-}
-
-const mergeProps = (stateProps, dispatchProps, ownProps) => {
-  const { useETHAsPrimaryCurrency, ...restStateProps } = stateProps
-  const {
-    type,
-    numberOfDecimals: propsNumberOfDecimals,
-    ethNumberOfDecimals,
-    fiatNumberOfDecimals,
-    ethPrefix,
-    fiatPrefix,
-    prefix: propsPrefix,
-    ...restOwnProps
-  } = ownProps
-
-  let currency, numberOfDecimals, prefix
-
-  if (type === PRIMARY && useETHAsPrimaryCurrency ||
-    type === SECONDARY && !useETHAsPrimaryCurrency) {
-    // Display ETH
-    currency = ETH
-    numberOfDecimals = propsNumberOfDecimals || ethNumberOfDecimals || 6
-    prefix = propsPrefix || ethPrefix
-  } else if (type === SECONDARY && useETHAsPrimaryCurrency ||
-    type === PRIMARY && !useETHAsPrimaryCurrency) {
-    // Display Fiat
-    numberOfDecimals = propsNumberOfDecimals || fiatNumberOfDecimals || 2
-    prefix = propsPrefix || fiatPrefix
-  }
-
-  return {
-    ...restStateProps,
-    ...dispatchProps,
-    ...restOwnProps,
-    currency,
-    numberOfDecimals,
-    prefix,
-  }
-}
-
-export default connect(mapStateToProps, null, mergeProps)(UserPreferencedCurrencyDisplay)
diff --git a/ui/app/components/user-preferenced-currency-input/index.js b/ui/app/components/user-preferenced-currency-input/index.js
deleted file mode 100644
index 4dc70db3d..000000000
--- a/ui/app/components/user-preferenced-currency-input/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './user-preferenced-currency-input.container'
diff --git a/ui/app/components/user-preferenced-currency-input/tests/user-preferenced-currency-input.component.test.js b/ui/app/components/user-preferenced-currency-input/tests/user-preferenced-currency-input.component.test.js
deleted file mode 100644
index 0af80a03d..000000000
--- a/ui/app/components/user-preferenced-currency-input/tests/user-preferenced-currency-input.component.test.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import UserPreferencedCurrencyInput from '../user-preferenced-currency-input.component'
-import CurrencyInput from '../../currency-input'
-
-describe('UserPreferencedCurrencyInput Component', () => {
-  describe('rendering', () => {
-    it('should render properly', () => {
-      const wrapper = shallow(
-        <UserPreferencedCurrencyInput />
-      )
-
-      assert.ok(wrapper)
-      assert.equal(wrapper.find(CurrencyInput).length, 1)
-    })
-
-    it('should render useFiat for CurrencyInput based on preferences.useETHAsPrimaryCurrency', () => {
-      const wrapper = shallow(
-        <UserPreferencedCurrencyInput
-          useETHAsPrimaryCurrency
-        />
-      )
-
-      assert.ok(wrapper)
-      assert.equal(wrapper.find(CurrencyInput).length, 1)
-      assert.equal(wrapper.find(CurrencyInput).props().useFiat, false)
-      wrapper.setProps({ useETHAsPrimaryCurrency: false })
-      assert.equal(wrapper.find(CurrencyInput).props().useFiat, true)
-    })
-  })
-})
diff --git a/ui/app/components/user-preferenced-currency-input/tests/user-preferenced-currency-input.container.test.js b/ui/app/components/user-preferenced-currency-input/tests/user-preferenced-currency-input.container.test.js
deleted file mode 100644
index d860c38da..000000000
--- a/ui/app/components/user-preferenced-currency-input/tests/user-preferenced-currency-input.container.test.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-
-let mapStateToProps
-
-proxyquire('../user-preferenced-currency-input.container.js', {
-  'react-redux': {
-    connect: ms => {
-      mapStateToProps = ms
-      return () => ({})
-    },
-  },
-})
-
-describe('UserPreferencedCurrencyInput container', () => {
-  describe('mapStateToProps()', () => {
-    it('should return the correct props', () => {
-      const mockState = {
-        metamask: {
-          preferences: {
-            useETHAsPrimaryCurrency: true,
-          },
-        },
-      }
-
-      assert.deepEqual(mapStateToProps(mockState), {
-        useETHAsPrimaryCurrency: true,
-      })
-    })
-  })
-})
diff --git a/ui/app/components/user-preferenced-currency-input/user-preferenced-currency-input.component.js b/ui/app/components/user-preferenced-currency-input/user-preferenced-currency-input.component.js
deleted file mode 100644
index 6e0e00a1d..000000000
--- a/ui/app/components/user-preferenced-currency-input/user-preferenced-currency-input.component.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import React, { PureComponent } from 'react'
-import PropTypes from 'prop-types'
-import CurrencyInput from '../currency-input'
-
-export default class UserPreferencedCurrencyInput extends PureComponent {
-  static propTypes = {
-    useETHAsPrimaryCurrency: PropTypes.bool,
-  }
-
-  render () {
-    const { useETHAsPrimaryCurrency, ...restProps } = this.props
-
-    return (
-      <CurrencyInput
-        {...restProps}
-        useFiat={!useETHAsPrimaryCurrency}
-      />
-    )
-  }
-}
diff --git a/ui/app/components/user-preferenced-currency-input/user-preferenced-currency-input.container.js b/ui/app/components/user-preferenced-currency-input/user-preferenced-currency-input.container.js
deleted file mode 100644
index 397cdc7cc..000000000
--- a/ui/app/components/user-preferenced-currency-input/user-preferenced-currency-input.container.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { connect } from 'react-redux'
-import UserPreferencedCurrencyInput from './user-preferenced-currency-input.component'
-import { preferencesSelector } from '../../selectors'
-
-const mapStateToProps = state => {
-  const { useETHAsPrimaryCurrency } = preferencesSelector(state)
-
-  return {
-    useETHAsPrimaryCurrency,
-  }
-}
-
-export default connect(mapStateToProps)(UserPreferencedCurrencyInput)
diff --git a/ui/app/components/user-preferenced-token-input/index.js b/ui/app/components/user-preferenced-token-input/index.js
deleted file mode 100644
index 54167e633..000000000
--- a/ui/app/components/user-preferenced-token-input/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './user-preferenced-token-input.container'
diff --git a/ui/app/components/user-preferenced-token-input/tests/user-preferenced-token-input.component.test.js b/ui/app/components/user-preferenced-token-input/tests/user-preferenced-token-input.component.test.js
deleted file mode 100644
index 910c7089f..000000000
--- a/ui/app/components/user-preferenced-token-input/tests/user-preferenced-token-input.component.test.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import UserPreferencedTokenInput from '../user-preferenced-token-input.component'
-import TokenInput from '../../token-input'
-
-describe('UserPreferencedCurrencyInput Component', () => {
-  describe('rendering', () => {
-    it('should render properly', () => {
-      const wrapper = shallow(
-        <UserPreferencedTokenInput />
-      )
-
-      assert.ok(wrapper)
-      assert.equal(wrapper.find(TokenInput).length, 1)
-    })
-
-    it('should render showFiat for TokenInput based on preferences.useETHAsPrimaryCurrency', () => {
-      const wrapper = shallow(
-        <UserPreferencedTokenInput
-          useETHAsPrimaryCurrency
-        />
-      )
-
-      assert.ok(wrapper)
-      assert.equal(wrapper.find(TokenInput).length, 1)
-      assert.equal(wrapper.find(TokenInput).props().showFiat, false)
-      wrapper.setProps({ useETHAsPrimaryCurrency: false })
-      assert.equal(wrapper.find(TokenInput).props().showFiat, true)
-    })
-  })
-})
diff --git a/ui/app/components/user-preferenced-token-input/tests/user-preferenced-token-input.container.test.js b/ui/app/components/user-preferenced-token-input/tests/user-preferenced-token-input.container.test.js
deleted file mode 100644
index e3509149a..000000000
--- a/ui/app/components/user-preferenced-token-input/tests/user-preferenced-token-input.container.test.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-
-let mapStateToProps
-
-proxyquire('../user-preferenced-token-input.container.js', {
-  'react-redux': {
-    connect: ms => {
-      mapStateToProps = ms
-      return () => ({})
-    },
-  },
-})
-
-describe('UserPreferencedTokenInput container', () => {
-  describe('mapStateToProps()', () => {
-    it('should return the correct props', () => {
-      const mockState = {
-        metamask: {
-          preferences: {
-            useETHAsPrimaryCurrency: true,
-          },
-        },
-      }
-
-      assert.deepEqual(mapStateToProps(mockState), {
-        useETHAsPrimaryCurrency: true,
-      })
-    })
-  })
-})
diff --git a/ui/app/components/user-preferenced-token-input/user-preferenced-token-input.component.js b/ui/app/components/user-preferenced-token-input/user-preferenced-token-input.component.js
deleted file mode 100644
index f2b537f11..000000000
--- a/ui/app/components/user-preferenced-token-input/user-preferenced-token-input.component.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import React, { PureComponent } from 'react'
-import PropTypes from 'prop-types'
-import TokenInput from '../token-input'
-
-export default class UserPreferencedTokenInput extends PureComponent {
-  static propTypes = {
-    useETHAsPrimaryCurrency: PropTypes.bool,
-  }
-
-  render () {
-    const { useETHAsPrimaryCurrency, ...restProps } = this.props
-
-    return (
-      <TokenInput
-        {...restProps}
-        showFiat={!useETHAsPrimaryCurrency}
-      />
-    )
-  }
-}
diff --git a/ui/app/components/user-preferenced-token-input/user-preferenced-token-input.container.js b/ui/app/components/user-preferenced-token-input/user-preferenced-token-input.container.js
deleted file mode 100644
index 416d069dd..000000000
--- a/ui/app/components/user-preferenced-token-input/user-preferenced-token-input.container.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { connect } from 'react-redux'
-import UserPreferencedTokenInput from './user-preferenced-token-input.component'
-import { preferencesSelector } from '../../selectors'
-
-const mapStateToProps = state => {
-  const { useETHAsPrimaryCurrency } = preferencesSelector(state)
-
-  return {
-    useETHAsPrimaryCurrency,
-  }
-}
-
-export default connect(mapStateToProps)(UserPreferencedTokenInput)