diff --git a/.storybook/main.js b/.storybook/main.js
deleted file mode 100644
index 22fb319f..00000000
--- a/.storybook/main.js
+++ /dev/null
@@ -1,31 +0,0 @@
-const path = require("path");
-
-module.exports = {
-  stories: ["../src/**/*.stories.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
-  addons: ["@storybook/addon-links", "@storybook/addon-essentials"],
-  webpackFinal: async (config) => {
-    config.resolve.modules = [
-      ...(config.resolve.modules || []),
-      path.resolve(__dirname, "../src"),
-    ];
-
-    // Transpile Gatsby module because Gatsby includes un-transpiled ES6 code.
-    config.module.rules[0].exclude = [/node_modules\/(?!(gatsby)\/)/];
-    // use installed babel-loader which is v8.0-beta (which is meant to work with @babel/core@7)
-    config.module.rules[0].use[0].loader = require.resolve("babel-loader");
-    // use @babel/preset-react for JSX and env (instead of staged presets)
-    config.module.rules[0].use[0].options.presets = [
-      require.resolve("@babel/preset-react"),
-      require.resolve("@babel/preset-env"),
-    ];
-    config.module.rules[0].use[0].options.plugins = [
-      // use @babel/plugin-proposal-class-properties for class arrow functions
-      require.resolve("@babel/plugin-proposal-class-properties"),
-      // use babel-plugin-remove-graphql-queries to remove static queries from components when rendering in storybook
-      require.resolve("babel-plugin-remove-graphql-queries"),
-    ];
-    // Prefer Gatsby ES6 entrypoint (module) over commonjs (main) entrypoint
-    config.resolve.mainFields = ["browser", "module", "main"];
-    return config;
-  },
-};
diff --git a/.storybook/preview.js b/.storybook/preview.js
deleted file mode 100644
index 43b2d7c7..00000000
--- a/.storybook/preview.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ThemeProvider } from "styled-components";
-import theme from "../src/theme";
-import "../src/theme/typography.css";
-
-function Theming({ children }) {
-  return <ThemeProvider theme={theme}>{children}</ThemeProvider>;
-}
-
-export const parameters = {
-  actions: { argTypesRegex: "^on[A-Z].*" },
-};
-
-export const decorators = [
-  (Story) => (
-    <Theming>
-      <Story />
-    </Theming>
-  ),
-];
diff --git a/.storybook/styles.css b/.storybook/styles.css
deleted file mode 100644
index 2c1c90c6..00000000
--- a/.storybook/styles.css
+++ /dev/null
@@ -1,9 +0,0 @@
-@import "~antd/dist/antd.css";
-
-.ant-message {
-  bottom: 0;
-  right: 0;
-  display: flex;
-  justify-content: flex-end;
-  align-items: flex-end;
-}
diff --git a/README.md b/README.md
index 2452d299..6d7bbc89 100644
--- a/README.md
+++ b/README.md
@@ -15,18 +15,10 @@
 
 ## Repo Structure
 
-### .storybook
-
-Contains setup files for [Storybook](https://storybook.js.org/), a solution for viewing components without surrounding app context.
-
 ### build [.gitignore]
 
 After building the app, the files are located here.
 
-### cypress
-
-Contains end-to-end test suites and set up files for [Cypress](https://www.cypress.io/), our browser integration testing engine.
-
 ### data
 
 Contains markdown files that are compiled at build time to `src/data.json`, where it is consumed and turned into UI components.
@@ -51,15 +43,14 @@ Contains the configuration logic for the socket server's webpack build, as well
 
 ### Tools of Choice
 
-| TOOL             | LEARN MORE                      | WHAT IT'S FOR                                                                            |
-| ---------------- | ------------------------------- | ---------------------------------------------------------------------------------------- |
-| Create-React-App | https://create-react-app.dev/   | React is a view library for creating components.                                         |
-| Redux            | https://redux.js.org/           | Redux is a library for handling state managements.                                       |
-| React-Redux      | https://react-redux.js.org/     | React-Redux connects a React app with a Redux data store.                                |
-| Redux Toolkit    | https://redux-toolkit.js.org/   | Redux Toolkit is an opinion toolset and pattern for Redux.                               |
-| Ant Design       | https://ant.design/             | Ant Design is a UI framework that contains React components.                             |
-| Storybook        | https://storybook.js.org/       | Storybook allows developers to view components in isolation.                             |
-| Cypress          | https://cypress.io/             | Cypress is an end-to-end test engine that automates quality assurance testing in Chrome. |
-| Typescript       | https://www.typescriptlang.org/ | TypeScript is a superset of ECMAScript that provides a robust build-time type solution.  |
-| Formik           | https://formik.org/             | Formik is a form solution to make forms easier in React.                                 |
-| Ethers           | https://docs.ethers.io/v5/      | Ethers is an all-in-one library for interacting with the Ethereum blockchain.            |
+| TOOL             | LEARN MORE                      | WHAT IT'S FOR                                                                           |
+| ---------------- | ------------------------------- | --------------------------------------------------------------------------------------- |
+| Create-React-App | https://create-react-app.dev/   | React is a view library for creating components.                                        |
+| Redux            | https://redux.js.org/           | Redux is a library for handling state managements.                                      |
+| React-Redux      | https://react-redux.js.org/     | React-Redux connects a React app with a Redux data store.                               |
+| Redux Toolkit    | https://redux-toolkit.js.org/   | Redux Toolkit is an opinion toolset and pattern for Redux.                              |
+| Ant Design       | https://ant.design/             | Ant Design is a UI framework that contains React components.                            |
+| Storybook        | https://storybook.js.org/       | Storybook allows developers to view components in isolation.                            |
+| Typescript       | https://www.typescriptlang.org/ | TypeScript is a superset of ECMAScript that provides a robust build-time type solution. |
+| Formik           | https://formik.org/             | Formik is a form solution to make forms easier in React.                                |
+| Ethers           | https://docs.ethers.io/v5/      | Ethers is an all-in-one library for interacting with the Ethereum blockchain.           |
\ No newline at end of file
diff --git a/cypress.json b/cypress.json
deleted file mode 100644
index b471a6a5..00000000
--- a/cypress.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "baseUrl": "http://localhost:8000"
-}
diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json
deleted file mode 100644
index da18d935..00000000
--- a/cypress/fixtures/example.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "Using fixtures to represent data",
-  "email": "hello@cypress.io",
-  "body": "Fixtures are a great way to mock data for responses to routes"
-}
\ No newline at end of file
diff --git a/cypress/integration/examples/actions.spec.js b/cypress/integration/examples/actions.spec.js
deleted file mode 100644
index 09263799..00000000
--- a/cypress/integration/examples/actions.spec.js
+++ /dev/null
@@ -1,299 +0,0 @@
-/// <reference types="cypress" />
-
-context('Actions', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/actions')
-  })
-
-  // https://on.cypress.io/interacting-with-elements
-
-  it('.type() - type into a DOM element', () => {
-    // https://on.cypress.io/type
-    cy.get('.action-email')
-      .type('fake@email.com').should('have.value', 'fake@email.com')
-
-      // .type() with special character sequences
-      .type('{leftarrow}{rightarrow}{uparrow}{downarrow}')
-      .type('{del}{selectall}{backspace}')
-
-      // .type() with key modifiers
-      .type('{alt}{option}') //these are equivalent
-      .type('{ctrl}{control}') //these are equivalent
-      .type('{meta}{command}{cmd}') //these are equivalent
-      .type('{shift}')
-
-      // Delay each keypress by 0.1 sec
-      .type('slow.typing@email.com', { delay: 100 })
-      .should('have.value', 'slow.typing@email.com')
-
-    cy.get('.action-disabled')
-      // Ignore error checking prior to type
-      // like whether the input is visible or disabled
-      .type('disabled error checking', { force: true })
-      .should('have.value', 'disabled error checking')
-  })
-
-  it('.focus() - focus on a DOM element', () => {
-    // https://on.cypress.io/focus
-    cy.get('.action-focus').focus()
-      .should('have.class', 'focus')
-      .prev().should('have.attr', 'style', 'color: orange;')
-  })
-
-  it('.blur() - blur off a DOM element', () => {
-    // https://on.cypress.io/blur
-    cy.get('.action-blur').type('About to blur').blur()
-      .should('have.class', 'error')
-      .prev().should('have.attr', 'style', 'color: red;')
-  })
-
-  it('.clear() - clears an input or textarea element', () => {
-    // https://on.cypress.io/clear
-    cy.get('.action-clear').type('Clear this text')
-      .should('have.value', 'Clear this text')
-      .clear()
-      .should('have.value', '')
-  })
-
-  it('.submit() - submit a form', () => {
-    // https://on.cypress.io/submit
-    cy.get('.action-form')
-      .find('[type="text"]').type('HALFOFF')
-
-    cy.get('.action-form').submit()
-      .next().should('contain', 'Your form has been submitted!')
-  })
-
-  it('.click() - click on a DOM element', () => {
-    // https://on.cypress.io/click
-    cy.get('.action-btn').click()
-
-    // You can click on 9 specific positions of an element:
-    //  -----------------------------------
-    // | topLeft        top       topRight |
-    // |                                   |
-    // |                                   |
-    // |                                   |
-    // | left          center        right |
-    // |                                   |
-    // |                                   |
-    // |                                   |
-    // | bottomLeft   bottom   bottomRight |
-    //  -----------------------------------
-
-    // clicking in the center of the element is the default
-    cy.get('#action-canvas').click()
-
-    cy.get('#action-canvas').click('topLeft')
-    cy.get('#action-canvas').click('top')
-    cy.get('#action-canvas').click('topRight')
-    cy.get('#action-canvas').click('left')
-    cy.get('#action-canvas').click('right')
-    cy.get('#action-canvas').click('bottomLeft')
-    cy.get('#action-canvas').click('bottom')
-    cy.get('#action-canvas').click('bottomRight')
-
-    // .click() accepts an x and y coordinate
-    // that controls where the click occurs :)
-
-    cy.get('#action-canvas')
-      .click(80, 75) // click 80px on x coord and 75px on y coord
-      .click(170, 75)
-      .click(80, 165)
-      .click(100, 185)
-      .click(125, 190)
-      .click(150, 185)
-      .click(170, 165)
-
-    // click multiple elements by passing multiple: true
-    cy.get('.action-labels>.label').click({ multiple: true })
-
-    // Ignore error checking prior to clicking
-    cy.get('.action-opacity>.btn').click({ force: true })
-  })
-
-  it('.dblclick() - double click on a DOM element', () => {
-    // https://on.cypress.io/dblclick
-
-    // Our app has a listener on 'dblclick' event in our 'scripts.js'
-    // that hides the div and shows an input on double click
-    cy.get('.action-div').dblclick().should('not.be.visible')
-    cy.get('.action-input-hidden').should('be.visible')
-  })
-
-  it('.rightclick() - right click on a DOM element', () => {
-    // https://on.cypress.io/rightclick
-
-    // Our app has a listener on 'contextmenu' event in our 'scripts.js'
-    // that hides the div and shows an input on right click
-    cy.get('.rightclick-action-div').rightclick().should('not.be.visible')
-    cy.get('.rightclick-action-input-hidden').should('be.visible')
-  })
-
-  it('.check() - check a checkbox or radio element', () => {
-    // https://on.cypress.io/check
-
-    // By default, .check() will check all
-    // matching checkbox or radio elements in succession, one after another
-    cy.get('.action-checkboxes [type="checkbox"]').not('[disabled]')
-      .check().should('be.checked')
-
-    cy.get('.action-radios [type="radio"]').not('[disabled]')
-      .check().should('be.checked')
-
-    // .check() accepts a value argument
-    cy.get('.action-radios [type="radio"]')
-      .check('radio1').should('be.checked')
-
-    // .check() accepts an array of values
-    cy.get('.action-multiple-checkboxes [type="checkbox"]')
-      .check(['checkbox1', 'checkbox2']).should('be.checked')
-
-    // Ignore error checking prior to checking
-    cy.get('.action-checkboxes [disabled]')
-      .check({ force: true }).should('be.checked')
-
-    cy.get('.action-radios [type="radio"]')
-      .check('radio3', { force: true }).should('be.checked')
-  })
-
-  it('.uncheck() - uncheck a checkbox element', () => {
-    // https://on.cypress.io/uncheck
-
-    // By default, .uncheck() will uncheck all matching
-    // checkbox elements in succession, one after another
-    cy.get('.action-check [type="checkbox"]')
-      .not('[disabled]')
-      .uncheck().should('not.be.checked')
-
-    // .uncheck() accepts a value argument
-    cy.get('.action-check [type="checkbox"]')
-      .check('checkbox1')
-      .uncheck('checkbox1').should('not.be.checked')
-
-    // .uncheck() accepts an array of values
-    cy.get('.action-check [type="checkbox"]')
-      .check(['checkbox1', 'checkbox3'])
-      .uncheck(['checkbox1', 'checkbox3']).should('not.be.checked')
-
-    // Ignore error checking prior to unchecking
-    cy.get('.action-check [disabled]')
-      .uncheck({ force: true }).should('not.be.checked')
-  })
-
-  it('.select() - select an option in a <select> element', () => {
-    // https://on.cypress.io/select
-
-    // at first, no option should be selected
-    cy.get('.action-select')
-      .should('have.value', '--Select a fruit--')
-
-    // Select option(s) with matching text content
-    cy.get('.action-select').select('apples')
-    // confirm the apples were selected
-    // note that each value starts with "fr-" in our HTML
-    cy.get('.action-select').should('have.value', 'fr-apples')
-
-    cy.get('.action-select-multiple')
-      .select(['apples', 'oranges', 'bananas'])
-      // when getting multiple values, invoke "val" method first
-      .invoke('val')
-      .should('deep.equal', ['fr-apples', 'fr-oranges', 'fr-bananas'])
-
-    // Select option(s) with matching value
-    cy.get('.action-select').select('fr-bananas')
-      // can attach an assertion right away to the element
-      .should('have.value', 'fr-bananas')
-
-    cy.get('.action-select-multiple')
-      .select(['fr-apples', 'fr-oranges', 'fr-bananas'])
-      .invoke('val')
-      .should('deep.equal', ['fr-apples', 'fr-oranges', 'fr-bananas'])
-
-    // assert the selected values include oranges
-    cy.get('.action-select-multiple')
-      .invoke('val').should('include', 'fr-oranges')
-  })
-
-  it('.scrollIntoView() - scroll an element into view', () => {
-    // https://on.cypress.io/scrollintoview
-
-    // normally all of these buttons are hidden,
-    // because they're not within
-    // the viewable area of their parent
-    // (we need to scroll to see them)
-    cy.get('#scroll-horizontal button')
-      .should('not.be.visible')
-
-    // scroll the button into view, as if the user had scrolled
-    cy.get('#scroll-horizontal button').scrollIntoView()
-      .should('be.visible')
-
-    cy.get('#scroll-vertical button')
-      .should('not.be.visible')
-
-    // Cypress handles the scroll direction needed
-    cy.get('#scroll-vertical button').scrollIntoView()
-      .should('be.visible')
-
-    cy.get('#scroll-both button')
-      .should('not.be.visible')
-
-    // Cypress knows to scroll to the right and down
-    cy.get('#scroll-both button').scrollIntoView()
-      .should('be.visible')
-  })
-
-  it('.trigger() - trigger an event on a DOM element', () => {
-    // https://on.cypress.io/trigger
-
-    // To interact with a range input (slider)
-    // we need to set its value & trigger the
-    // event to signal it changed
-
-    // Here, we invoke jQuery's val() method to set
-    // the value and trigger the 'change' event
-    cy.get('.trigger-input-range')
-      .invoke('val', 25)
-      .trigger('change')
-      .get('input[type=range]').siblings('p')
-      .should('have.text', '25')
-  })
-
-  it('cy.scrollTo() - scroll the window or element to a position', () => {
-    // https://on.cypress.io/scrollto
-
-    // You can scroll to 9 specific positions of an element:
-    //  -----------------------------------
-    // | topLeft        top       topRight |
-    // |                                   |
-    // |                                   |
-    // |                                   |
-    // | left          center        right |
-    // |                                   |
-    // |                                   |
-    // |                                   |
-    // | bottomLeft   bottom   bottomRight |
-    //  -----------------------------------
-
-    // if you chain .scrollTo() off of cy, we will
-    // scroll the entire window
-    cy.scrollTo('bottom')
-
-    cy.get('#scrollable-horizontal').scrollTo('right')
-
-    // or you can scroll to a specific coordinate:
-    // (x axis, y axis) in pixels
-    cy.get('#scrollable-vertical').scrollTo(250, 250)
-
-    // or you can scroll to a specific percentage
-    // of the (width, height) of the element
-    cy.get('#scrollable-both').scrollTo('75%', '25%')
-
-    // control the easing of the scroll (default is 'swing')
-    cy.get('#scrollable-vertical').scrollTo('center', { easing: 'linear' })
-
-    // control the duration of the scroll (in ms)
-    cy.get('#scrollable-both').scrollTo('center', { duration: 2000 })
-  })
-})
diff --git a/cypress/integration/examples/aliasing.spec.js b/cypress/integration/examples/aliasing.spec.js
deleted file mode 100644
index a02fb2bb..00000000
--- a/cypress/integration/examples/aliasing.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/// <reference types="cypress" />
-
-context('Aliasing', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/aliasing')
-  })
-
-  it('.as() - alias a DOM element for later use', () => {
-    // https://on.cypress.io/as
-
-    // Alias a DOM element for use later
-    // We don't have to traverse to the element
-    // later in our code, we reference it with @
-
-    cy.get('.as-table').find('tbody>tr')
-      .first().find('td').first()
-      .find('button').as('firstBtn')
-
-    // when we reference the alias, we place an
-    // @ in front of its name
-    cy.get('@firstBtn').click()
-
-    cy.get('@firstBtn')
-      .should('have.class', 'btn-success')
-      .and('contain', 'Changed')
-  })
-
-  it('.as() - alias a route for later use', () => {
-    // Alias the route to wait for its response
-    cy.intercept('GET', '**/comments/*').as('getComment')
-
-    // we have code that gets a comment when
-    // the button is clicked in scripts.js
-    cy.get('.network-btn').click()
-
-    // https://on.cypress.io/wait
-    cy.wait('@getComment').its('response.statusCode').should('eq', 200)
-  })
-})
diff --git a/cypress/integration/examples/assertions.spec.js b/cypress/integration/examples/assertions.spec.js
deleted file mode 100644
index 5ba93d1d..00000000
--- a/cypress/integration/examples/assertions.spec.js
+++ /dev/null
@@ -1,177 +0,0 @@
-/// <reference types="cypress" />
-
-context('Assertions', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/assertions')
-  })
-
-  describe('Implicit Assertions', () => {
-    it('.should() - make an assertion about the current subject', () => {
-      // https://on.cypress.io/should
-      cy.get('.assertion-table')
-        .find('tbody tr:last')
-        .should('have.class', 'success')
-        .find('td')
-        .first()
-        // checking the text of the <td> element in various ways
-        .should('have.text', 'Column content')
-        .should('contain', 'Column content')
-        .should('have.html', 'Column content')
-        // chai-jquery uses "is()" to check if element matches selector
-        .should('match', 'td')
-        // to match text content against a regular expression
-        // first need to invoke jQuery method text()
-        // and then match using regular expression
-        .invoke('text')
-        .should('match', /column content/i)
-
-      // a better way to check element's text content against a regular expression
-      // is to use "cy.contains"
-      // https://on.cypress.io/contains
-      cy.get('.assertion-table')
-        .find('tbody tr:last')
-        // finds first <td> element with text content matching regular expression
-        .contains('td', /column content/i)
-        .should('be.visible')
-
-      // for more information about asserting element's text
-      // see https://on.cypress.io/using-cypress-faq#How-do-I-get-an-element’s-text-contents
-    })
-
-    it('.and() - chain multiple assertions together', () => {
-      // https://on.cypress.io/and
-      cy.get('.assertions-link')
-        .should('have.class', 'active')
-        .and('have.attr', 'href')
-        .and('include', 'cypress.io')
-    })
-  })
-
-  describe('Explicit Assertions', () => {
-    // https://on.cypress.io/assertions
-    it('expect - make an assertion about a specified subject', () => {
-      // We can use Chai's BDD style assertions
-      expect(true).to.be.true
-      const o = { foo: 'bar' }
-
-      expect(o).to.equal(o)
-      expect(o).to.deep.equal({ foo: 'bar' })
-      // matching text using regular expression
-      expect('FooBar').to.match(/bar$/i)
-    })
-
-    it('pass your own callback function to should()', () => {
-      // Pass a function to should that can have any number
-      // of explicit assertions within it.
-      // The ".should(cb)" function will be retried
-      // automatically until it passes all your explicit assertions or times out.
-      cy.get('.assertions-p')
-        .find('p')
-        .should(($p) => {
-          // https://on.cypress.io/$
-          // return an array of texts from all of the p's
-          // @ts-ignore TS6133 unused variable
-          const texts = $p.map((i, el) => Cypress.$(el).text())
-
-          // jquery map returns jquery object
-          // and .get() convert this to simple array
-          const paragraphs = texts.get()
-
-          // array should have length of 3
-          expect(paragraphs, 'has 3 paragraphs').to.have.length(3)
-
-          // use second argument to expect(...) to provide clear
-          // message with each assertion
-          expect(paragraphs, 'has expected text in each paragraph').to.deep.eq([
-            'Some text from first p',
-            'More text from second p',
-            'And even more text from third p',
-          ])
-        })
-    })
-
-    it('finds element by class name regex', () => {
-      cy.get('.docs-header')
-        .find('div')
-        // .should(cb) callback function will be retried
-        .should(($div) => {
-          expect($div).to.have.length(1)
-
-          const className = $div[0].className
-
-          expect(className).to.match(/heading-/)
-        })
-        // .then(cb) callback is not retried,
-        // it either passes or fails
-        .then(($div) => {
-          expect($div, 'text content').to.have.text('Introduction')
-        })
-    })
-
-    it('can throw any error', () => {
-      cy.get('.docs-header')
-        .find('div')
-        .should(($div) => {
-          if ($div.length !== 1) {
-            // you can throw your own errors
-            throw new Error('Did not find 1 element')
-          }
-
-          const className = $div[0].className
-
-          if (!className.match(/heading-/)) {
-            throw new Error(`Could not find class "heading-" in ${className}`)
-          }
-        })
-    })
-
-    it('matches unknown text between two elements', () => {
-      /**
-       * Text from the first element.
-       * @type {string}
-      */
-      let text
-
-      /**
-       * Normalizes passed text,
-       * useful before comparing text with spaces and different capitalization.
-       * @param {string} s Text to normalize
-      */
-      const normalizeText = (s) => s.replace(/\s/g, '').toLowerCase()
-
-      cy.get('.two-elements')
-        .find('.first')
-        .then(($first) => {
-          // save text from the first element
-          text = normalizeText($first.text())
-        })
-
-      cy.get('.two-elements')
-        .find('.second')
-        .should(($div) => {
-          // we can massage text before comparing
-          const secondText = normalizeText($div.text())
-
-          expect(secondText, 'second text').to.equal(text)
-        })
-    })
-
-    it('assert - assert shape of an object', () => {
-      const person = {
-        name: 'Joe',
-        age: 20,
-      }
-
-      assert.isObject(person, 'value is object')
-    })
-
-    it('retries the should callback until assertions pass', () => {
-      cy.get('#random-number')
-        .should(($div) => {
-          const n = parseFloat($div.text())
-
-          expect(n).to.be.gte(1).and.be.lte(10)
-        })
-    })
-  })
-})
diff --git a/cypress/integration/examples/connectors.spec.js b/cypress/integration/examples/connectors.spec.js
deleted file mode 100644
index ae879918..00000000
--- a/cypress/integration/examples/connectors.spec.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/// <reference types="cypress" />
-
-context('Connectors', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/connectors')
-  })
-
-  it('.each() - iterate over an array of elements', () => {
-    // https://on.cypress.io/each
-    cy.get('.connectors-each-ul>li')
-      .each(($el, index, $list) => {
-        console.log($el, index, $list)
-      })
-  })
-
-  it('.its() - get properties on the current subject', () => {
-    // https://on.cypress.io/its
-    cy.get('.connectors-its-ul>li')
-      // calls the 'length' property yielding that value
-      .its('length')
-      .should('be.gt', 2)
-  })
-
-  it('.invoke() - invoke a function on the current subject', () => {
-    // our div is hidden in our script.js
-    // $('.connectors-div').hide()
-
-    // https://on.cypress.io/invoke
-    cy.get('.connectors-div').should('be.hidden')
-      // call the jquery method 'show' on the 'div.container'
-      .invoke('show')
-      .should('be.visible')
-  })
-
-  it('.spread() - spread an array as individual args to callback function', () => {
-    // https://on.cypress.io/spread
-    const arr = ['foo', 'bar', 'baz']
-
-    cy.wrap(arr).spread((foo, bar, baz) => {
-      expect(foo).to.eq('foo')
-      expect(bar).to.eq('bar')
-      expect(baz).to.eq('baz')
-    })
-  })
-
-  describe('.then()', () => {
-    it('invokes a callback function with the current subject', () => {
-      // https://on.cypress.io/then
-      cy.get('.connectors-list > li')
-        .then(($lis) => {
-          expect($lis, '3 items').to.have.length(3)
-          expect($lis.eq(0), 'first item').to.contain('Walk the dog')
-          expect($lis.eq(1), 'second item').to.contain('Feed the cat')
-          expect($lis.eq(2), 'third item').to.contain('Write JavaScript')
-        })
-    })
-
-    it('yields the returned value to the next command', () => {
-      cy.wrap(1)
-        .then((num) => {
-          expect(num).to.equal(1)
-
-          return 2
-        })
-        .then((num) => {
-          expect(num).to.equal(2)
-        })
-    })
-
-    it('yields the original subject without return', () => {
-      cy.wrap(1)
-        .then((num) => {
-          expect(num).to.equal(1)
-          // note that nothing is returned from this callback
-        })
-        .then((num) => {
-          // this callback receives the original unchanged value 1
-          expect(num).to.equal(1)
-        })
-    })
-
-    it('yields the value yielded by the last Cypress command inside', () => {
-      cy.wrap(1)
-        .then((num) => {
-          expect(num).to.equal(1)
-          // note how we run a Cypress command
-          // the result yielded by this Cypress command
-          // will be passed to the second ".then"
-          cy.wrap(2)
-        })
-        .then((num) => {
-          // this callback receives the value yielded by "cy.wrap(2)"
-          expect(num).to.equal(2)
-        })
-    })
-  })
-})
diff --git a/cypress/integration/examples/cookies.spec.js b/cypress/integration/examples/cookies.spec.js
deleted file mode 100644
index 31587ff9..00000000
--- a/cypress/integration/examples/cookies.spec.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/// <reference types="cypress" />
-
-context('Cookies', () => {
-  beforeEach(() => {
-    Cypress.Cookies.debug(true)
-
-    cy.visit('https://example.cypress.io/commands/cookies')
-
-    // clear cookies again after visiting to remove
-    // any 3rd party cookies picked up such as cloudflare
-    cy.clearCookies()
-  })
-
-  it('cy.getCookie() - get a browser cookie', () => {
-    // https://on.cypress.io/getcookie
-    cy.get('#getCookie .set-a-cookie').click()
-
-    // cy.getCookie() yields a cookie object
-    cy.getCookie('token').should('have.property', 'value', '123ABC')
-  })
-
-  it('cy.getCookies() - get browser cookies', () => {
-    // https://on.cypress.io/getcookies
-    cy.getCookies().should('be.empty')
-
-    cy.get('#getCookies .set-a-cookie').click()
-
-    // cy.getCookies() yields an array of cookies
-    cy.getCookies().should('have.length', 1).should((cookies) => {
-      // each cookie has these properties
-      expect(cookies[0]).to.have.property('name', 'token')
-      expect(cookies[0]).to.have.property('value', '123ABC')
-      expect(cookies[0]).to.have.property('httpOnly', false)
-      expect(cookies[0]).to.have.property('secure', false)
-      expect(cookies[0]).to.have.property('domain')
-      expect(cookies[0]).to.have.property('path')
-    })
-  })
-
-  it('cy.setCookie() - set a browser cookie', () => {
-    // https://on.cypress.io/setcookie
-    cy.getCookies().should('be.empty')
-
-    cy.setCookie('foo', 'bar')
-
-    // cy.getCookie() yields a cookie object
-    cy.getCookie('foo').should('have.property', 'value', 'bar')
-  })
-
-  it('cy.clearCookie() - clear a browser cookie', () => {
-    // https://on.cypress.io/clearcookie
-    cy.getCookie('token').should('be.null')
-
-    cy.get('#clearCookie .set-a-cookie').click()
-
-    cy.getCookie('token').should('have.property', 'value', '123ABC')
-
-    // cy.clearCookies() yields null
-    cy.clearCookie('token').should('be.null')
-
-    cy.getCookie('token').should('be.null')
-  })
-
-  it('cy.clearCookies() - clear browser cookies', () => {
-    // https://on.cypress.io/clearcookies
-    cy.getCookies().should('be.empty')
-
-    cy.get('#clearCookies .set-a-cookie').click()
-
-    cy.getCookies().should('have.length', 1)
-
-    // cy.clearCookies() yields null
-    cy.clearCookies()
-
-    cy.getCookies().should('be.empty')
-  })
-})
diff --git a/cypress/integration/examples/cypress_api.spec.js b/cypress/integration/examples/cypress_api.spec.js
deleted file mode 100644
index ec8ceaed..00000000
--- a/cypress/integration/examples/cypress_api.spec.js
+++ /dev/null
@@ -1,202 +0,0 @@
-/// <reference types="cypress" />
-
-context('Cypress.Commands', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  // https://on.cypress.io/custom-commands
-
-  it('.add() - create a custom command', () => {
-    Cypress.Commands.add('console', {
-      prevSubject: true,
-    }, (subject, method) => {
-      // the previous subject is automatically received
-      // and the commands arguments are shifted
-
-      // allow us to change the console method used
-      method = method || 'log'
-
-      // log the subject to the console
-      // @ts-ignore TS7017
-      console[method]('The subject is', subject)
-
-      // whatever we return becomes the new subject
-      // we don't want to change the subject so
-      // we return whatever was passed in
-      return subject
-    })
-
-    // @ts-ignore TS2339
-    cy.get('button').console('info').then(($button) => {
-      // subject is still $button
-    })
-  })
-})
-
-context('Cypress.Cookies', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  // https://on.cypress.io/cookies
-  it('.debug() - enable or disable debugging', () => {
-    Cypress.Cookies.debug(true)
-
-    // Cypress will now log in the console when
-    // cookies are set or cleared
-    cy.setCookie('fakeCookie', '123ABC')
-    cy.clearCookie('fakeCookie')
-    cy.setCookie('fakeCookie', '123ABC')
-    cy.clearCookie('fakeCookie')
-    cy.setCookie('fakeCookie', '123ABC')
-  })
-
-  it('.preserveOnce() - preserve cookies by key', () => {
-    // normally cookies are reset after each test
-    cy.getCookie('fakeCookie').should('not.be.ok')
-
-    // preserving a cookie will not clear it when
-    // the next test starts
-    cy.setCookie('lastCookie', '789XYZ')
-    Cypress.Cookies.preserveOnce('lastCookie')
-  })
-
-  it('.defaults() - set defaults for all cookies', () => {
-    // now any cookie with the name 'session_id' will
-    // not be cleared before each new test runs
-    Cypress.Cookies.defaults({
-      preserve: 'session_id',
-    })
-  })
-})
-
-context('Cypress.arch', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  it('Get CPU architecture name of underlying OS', () => {
-    // https://on.cypress.io/arch
-    expect(Cypress.arch).to.exist
-  })
-})
-
-context('Cypress.config()', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  it('Get and set configuration options', () => {
-    // https://on.cypress.io/config
-    let myConfig = Cypress.config()
-
-    expect(myConfig).to.have.property('animationDistanceThreshold', 5)
-    expect(myConfig).to.have.property('baseUrl', null)
-    expect(myConfig).to.have.property('defaultCommandTimeout', 4000)
-    expect(myConfig).to.have.property('requestTimeout', 5000)
-    expect(myConfig).to.have.property('responseTimeout', 30000)
-    expect(myConfig).to.have.property('viewportHeight', 660)
-    expect(myConfig).to.have.property('viewportWidth', 1000)
-    expect(myConfig).to.have.property('pageLoadTimeout', 60000)
-    expect(myConfig).to.have.property('waitForAnimations', true)
-
-    expect(Cypress.config('pageLoadTimeout')).to.eq(60000)
-
-    // this will change the config for the rest of your tests!
-    Cypress.config('pageLoadTimeout', 20000)
-
-    expect(Cypress.config('pageLoadTimeout')).to.eq(20000)
-
-    Cypress.config('pageLoadTimeout', 60000)
-  })
-})
-
-context('Cypress.dom', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  // https://on.cypress.io/dom
-  it('.isHidden() - determine if a DOM element is hidden', () => {
-    let hiddenP = Cypress.$('.dom-p p.hidden').get(0)
-    let visibleP = Cypress.$('.dom-p p.visible').get(0)
-
-    // our first paragraph has css class 'hidden'
-    expect(Cypress.dom.isHidden(hiddenP)).to.be.true
-    expect(Cypress.dom.isHidden(visibleP)).to.be.false
-  })
-})
-
-context('Cypress.env()', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  // We can set environment variables for highly dynamic values
-
-  // https://on.cypress.io/environment-variables
-  it('Get environment variables', () => {
-    // https://on.cypress.io/env
-    // set multiple environment variables
-    Cypress.env({
-      host: 'veronica.dev.local',
-      api_server: 'http://localhost:8888/v1/',
-    })
-
-    // get environment variable
-    expect(Cypress.env('host')).to.eq('veronica.dev.local')
-
-    // set environment variable
-    Cypress.env('api_server', 'http://localhost:8888/v2/')
-    expect(Cypress.env('api_server')).to.eq('http://localhost:8888/v2/')
-
-    // get all environment variable
-    expect(Cypress.env()).to.have.property('host', 'veronica.dev.local')
-    expect(Cypress.env()).to.have.property('api_server', 'http://localhost:8888/v2/')
-  })
-})
-
-context('Cypress.log', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  it('Control what is printed to the Command Log', () => {
-    // https://on.cypress.io/cypress-log
-  })
-})
-
-context('Cypress.platform', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  it('Get underlying OS name', () => {
-    // https://on.cypress.io/platform
-    expect(Cypress.platform).to.be.exist
-  })
-})
-
-context('Cypress.version', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  it('Get current version of Cypress being run', () => {
-    // https://on.cypress.io/version
-    expect(Cypress.version).to.be.exist
-  })
-})
-
-context('Cypress.spec', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  it('Get current spec information', () => {
-    // https://on.cypress.io/spec
-    // wrap the object so we can inspect it easily by clicking in the command log
-    cy.wrap(Cypress.spec).should('include.keys', ['name', 'relative', 'absolute'])
-  })
-})
diff --git a/cypress/integration/examples/files.spec.js b/cypress/integration/examples/files.spec.js
deleted file mode 100644
index 01a53235..00000000
--- a/cypress/integration/examples/files.spec.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/// <reference types="cypress" />
-
-/// JSON fixture file can be loaded directly using
-// the built-in JavaScript bundler
-// @ts-ignore
-const requiredExample = require('../../fixtures/example')
-
-context('Files', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/files')
-  })
-
-  beforeEach(() => {
-    // load example.json fixture file and store
-    // in the test context object
-    cy.fixture('example.json').as('example')
-  })
-
-  it('cy.fixture() - load a fixture', () => {
-    // https://on.cypress.io/fixture
-
-    // Instead of writing a response inline you can
-    // use a fixture file's content.
-
-    // when application makes an Ajax request matching "GET **/comments/*"
-    // Cypress will intercept it and reply with the object in `example.json` fixture
-    cy.intercept('GET', '**/comments/*', { fixture: 'example.json' }).as('getComment')
-
-    // we have code that gets a comment when
-    // the button is clicked in scripts.js
-    cy.get('.fixture-btn').click()
-
-    cy.wait('@getComment').its('response.body')
-      .should('have.property', 'name')
-      .and('include', 'Using fixtures to represent data')
-  })
-
-  it('cy.fixture() or require - load a fixture', function () {
-    // we are inside the "function () { ... }"
-    // callback and can use test context object "this"
-    // "this.example" was loaded in "beforeEach" function callback
-    expect(this.example, 'fixture in the test context')
-      .to.deep.equal(requiredExample)
-
-    // or use "cy.wrap" and "should('deep.equal', ...)" assertion
-    // @ts-ignore
-    cy.wrap(this.example, 'fixture vs require')
-      .should('deep.equal', requiredExample)
-  })
-
-  it('cy.readFile() - read file contents', () => {
-    // https://on.cypress.io/readfile
-
-    // You can read a file and yield its contents
-    // The filePath is relative to your project's root.
-    cy.readFile('cypress.json').then((json) => {
-      expect(json).to.be.an('object')
-    })
-  })
-
-  it('cy.writeFile() - write to a file', () => {
-    // https://on.cypress.io/writefile
-
-    // You can write to a file
-
-    // Use a response from a request to automatically
-    // generate a fixture file for use later
-    cy.request('https://jsonplaceholder.cypress.io/users')
-      .then((response) => {
-        cy.writeFile('cypress/fixtures/users.json', response.body)
-      })
-
-    cy.fixture('users').should((users) => {
-      expect(users[0].name).to.exist
-    })
-
-    // JavaScript arrays and objects are stringified
-    // and formatted into text.
-    cy.writeFile('cypress/fixtures/profile.json', {
-      id: 8739,
-      name: 'Jane',
-      email: 'jane@example.com',
-    })
-
-    cy.fixture('profile').should((profile) => {
-      expect(profile.name).to.eq('Jane')
-    })
-  })
-})
diff --git a/cypress/integration/examples/local_storage.spec.js b/cypress/integration/examples/local_storage.spec.js
deleted file mode 100644
index 5f83b8de..00000000
--- a/cypress/integration/examples/local_storage.spec.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/// <reference types="cypress" />
-
-context('Local Storage', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/local-storage')
-  })
-  // Although local storage is automatically cleared
-  // in between tests to maintain a clean state
-  // sometimes we need to clear the local storage manually
-
-  it('cy.clearLocalStorage() - clear all data in local storage', () => {
-    // https://on.cypress.io/clearlocalstorage
-    cy.get('.ls-btn').click().should(() => {
-      expect(localStorage.getItem('prop1')).to.eq('red')
-      expect(localStorage.getItem('prop2')).to.eq('blue')
-      expect(localStorage.getItem('prop3')).to.eq('magenta')
-    })
-
-    // clearLocalStorage() yields the localStorage object
-    cy.clearLocalStorage().should((ls) => {
-      expect(ls.getItem('prop1')).to.be.null
-      expect(ls.getItem('prop2')).to.be.null
-      expect(ls.getItem('prop3')).to.be.null
-    })
-
-    // Clear key matching string in Local Storage
-    cy.get('.ls-btn').click().should(() => {
-      expect(localStorage.getItem('prop1')).to.eq('red')
-      expect(localStorage.getItem('prop2')).to.eq('blue')
-      expect(localStorage.getItem('prop3')).to.eq('magenta')
-    })
-
-    cy.clearLocalStorage('prop1').should((ls) => {
-      expect(ls.getItem('prop1')).to.be.null
-      expect(ls.getItem('prop2')).to.eq('blue')
-      expect(ls.getItem('prop3')).to.eq('magenta')
-    })
-
-    // Clear keys matching regex in Local Storage
-    cy.get('.ls-btn').click().should(() => {
-      expect(localStorage.getItem('prop1')).to.eq('red')
-      expect(localStorage.getItem('prop2')).to.eq('blue')
-      expect(localStorage.getItem('prop3')).to.eq('magenta')
-    })
-
-    cy.clearLocalStorage(/prop1|2/).should((ls) => {
-      expect(ls.getItem('prop1')).to.be.null
-      expect(ls.getItem('prop2')).to.be.null
-      expect(ls.getItem('prop3')).to.eq('magenta')
-    })
-  })
-})
diff --git a/cypress/integration/examples/location.spec.js b/cypress/integration/examples/location.spec.js
deleted file mode 100644
index 299867da..00000000
--- a/cypress/integration/examples/location.spec.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/// <reference types="cypress" />
-
-context('Location', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/location')
-  })
-
-  it('cy.hash() - get the current URL hash', () => {
-    // https://on.cypress.io/hash
-    cy.hash().should('be.empty')
-  })
-
-  it('cy.location() - get window.location', () => {
-    // https://on.cypress.io/location
-    cy.location().should((location) => {
-      expect(location.hash).to.be.empty
-      expect(location.href).to.eq('https://example.cypress.io/commands/location')
-      expect(location.host).to.eq('example.cypress.io')
-      expect(location.hostname).to.eq('example.cypress.io')
-      expect(location.origin).to.eq('https://example.cypress.io')
-      expect(location.pathname).to.eq('/commands/location')
-      expect(location.port).to.eq('')
-      expect(location.protocol).to.eq('https:')
-      expect(location.search).to.be.empty
-    })
-  })
-
-  it('cy.url() - get the current URL', () => {
-    // https://on.cypress.io/url
-    cy.url().should('eq', 'https://example.cypress.io/commands/location')
-  })
-})
diff --git a/cypress/integration/examples/misc.spec.js b/cypress/integration/examples/misc.spec.js
deleted file mode 100644
index 7222bf4b..00000000
--- a/cypress/integration/examples/misc.spec.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/// <reference types="cypress" />
-
-context('Misc', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/misc')
-  })
-
-  it('.end() - end the command chain', () => {
-    // https://on.cypress.io/end
-
-    // cy.end is useful when you want to end a chain of commands
-    // and force Cypress to re-query from the root element
-    cy.get('.misc-table').within(() => {
-      // ends the current chain and yields null
-      cy.contains('Cheryl').click().end()
-
-      // queries the entire table again
-      cy.contains('Charles').click()
-    })
-  })
-
-  it('cy.exec() - execute a system command', () => {
-    // execute a system command.
-    // so you can take actions necessary for
-    // your test outside the scope of Cypress.
-    // https://on.cypress.io/exec
-
-    // we can use Cypress.platform string to
-    // select appropriate command
-    // https://on.cypress/io/platform
-    cy.log(`Platform ${Cypress.platform} architecture ${Cypress.arch}`)
-
-    // on CircleCI Windows build machines we have a failure to run bash shell
-    // https://github.com/cypress-io/cypress/issues/5169
-    // so skip some of the tests by passing flag "--env circle=true"
-    const isCircleOnWindows = Cypress.platform === 'win32' && Cypress.env('circle')
-
-    if (isCircleOnWindows) {
-      cy.log('Skipping test on CircleCI')
-
-      return
-    }
-
-    // cy.exec problem on Shippable CI
-    // https://github.com/cypress-io/cypress/issues/6718
-    const isShippable = Cypress.platform === 'linux' && Cypress.env('shippable')
-
-    if (isShippable) {
-      cy.log('Skipping test on ShippableCI')
-
-      return
-    }
-
-    cy.exec('echo Jane Lane')
-      .its('stdout').should('contain', 'Jane Lane')
-
-    if (Cypress.platform === 'win32') {
-      cy.exec('print cypress.json')
-        .its('stderr').should('be.empty')
-    } else {
-      cy.exec('cat cypress.json')
-        .its('stderr').should('be.empty')
-
-      cy.exec('pwd')
-        .its('code').should('eq', 0)
-    }
-  })
-
-  it('cy.focused() - get the DOM element that has focus', () => {
-    // https://on.cypress.io/focused
-    cy.get('.misc-form').find('#name').click()
-    cy.focused().should('have.id', 'name')
-
-    cy.get('.misc-form').find('#description').click()
-    cy.focused().should('have.id', 'description')
-  })
-
-  context('Cypress.Screenshot', function () {
-    it('cy.screenshot() - take a screenshot', () => {
-      // https://on.cypress.io/screenshot
-      cy.screenshot('my-image')
-    })
-
-    it('Cypress.Screenshot.defaults() - change default config of screenshots', function () {
-      Cypress.Screenshot.defaults({
-        blackout: ['.foo'],
-        capture: 'viewport',
-        clip: { x: 0, y: 0, width: 200, height: 200 },
-        scale: false,
-        disableTimersAndAnimations: true,
-        screenshotOnRunFailure: true,
-        onBeforeScreenshot () { },
-        onAfterScreenshot () { },
-      })
-    })
-  })
-
-  it('cy.wrap() - wrap an object', () => {
-    // https://on.cypress.io/wrap
-    cy.wrap({ foo: 'bar' })
-      .should('have.property', 'foo')
-      .and('include', 'bar')
-  })
-})
diff --git a/cypress/integration/examples/navigation.spec.js b/cypress/integration/examples/navigation.spec.js
deleted file mode 100644
index b85a4689..00000000
--- a/cypress/integration/examples/navigation.spec.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/// <reference types="cypress" />
-
-context('Navigation', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io')
-    cy.get('.navbar-nav').contains('Commands').click()
-    cy.get('.dropdown-menu').contains('Navigation').click()
-  })
-
-  it('cy.go() - go back or forward in the browser\'s history', () => {
-    // https://on.cypress.io/go
-
-    cy.location('pathname').should('include', 'navigation')
-
-    cy.go('back')
-    cy.location('pathname').should('not.include', 'navigation')
-
-    cy.go('forward')
-    cy.location('pathname').should('include', 'navigation')
-
-    // clicking back
-    cy.go(-1)
-    cy.location('pathname').should('not.include', 'navigation')
-
-    // clicking forward
-    cy.go(1)
-    cy.location('pathname').should('include', 'navigation')
-  })
-
-  it('cy.reload() - reload the page', () => {
-    // https://on.cypress.io/reload
-    cy.reload()
-
-    // reload the page without using the cache
-    cy.reload(true)
-  })
-
-  it('cy.visit() - visit a remote url', () => {
-    // https://on.cypress.io/visit
-
-    // Visit any sub-domain of your current domain
-
-    // Pass options to the visit
-    cy.visit('https://example.cypress.io/commands/navigation', {
-      timeout: 50000, // increase total time for the visit to resolve
-      onBeforeLoad (contentWindow) {
-        // contentWindow is the remote page's window object
-        expect(typeof contentWindow === 'object').to.be.true
-      },
-      onLoad (contentWindow) {
-        // contentWindow is the remote page's window object
-        expect(typeof contentWindow === 'object').to.be.true
-      },
-    })
-    })
-})
diff --git a/cypress/integration/examples/network_requests.spec.js b/cypress/integration/examples/network_requests.spec.js
deleted file mode 100644
index 11213a0e..00000000
--- a/cypress/integration/examples/network_requests.spec.js
+++ /dev/null
@@ -1,163 +0,0 @@
-/// <reference types="cypress" />
-
-context('Network Requests', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/network-requests')
-  })
-
-  // Manage HTTP requests in your app
-
-  it('cy.request() - make an XHR request', () => {
-    // https://on.cypress.io/request
-    cy.request('https://jsonplaceholder.cypress.io/comments')
-      .should((response) => {
-        expect(response.status).to.eq(200)
-        // the server sometimes gets an extra comment posted from another machine
-        // which gets returned as 1 extra object
-        expect(response.body).to.have.property('length').and.be.oneOf([500, 501])
-        expect(response).to.have.property('headers')
-        expect(response).to.have.property('duration')
-      })
-  })
-
-  it('cy.request() - verify response using BDD syntax', () => {
-    cy.request('https://jsonplaceholder.cypress.io/comments')
-    .then((response) => {
-      // https://on.cypress.io/assertions
-      expect(response).property('status').to.equal(200)
-      expect(response).property('body').to.have.property('length').and.be.oneOf([500, 501])
-      expect(response).to.include.keys('headers', 'duration')
-    })
-  })
-
-  it('cy.request() with query parameters', () => {
-    // will execute request
-    // https://jsonplaceholder.cypress.io/comments?postId=1&id=3
-    cy.request({
-      url: 'https://jsonplaceholder.cypress.io/comments',
-      qs: {
-        postId: 1,
-        id: 3,
-      },
-    })
-    .its('body')
-    .should('be.an', 'array')
-    .and('have.length', 1)
-    .its('0') // yields first element of the array
-    .should('contain', {
-      postId: 1,
-      id: 3,
-    })
-  })
-
-  it('cy.request() - pass result to the second request', () => {
-    // first, let's find out the userId of the first user we have
-    cy.request('https://jsonplaceholder.cypress.io/users?_limit=1')
-      .its('body') // yields the response object
-      .its('0') // yields the first element of the returned list
-      // the above two commands its('body').its('0')
-      // can be written as its('body.0')
-      // if you do not care about TypeScript checks
-      .then((user) => {
-        expect(user).property('id').to.be.a('number')
-        // make a new post on behalf of the user
-        cy.request('POST', 'https://jsonplaceholder.cypress.io/posts', {
-          userId: user.id,
-          title: 'Cypress Test Runner',
-          body: 'Fast, easy and reliable testing for anything that runs in a browser.',
-        })
-      })
-      // note that the value here is the returned value of the 2nd request
-      // which is the new post object
-      .then((response) => {
-        expect(response).property('status').to.equal(201) // new entity created
-        expect(response).property('body').to.contain({
-          title: 'Cypress Test Runner',
-        })
-
-        // we don't know the exact post id - only that it will be > 100
-        // since JSONPlaceholder has built-in 100 posts
-        expect(response.body).property('id').to.be.a('number')
-          .and.to.be.gt(100)
-
-        // we don't know the user id here - since it was in above closure
-        // so in this test just confirm that the property is there
-        expect(response.body).property('userId').to.be.a('number')
-      })
-  })
-
-  it('cy.request() - save response in the shared test context', () => {
-    // https://on.cypress.io/variables-and-aliases
-    cy.request('https://jsonplaceholder.cypress.io/users?_limit=1')
-      .its('body').its('0') // yields the first element of the returned list
-      .as('user') // saves the object in the test context
-      .then(function () {
-        // NOTE 👀
-        //  By the time this callback runs the "as('user')" command
-        //  has saved the user object in the test context.
-        //  To access the test context we need to use
-        //  the "function () { ... }" callback form,
-        //  otherwise "this" points at a wrong or undefined object!
-        cy.request('POST', 'https://jsonplaceholder.cypress.io/posts', {
-          userId: this.user.id,
-          title: 'Cypress Test Runner',
-          body: 'Fast, easy and reliable testing for anything that runs in a browser.',
-        })
-        .its('body').as('post') // save the new post from the response
-      })
-      .then(function () {
-        // When this callback runs, both "cy.request" API commands have finished
-        // and the test context has "user" and "post" objects set.
-        // Let's verify them.
-        expect(this.post, 'post has the right user id').property('userId').to.equal(this.user.id)
-      })
-  })
-
-  it('cy.intercept() - route responses to matching requests', () => {
-    // https://on.cypress.io/intercept
-
-    let message = 'whoa, this comment does not exist'
-
-    // Listen to GET to comments/1
-    cy.intercept('GET', '**/comments/*').as('getComment')
-
-    // we have code that gets a comment when
-    // the button is clicked in scripts.js
-    cy.get('.network-btn').click()
-
-    // https://on.cypress.io/wait
-    cy.wait('@getComment').its('response.statusCode').should('be.oneOf', [200, 304])
-
-    // Listen to POST to comments
-    cy.intercept('POST', '**/comments').as('postComment')
-
-    // we have code that posts a comment when
-    // the button is clicked in scripts.js
-    cy.get('.network-post').click()
-    cy.wait('@postComment').should(({ request, response }) => {
-      expect(request.body).to.include('email')
-      expect(request.headers).to.have.property('content-type')
-      expect(response && response.body).to.have.property('name', 'Using POST in cy.intercept()')
-    })
-
-    // Stub a response to PUT comments/ ****
-    cy.intercept({
-      method: 'PUT',
-      url: '**/comments/*',
-    }, {
-      statusCode: 404,
-      body: { error: message },
-      headers: { 'access-control-allow-origin': '*' },
-      delayMs: 500,
-    }).as('putComment')
-
-    // we have code that puts a comment when
-    // the button is clicked in scripts.js
-    cy.get('.network-put').click()
-
-    cy.wait('@putComment')
-
-    // our 404 statusCode logic in scripts.js executed
-    cy.get('.network-put-comment').should('contain', message)
-  })
-})
diff --git a/cypress/integration/examples/querying.spec.js b/cypress/integration/examples/querying.spec.js
deleted file mode 100644
index 00970480..00000000
--- a/cypress/integration/examples/querying.spec.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/// <reference types="cypress" />
-
-context('Querying', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/querying')
-  })
-
-  // The most commonly used query is 'cy.get()', you can
-  // think of this like the '$' in jQuery
-
-  it('cy.get() - query DOM elements', () => {
-    // https://on.cypress.io/get
-
-    cy.get('#query-btn').should('contain', 'Button')
-
-    cy.get('.query-btn').should('contain', 'Button')
-
-    cy.get('#querying .well>button:first').should('contain', 'Button')
-    //              ↲
-    // Use CSS selectors just like jQuery
-
-    cy.get('[data-test-id="test-example"]').should('have.class', 'example')
-
-    // 'cy.get()' yields jQuery object, you can get its attribute
-    // by invoking `.attr()` method
-    cy.get('[data-test-id="test-example"]')
-      .invoke('attr', 'data-test-id')
-      .should('equal', 'test-example')
-
-    // or you can get element's CSS property
-    cy.get('[data-test-id="test-example"]')
-      .invoke('css', 'position')
-      .should('equal', 'static')
-
-    // or use assertions directly during 'cy.get()'
-    // https://on.cypress.io/assertions
-    cy.get('[data-test-id="test-example"]')
-      .should('have.attr', 'data-test-id', 'test-example')
-      .and('have.css', 'position', 'static')
-  })
-
-  it('cy.contains() - query DOM elements with matching content', () => {
-    // https://on.cypress.io/contains
-    cy.get('.query-list')
-      .contains('bananas')
-      .should('have.class', 'third')
-
-    // we can pass a regexp to `.contains()`
-    cy.get('.query-list')
-      .contains(/^b\w+/)
-      .should('have.class', 'third')
-
-    cy.get('.query-list')
-      .contains('apples')
-      .should('have.class', 'first')
-
-    // passing a selector to contains will
-    // yield the selector containing the text
-    cy.get('#querying')
-      .contains('ul', 'oranges')
-      .should('have.class', 'query-list')
-
-    cy.get('.query-button')
-      .contains('Save Form')
-      .should('have.class', 'btn')
-  })
-
-  it('.within() - query DOM elements within a specific element', () => {
-    // https://on.cypress.io/within
-    cy.get('.query-form').within(() => {
-      cy.get('input:first').should('have.attr', 'placeholder', 'Email')
-      cy.get('input:last').should('have.attr', 'placeholder', 'Password')
-    })
-  })
-
-  it('cy.root() - query the root DOM element', () => {
-    // https://on.cypress.io/root
-
-    // By default, root is the document
-    cy.root().should('match', 'html')
-
-    cy.get('.query-ul').within(() => {
-      // In this within, the root is now the ul DOM element
-      cy.root().should('have.class', 'query-ul')
-    })
-  })
-
-  it('best practices - selecting elements', () => {
-    // https://on.cypress.io/best-practices#Selecting-Elements
-    cy.get('[data-cy=best-practices-selecting-elements]').within(() => {
-      // Worst - too generic, no context
-      cy.get('button').click()
-
-      // Bad. Coupled to styling. Highly subject to change.
-      cy.get('.btn.btn-large').click()
-
-      // Average. Coupled to the `name` attribute which has HTML semantics.
-      cy.get('[name=submission]').click()
-
-      // Better. But still coupled to styling or JS event listeners.
-      cy.get('#main').click()
-
-      // Slightly better. Uses an ID but also ensures the element
-      // has an ARIA role attribute
-      cy.get('#main[role=button]').click()
-
-      // Much better. But still coupled to text content that may change.
-      cy.contains('Submit').click()
-
-      // Best. Insulated from all changes.
-      cy.get('[data-cy=submit]').click()
-    })
-  })
-})
diff --git a/cypress/integration/examples/spies_stubs_clocks.spec.js b/cypress/integration/examples/spies_stubs_clocks.spec.js
deleted file mode 100644
index 18b643ec..00000000
--- a/cypress/integration/examples/spies_stubs_clocks.spec.js
+++ /dev/null
@@ -1,205 +0,0 @@
-/// <reference types="cypress" />
-// remove no check once Cypress.sinon is typed
-// https://github.com/cypress-io/cypress/issues/6720
-
-context('Spies, Stubs, and Clock', () => {
-  it('cy.spy() - wrap a method in a spy', () => {
-    // https://on.cypress.io/spy
-    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
-
-    const obj = {
-      foo () {},
-    }
-
-    const spy = cy.spy(obj, 'foo').as('anyArgs')
-
-    obj.foo()
-
-    expect(spy).to.be.called
-  })
-
-  it('cy.spy() retries until assertions pass', () => {
-    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
-
-    const obj = {
-      /**
-       * Prints the argument passed
-       * @param x {any}
-      */
-      foo (x) {
-        console.log('obj.foo called with', x)
-      },
-    }
-
-    cy.spy(obj, 'foo').as('foo')
-
-    setTimeout(() => {
-      obj.foo('first')
-    }, 500)
-
-    setTimeout(() => {
-      obj.foo('second')
-    }, 2500)
-
-    cy.get('@foo').should('have.been.calledTwice')
-  })
-
-  it('cy.stub() - create a stub and/or replace a function with stub', () => {
-    // https://on.cypress.io/stub
-    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
-
-    const obj = {
-      /**
-       * prints both arguments to the console
-       * @param a {string}
-       * @param b {string}
-      */
-      foo (a, b) {
-        console.log('a', a, 'b', b)
-      },
-    }
-
-    const stub = cy.stub(obj, 'foo').as('foo')
-
-    obj.foo('foo', 'bar')
-
-    expect(stub).to.be.called
-  })
-
-  it('cy.clock() - control time in the browser', () => {
-    // https://on.cypress.io/clock
-
-    // create the date in UTC so its always the same
-    // no matter what local timezone the browser is running in
-    const now = new Date(Date.UTC(2017, 2, 14)).getTime()
-
-    cy.clock(now)
-    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
-    cy.get('#clock-div').click()
-      .should('have.text', '1489449600')
-  })
-
-  it('cy.tick() - move time in the browser', () => {
-    // https://on.cypress.io/tick
-
-    // create the date in UTC so its always the same
-    // no matter what local timezone the browser is running in
-    const now = new Date(Date.UTC(2017, 2, 14)).getTime()
-
-    cy.clock(now)
-    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
-    cy.get('#tick-div').click()
-      .should('have.text', '1489449600')
-
-    cy.tick(10000) // 10 seconds passed
-    cy.get('#tick-div').click()
-      .should('have.text', '1489449610')
-  })
-
-  it('cy.stub() matches depending on arguments', () => {
-    // see all possible matchers at
-    // https://sinonjs.org/releases/latest/matchers/
-    const greeter = {
-      /**
-       * Greets a person
-       * @param {string} name
-      */
-      greet (name) {
-        return `Hello, ${name}!`
-      },
-    }
-
-    cy.stub(greeter, 'greet')
-      .callThrough() // if you want non-matched calls to call the real method
-      .withArgs(Cypress.sinon.match.string).returns('Hi')
-      .withArgs(Cypress.sinon.match.number).throws(new Error('Invalid name'))
-
-    expect(greeter.greet('World')).to.equal('Hi')
-    // @ts-ignore
-    expect(() => greeter.greet(42)).to.throw('Invalid name')
-    expect(greeter.greet).to.have.been.calledTwice
-
-    // non-matched calls goes the actual method
-    // @ts-ignore
-    expect(greeter.greet()).to.equal('Hello, undefined!')
-  })
-
-  it('matches call arguments using Sinon matchers', () => {
-    // see all possible matchers at
-    // https://sinonjs.org/releases/latest/matchers/
-    const calculator = {
-      /**
-       * returns the sum of two arguments
-       * @param a {number}
-       * @param b {number}
-      */
-      add (a, b) {
-        return a + b
-      },
-    }
-
-    const spy = cy.spy(calculator, 'add').as('add')
-
-    expect(calculator.add(2, 3)).to.equal(5)
-
-    // if we want to assert the exact values used during the call
-    expect(spy).to.be.calledWith(2, 3)
-
-    // let's confirm "add" method was called with two numbers
-    expect(spy).to.be.calledWith(Cypress.sinon.match.number, Cypress.sinon.match.number)
-
-    // alternatively, provide the value to match
-    expect(spy).to.be.calledWith(Cypress.sinon.match(2), Cypress.sinon.match(3))
-
-    // match any value
-    expect(spy).to.be.calledWith(Cypress.sinon.match.any, 3)
-
-    // match any value from a list
-    expect(spy).to.be.calledWith(Cypress.sinon.match.in([1, 2, 3]), 3)
-
-    /**
-     * Returns true if the given number is event
-     * @param {number} x
-     */
-    const isEven = (x) => x % 2 === 0
-
-    // expect the value to pass a custom predicate function
-    // the second argument to "sinon.match(predicate, message)" is
-    // shown if the predicate does not pass and assertion fails
-    expect(spy).to.be.calledWith(Cypress.sinon.match(isEven, 'isEven'), 3)
-
-    /**
-     * Returns a function that checks if a given number is larger than the limit
-     * @param {number} limit
-     * @returns {(x: number) => boolean}
-     */
-    const isGreaterThan = (limit) => (x) => x > limit
-
-    /**
-     * Returns a function that checks if a given number is less than the limit
-     * @param {number} limit
-     * @returns {(x: number) => boolean}
-     */
-    const isLessThan = (limit) => (x) => x < limit
-
-    // you can combine several matchers using "and", "or"
-    expect(spy).to.be.calledWith(
-      Cypress.sinon.match.number,
-      Cypress.sinon.match(isGreaterThan(2), '> 2').and(Cypress.sinon.match(isLessThan(4), '< 4')),
-    )
-
-    expect(spy).to.be.calledWith(
-      Cypress.sinon.match.number,
-      Cypress.sinon.match(isGreaterThan(200), '> 200').or(Cypress.sinon.match(3)),
-    )
-
-    // matchers can be used from BDD assertions
-    cy.get('@add').should('have.been.calledWith',
-      Cypress.sinon.match.number, Cypress.sinon.match(3))
-
-    // you can alias matchers for shorter test code
-    const { match: M } = Cypress.sinon
-
-    cy.get('@add').should('have.been.calledWith', M.number, M(3))
-  })
-})
diff --git a/cypress/integration/examples/traversal.spec.js b/cypress/integration/examples/traversal.spec.js
deleted file mode 100644
index 0a3b9d33..00000000
--- a/cypress/integration/examples/traversal.spec.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/// <reference types="cypress" />
-
-context('Traversal', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/traversal')
-  })
-
-  it('.children() - get child DOM elements', () => {
-    // https://on.cypress.io/children
-    cy.get('.traversal-breadcrumb')
-      .children('.active')
-      .should('contain', 'Data')
-  })
-
-  it('.closest() - get closest ancestor DOM element', () => {
-    // https://on.cypress.io/closest
-    cy.get('.traversal-badge')
-      .closest('ul')
-      .should('have.class', 'list-group')
-  })
-
-  it('.eq() - get a DOM element at a specific index', () => {
-    // https://on.cypress.io/eq
-    cy.get('.traversal-list>li')
-      .eq(1).should('contain', 'siamese')
-  })
-
-  it('.filter() - get DOM elements that match the selector', () => {
-    // https://on.cypress.io/filter
-    cy.get('.traversal-nav>li')
-      .filter('.active').should('contain', 'About')
-  })
-
-  it('.find() - get descendant DOM elements of the selector', () => {
-    // https://on.cypress.io/find
-    cy.get('.traversal-pagination')
-      .find('li').find('a')
-      .should('have.length', 7)
-  })
-
-  it('.first() - get first DOM element', () => {
-    // https://on.cypress.io/first
-    cy.get('.traversal-table td')
-      .first().should('contain', '1')
-  })
-
-  it('.last() - get last DOM element', () => {
-    // https://on.cypress.io/last
-    cy.get('.traversal-buttons .btn')
-      .last().should('contain', 'Submit')
-  })
-
-  it('.next() - get next sibling DOM element', () => {
-    // https://on.cypress.io/next
-    cy.get('.traversal-ul')
-      .contains('apples').next().should('contain', 'oranges')
-  })
-
-  it('.nextAll() - get all next sibling DOM elements', () => {
-    // https://on.cypress.io/nextall
-    cy.get('.traversal-next-all')
-      .contains('oranges')
-      .nextAll().should('have.length', 3)
-  })
-
-  it('.nextUntil() - get next sibling DOM elements until next el', () => {
-    // https://on.cypress.io/nextuntil
-    cy.get('#veggies')
-      .nextUntil('#nuts').should('have.length', 3)
-  })
-
-  it('.not() - remove DOM elements from set of DOM elements', () => {
-    // https://on.cypress.io/not
-    cy.get('.traversal-disabled .btn')
-      .not('[disabled]').should('not.contain', 'Disabled')
-  })
-
-  it('.parent() - get parent DOM element from DOM elements', () => {
-    // https://on.cypress.io/parent
-    cy.get('.traversal-mark')
-      .parent().should('contain', 'Morbi leo risus')
-  })
-
-  it('.parents() - get parent DOM elements from DOM elements', () => {
-    // https://on.cypress.io/parents
-    cy.get('.traversal-cite')
-      .parents().should('match', 'blockquote')
-  })
-
-  it('.parentsUntil() - get parent DOM elements from DOM elements until el', () => {
-    // https://on.cypress.io/parentsuntil
-    cy.get('.clothes-nav')
-      .find('.active')
-      .parentsUntil('.clothes-nav')
-      .should('have.length', 2)
-  })
-
-  it('.prev() - get previous sibling DOM element', () => {
-    // https://on.cypress.io/prev
-    cy.get('.birds').find('.active')
-      .prev().should('contain', 'Lorikeets')
-  })
-
-  it('.prevAll() - get all previous sibling DOM elements', () => {
-    // https://on.cypress.io/prevall
-    cy.get('.fruits-list').find('.third')
-      .prevAll().should('have.length', 2)
-  })
-
-  it('.prevUntil() - get all previous sibling DOM elements until el', () => {
-    // https://on.cypress.io/prevuntil
-    cy.get('.foods-list').find('#nuts')
-      .prevUntil('#veggies').should('have.length', 3)
-  })
-
-  it('.siblings() - get all sibling DOM elements', () => {
-    // https://on.cypress.io/siblings
-    cy.get('.traversal-pills .active')
-      .siblings().should('have.length', 2)
-  })
-})
diff --git a/cypress/integration/examples/utilities.spec.js b/cypress/integration/examples/utilities.spec.js
deleted file mode 100644
index 24e61a6a..00000000
--- a/cypress/integration/examples/utilities.spec.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/// <reference types="cypress" />
-
-context('Utilities', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/utilities')
-  })
-
-  it('Cypress._ - call a lodash method', () => {
-    // https://on.cypress.io/_
-    cy.request('https://jsonplaceholder.cypress.io/users')
-      .then((response) => {
-        let ids = Cypress._.chain(response.body).map('id').take(3).value()
-
-        expect(ids).to.deep.eq([1, 2, 3])
-      })
-  })
-
-  it('Cypress.$ - call a jQuery method', () => {
-    // https://on.cypress.io/$
-    let $li = Cypress.$('.utility-jquery li:first')
-
-    cy.wrap($li)
-      .should('not.have.class', 'active')
-      .click()
-      .should('have.class', 'active')
-  })
-
-  it('Cypress.Blob - blob utilities and base64 string conversion', () => {
-    // https://on.cypress.io/blob
-    cy.get('.utility-blob').then(($div) => {
-      // https://github.com/nolanlawson/blob-util#imgSrcToDataURL
-      // get the dataUrl string for the javascript-logo
-      return Cypress.Blob.imgSrcToDataURL('https://example.cypress.io/assets/img/javascript-logo.png', undefined, 'anonymous')
-      .then((dataUrl) => {
-        // create an <img> element and set its src to the dataUrl
-        let img = Cypress.$('<img />', { src: dataUrl })
-
-        // need to explicitly return cy here since we are initially returning
-        // the Cypress.Blob.imgSrcToDataURL promise to our test
-        // append the image
-        $div.append(img)
-
-        cy.get('.utility-blob img').click()
-          .should('have.attr', 'src', dataUrl)
-      })
-    })
-  })
-
-  it('Cypress.minimatch - test out glob patterns against strings', () => {
-    // https://on.cypress.io/minimatch
-    let matching = Cypress.minimatch('/users/1/comments', '/users/*/comments', {
-      matchBase: true,
-    })
-
-    expect(matching, 'matching wildcard').to.be.true
-
-    matching = Cypress.minimatch('/users/1/comments/2', '/users/*/comments', {
-      matchBase: true,
-    })
-
-    expect(matching, 'comments').to.be.false
-
-    // ** matches against all downstream path segments
-    matching = Cypress.minimatch('/foo/bar/baz/123/quux?a=b&c=2', '/foo/**', {
-      matchBase: true,
-    })
-
-    expect(matching, 'comments').to.be.true
-
-    // whereas * matches only the next path segment
-
-    matching = Cypress.minimatch('/foo/bar/baz/123/quux?a=b&c=2', '/foo/*', {
-      matchBase: false,
-    })
-
-    expect(matching, 'comments').to.be.false
-  })
-
-  it('Cypress.Promise - instantiate a bluebird promise', () => {
-    // https://on.cypress.io/promise
-    let waited = false
-
-    /**
-     * @return Bluebird<string>
-     */
-    function waitOneSecond () {
-      // return a promise that resolves after 1 second
-      // @ts-ignore TS2351 (new Cypress.Promise)
-      return new Cypress.Promise((resolve, reject) => {
-        setTimeout(() => {
-          // set waited to true
-          waited = true
-
-          // resolve with 'foo' string
-          resolve('foo')
-        }, 1000)
-      })
-    }
-
-    cy.then(() => {
-      // return a promise to cy.then() that
-      // is awaited until it resolves
-      // @ts-ignore TS7006
-      return waitOneSecond().then((str) => {
-        expect(str).to.eq('foo')
-        expect(waited).to.be.true
-      })
-    })
-  })
-})
diff --git a/cypress/integration/examples/viewport.spec.js b/cypress/integration/examples/viewport.spec.js
deleted file mode 100644
index dbcd7eed..00000000
--- a/cypress/integration/examples/viewport.spec.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/// <reference types="cypress" />
-
-context('Viewport', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/viewport')
-  })
-
-  it('cy.viewport() - set the viewport size and dimension', () => {
-    // https://on.cypress.io/viewport
-
-    cy.get('#navbar').should('be.visible')
-    cy.viewport(320, 480)
-
-    // the navbar should have collapse since our screen is smaller
-    cy.get('#navbar').should('not.be.visible')
-    cy.get('.navbar-toggle').should('be.visible').click()
-    cy.get('.nav').find('a').should('be.visible')
-
-    // lets see what our app looks like on a super large screen
-    cy.viewport(2999, 2999)
-
-    // cy.viewport() accepts a set of preset sizes
-    // to easily set the screen to a device's width and height
-
-    // We added a cy.wait() between each viewport change so you can see
-    // the change otherwise it is a little too fast to see :)
-
-    cy.viewport('macbook-15')
-    cy.wait(200)
-    cy.viewport('macbook-13')
-    cy.wait(200)
-    cy.viewport('macbook-11')
-    cy.wait(200)
-    cy.viewport('ipad-2')
-    cy.wait(200)
-    cy.viewport('ipad-mini')
-    cy.wait(200)
-    cy.viewport('iphone-6+')
-    cy.wait(200)
-    cy.viewport('iphone-6')
-    cy.wait(200)
-    cy.viewport('iphone-5')
-    cy.wait(200)
-    cy.viewport('iphone-4')
-    cy.wait(200)
-    cy.viewport('iphone-3')
-    cy.wait(200)
-
-    // cy.viewport() accepts an orientation for all presets
-    // the default orientation is 'portrait'
-    cy.viewport('ipad-2', 'portrait')
-    cy.wait(200)
-    cy.viewport('iphone-4', 'landscape')
-    cy.wait(200)
-
-    // The viewport will be reset back to the default dimensions
-    // in between tests (the  default can be set in cypress.json)
-  })
-})
diff --git a/cypress/integration/examples/waiting.spec.js b/cypress/integration/examples/waiting.spec.js
deleted file mode 100644
index c8f0d7c6..00000000
--- a/cypress/integration/examples/waiting.spec.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/// <reference types="cypress" />
-
-context('Waiting', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/waiting')
-  })
-  // BE CAREFUL of adding unnecessary wait times.
-  // https://on.cypress.io/best-practices#Unnecessary-Waiting
-
-  // https://on.cypress.io/wait
-  it('cy.wait() - wait for a specific amount of time', () => {
-    cy.get('.wait-input1').type('Wait 1000ms after typing')
-    cy.wait(1000)
-    cy.get('.wait-input2').type('Wait 1000ms after typing')
-    cy.wait(1000)
-    cy.get('.wait-input3').type('Wait 1000ms after typing')
-    cy.wait(1000)
-  })
-
-  it('cy.wait() - wait for a specific route', () => {
-    // Listen to GET to comments/1
-    cy.intercept('GET', '**/comments/*').as('getComment')
-
-    // we have code that gets a comment when
-    // the button is clicked in scripts.js
-    cy.get('.network-btn').click()
-
-    // wait for GET comments/1
-    cy.wait('@getComment').its('response.statusCode').should('be.oneOf', [200, 304])
-  })
-})
diff --git a/cypress/integration/examples/window.spec.js b/cypress/integration/examples/window.spec.js
deleted file mode 100644
index f94b6497..00000000
--- a/cypress/integration/examples/window.spec.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/// <reference types="cypress" />
-
-context('Window', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/window')
-  })
-
-  it('cy.window() - get the global window object', () => {
-    // https://on.cypress.io/window
-    cy.window().should('have.property', 'top')
-  })
-
-  it('cy.document() - get the document object', () => {
-    // https://on.cypress.io/document
-    cy.document().should('have.property', 'charset').and('eq', 'UTF-8')
-  })
-
-  it('cy.title() - get the title', () => {
-    // https://on.cypress.io/title
-    cy.title().should('include', 'Kitchen Sink')
-  })
-})
diff --git a/cypress/integration/features/burn.spec.ts b/cypress/integration/features/burn.spec.ts
deleted file mode 100644
index fad4b563..00000000
--- a/cypress/integration/features/burn.spec.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/// <reference types="cypress" />
-
-context("Features: Burn", () => {
-  beforeEach(() => {
-    cy.visit("/burn");
-  });
-
-  describe("Loading", () => {
-    it("should load inside the layout", () =>
-      cy.grab("layout").should("be.visible"));
-  });
-});
diff --git a/cypress/integration/features/mint.spec.ts b/cypress/integration/features/mint.spec.ts
deleted file mode 100644
index 34a3abaf..00000000
--- a/cypress/integration/features/mint.spec.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/// <reference types="cypress" />
-
-context("Features: Mint", () => {
-  beforeEach(() => {
-    cy.visit("/mint");
-  });
-
-  describe("Loading", () => {
-    it("should load inside the layout", () =>
-      cy.grab("layout").should("be.visible"));
-  });
-});
diff --git a/cypress/integration/features/swap.spec.ts b/cypress/integration/features/swap.spec.ts
deleted file mode 100644
index 12e5e9c0..00000000
--- a/cypress/integration/features/swap.spec.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/// <reference types="cypress" />
-
-context("Features: Swap", () => {
-  beforeEach(() => {
-    cy.visit("/swap");
-  });
-
-  describe("Loading", () => {
-    it("should load inside the layout", () =>
-      cy.grab("layout").should("be.visible"));
-  });
-});
diff --git a/cypress/integration/features/trade.spec.ts b/cypress/integration/features/trade.spec.ts
deleted file mode 100644
index 59704787..00000000
--- a/cypress/integration/features/trade.spec.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/// <reference types="cypress" />
-
-context("Features: Trade", () => {
-  beforeEach(() => {
-    cy.visit("/trade");
-  });
-
-  describe("Loading", () => {
-    it("should load inside the layout", () =>
-      cy.grab("layout").should("be.visible"));
-  });
-});
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
deleted file mode 100644
index aa9918d2..00000000
--- a/cypress/plugins/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/// <reference types="cypress" />
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-/**
- * @type {Cypress.PluginConfig}
- */
-module.exports = (on, config) => {
-  // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
-}
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
deleted file mode 100644
index bd5fe549..00000000
--- a/cypress/support/commands.js
+++ /dev/null
@@ -1 +0,0 @@
-Cypress.Commands.add("grab", (id) => cy.get(`[data-testid="${id}"]`));
diff --git a/cypress/support/index.d.ts b/cypress/support/index.d.ts
deleted file mode 100644
index abd986ce..00000000
--- a/cypress/support/index.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare namespace Cypress {
-  interface Chainable {
-    grab(id: string): Chainable<Element>;
-  }
-}
diff --git a/cypress/support/index.js b/cypress/support/index.js
deleted file mode 100644
index d68db96d..00000000
--- a/cypress/support/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import './commands'
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
deleted file mode 100644
index f87a578b..00000000
--- a/cypress/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "lib": ["es5", "dom"],
-    "types": ["cypress"]
-  },
-  "include": ["**/*.ts"]
-}
diff --git a/package.json b/package.json
index 192cabaf..ee61d204 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,6 @@
     "react": "^17.0.1",
     "react-device-detect": "^1.17.0",
     "react-dom": "^17.0.1",
-    "react-ga": "^3.3.0",
     "react-helmet": "^6.1.0",
     "react-icons": "^4.2.0",
     "react-identicons": "^1.2.5",
@@ -70,8 +69,6 @@
     "@babel/plugin-proposal-class-properties": "^7.12.13",
     "@babel/preset-typescript": "^7.12.16",
     "@graphql-codegen/cli": "^1.20.1",
-    "@storybook/react": "^6.1.18",
-    "@storybook/storybook-deployer": "^2.8.7",
     "@typechain/ethers-v5": "^7.0.0",
     "@types/antd": "^1.0.0",
     "@types/classnames": "^2.2.11",
@@ -128,7 +125,6 @@
     "build:themes": "THEME=dark node ./scripts/build-themes && THEME=light node ./scripts/build-themes && THEME=outrun node ./scripts/build-themes",
     "build:server": "NODE_ENV=development IS_SERVER=true node ./scripts/build-server",
     "build:production-server": "NODE_ENV=production IS_SERVER=true node ./scripts/build-server",
-    "build:storybook": "build-storybook",
     "build:types": "graphql-codegen",
     "check:circulars": "madge --circular --warning --extensions ts,tsx --ts-config=tsconfig.json ./src",
     "check:types": "ttsc --noEmit",
@@ -136,10 +132,7 @@
     "lint": "eslint . --fix --ignore-path .gitignore --ext .ts,.tsx,.js",
     "start": "react-app-rewired start",
     "start:server": "node ./webpack/run-server",
-    "storybook": "start-storybook -p 6006",
-    "storybook:deploy": "storybook-to-ghpages",
     "test": "react-app-rewired test",
-    "test:integration": "cypress open",
     "test:unit": "node scripts/test",
     "watch:data": "nodemon --watch ./data --exec \"node ./scripts/build-data.js\" -e js,md",
     "watch:themes": "nodemon --watch ./src/theme --exec \"THEME=dark node ./scripts/build-themes && THEME=light node ./scripts/build-themes\" -e less",
@@ -159,7 +152,6 @@
     "ignorePatterns": [
       "**/*.d.ts",
       "scripts/**/*",
-      "cypress/**/*",
       "**/*.js"
     ],
     "parser": "@typescript-eslint/parser",
diff --git a/public/index.html b/public/index.html
index 3eb25d6a..95135ddd 100644
--- a/public/index.html
+++ b/public/index.html
@@ -26,14 +26,5 @@
       type="text/javascript"
       src="https://cdnjs.cloudflare.com/ajax/libs/less.js/2.7.3/less.min.js"
     ></script>
-    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=G-9NM41WZZ12"></script>
-    <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag(){dataLayer.push(arguments);}
-      gtag('js', new Date());
-
-      gtag('config', 'G-9NM41WZZ12');
-    </script>
   </body>
 </html>
diff --git a/src/App.tsx b/src/App.tsx
index 329fdf8e..8f409993 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -21,24 +21,12 @@ import { ethers } from "ethers";
 import { routes } from "routes";
 import { store } from "features";
 import { useBreakpoints, useChainId, useWalletConnection } from "hooks";
-import ReactGA from "react-ga";
-
-const GOOGLE_ANALYTICS_TRACKING_CODE = "G-MHCR3CSH7C";
 
 export function getLibrary(_provider?: any, _connector?: any) {
   return new ethers.providers.Web3Provider(_provider, "any");
 }
 
-// Effect:
-// Run Google Analytics when user loads the production site.
 export function App() {
-  useEffect(() => {
-    if (process.env.NODE_ENV === "production") {
-      ReactGA.initialize(GOOGLE_ANALYTICS_TRACKING_CODE);
-      ReactGA.pageview(window.location.pathname + window.location.search);
-    }
-  }, []);
-
   return (
     <BrowserRouter>
       <Provider store={store}>
@@ -61,8 +49,8 @@ export function AppLayout() {
   const { pathname } = useLocation();
   const previousLocation = useRef(pathname);
   const { isMobile } = useBreakpoints();
-  const network = useChainId()
-  const badNetwork = useMemo(() => !NETWORKS_BY_ID[network], [network])
+  const network = useChainId();
+  const badNetwork = useMemo(() => !NETWORKS_BY_ID[network], [network]);
   const inner = (
     <>
       <LayoutHeader />
diff --git a/src/components/atomic/atoms/NirnProtocol.tsx b/src/components/atomic/atoms/NirnProtocol.tsx
deleted file mode 100644
index fba3b399..00000000
--- a/src/components/atomic/atoms/NirnProtocol.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { ReactNode } from "react";
-import { Space } from "antd";
-
-interface Props {
-  name: string;
-  size?: "tiny" | "small" | "medium" | "large";
-  style?: any;
-  showName?: boolean;
-}
-
-const nameLookup: Record<string, string> = {
-  'compound': 'comp',
-  'aavev1': 'aave',
-  'aavev2': 'aave'
-}
-
-export function NirnProtocol({
-  showName = false,
-  name,
-  size = "small",
-  style,
-  ...rest
-}: Props) {
-  const tokenImageSize = {
-    tiny: 16,
-    small: 20,
-    medium: 28,
-    large: 36,
-  }[size];
-  const fontSize = size === "tiny" || size === "small" ? 16 : 24;
-
-  let image: string | ReactNode = "";
-
-  let formattedName = name.toLowerCase().replace(/ /g, '');
-  if (nameLookup[formattedName]) {
-    formattedName = nameLookup[formattedName]
-  }
-
-  try { image = require(`images/${formattedName.toLowerCase()}.png`).default; }
-  catch { image = "" }
-
-  return (
-    <Space size="small" style={style}>
-      {image && (
-        <>
-          {typeof image === "string" ? (
-            <img
-              alt={name}
-              src={image}
-              {...rest}
-              style={{
-                width: tokenImageSize,
-                height: tokenImageSize,
-              }}
-            />
-          ) : (
-            image
-          )}
-        </>
-      )}
-
-      {showName && (
-        <Space size="small" style={{ fontSize }}>
-          {name}
-        </Space>
-      )}
-    </Space>
-  );
-}
diff --git a/src/components/atomic/atoms/index.ts b/src/components/atomic/atoms/index.ts
index 309beae4..5c74b5d4 100644
--- a/src/components/atomic/atoms/index.ts
+++ b/src/components/atomic/atoms/index.ts
@@ -6,7 +6,6 @@ export * from './ErrorBoundary';
 export * from './ExternalLink';
 export * from './Flipper';
 export * from './Label';
-export * from './NirnProtocol';
 export * from './Progress';
 export * from './Token';
 export * from './TokenInputDecorator';
\ No newline at end of file
diff --git a/src/components/atomic/molecules/Navigation.tsx b/src/components/atomic/molecules/Navigation.tsx
index fbd2e9c2..bbb05d36 100644
--- a/src/components/atomic/molecules/Navigation.tsx
+++ b/src/components/atomic/molecules/Navigation.tsx
@@ -1,4 +1,3 @@
-import { AiOutlineUser } from "react-icons/ai";
 import { ExternalLink } from "components/atomic/atoms";
 import { FEATURE_FLAGS } from "feature-flags";
 import { FaGavel, FaListUl, FaSwimmingPool } from "react-icons/fa";
@@ -7,31 +6,40 @@ import { Link, useLocation } from "react-router-dom";
 import { Menu, Space } from "antd";
 import { NETWORKS, SUPPORTED_NETWORKS } from "../../../config/network";
 import { RiSafe2Line } from "react-icons/ri";
-import { useBreakpoints, useChainId, useRequestChangeNetworkCallback, useTranslator } from "hooks";
+import {
+  useBreakpoints,
+  useChainId,
+  useRequestChangeNetworkCallback,
+} from "hooks";
 import { useMemo } from "react";
 import Icon from "@ant-design/icons";
 
 const NETWORKS_BY_ID: Record<number, any> = {
-  '1': NETWORKS.mainnet,
-  '137': NETWORKS.polygon
-}
+  1: NETWORKS.mainnet,
+  137: NETWORKS.polygon,
+};
 
-function NetworkIcon({ chainId }: {chainId: number}) {
-  return <img style={{ height: '2em'}} src={require(`images/${NETWORKS_BY_ID[chainId].icon}`).default} />
+function NetworkIcon({ chainId }: { chainId: number }) {
+  return (
+    <img
+      alt={`${chainId}-icon`}
+      style={{ height: "2em" }}
+      src={require(`images/${NETWORKS_BY_ID[chainId].icon}`).default}
+    />
+  );
 }
 
 // const MaticIcon = () => <img src={MaticIconSvg} />;
 // const NetworkIcon = (chainId: number) => <img style={{ height: '2em'}} src={require(`images/${NETWORKS_BY_ID[chainId].icon}`).default} />
 
 export function Navigation() {
-  const tx = useTranslator();
   const { isMobile } = useBreakpoints();
   const { pathname } = useLocation();
   const chainId = useChainId();
-  const requestChangeNetwork = useRequestChangeNetworkCallback()
+  const requestChangeNetwork = useRequestChangeNetworkCallback();
 
   const selectedKey = useMemo(() => {
-    for (const link of ["portfolio", "staking", "index-pools"]) {
+    for (const link of ["index-pools"]) {
       if (pathname.includes(link)) {
         return link;
       }
@@ -65,14 +73,6 @@ export function Navigation() {
             </Space>
           </Link>
         </Menu.Item>
-        <Menu.Item key="vaults">
-          <Link to="/vaults">
-            <Space size="small">
-              <RiSafe2Line style={{ position: "relative", top: 2 }} />{" "}
-              {!isMobile && <span>Vaults</span>}
-            </Space>
-          </Link>
-        </Menu.Item>
         <Menu.Item key="timelocks">
           <Link to="/timelocks">
             <Space size="small">
@@ -81,26 +81,11 @@ export function Navigation() {
             </Space>
           </Link>
         </Menu.Item>
-        <Menu.Item key="staking">
-          <Link to="/staking">
-            <Space>
-              <RiSafe2Line style={{ position: "relative", top: 2 }} />{" "}
-              {!isMobile && <span>Staking</span>}
-            </Space>
-          </Link>
-        </Menu.Item>
       </Menu.SubMenu>
-      <Menu.Item key="portfolio">
-        <Link to="/portfolio">
-          <Space size="small">
-            <AiOutlineUser style={{ position: "relative", top: 2 }} />{" "}
-            {!isMobile && <span>{tx("PORTFOLIO")}</span>}
-          </Space>
-        </Link>
-      </Menu.Item>
+
       <Menu.Item>
         <ExternalLink
-          to="https://legacy.indexed.finance/governance"
+          to="https://www.tally.xyz/governance/eip155:1:0x95129751769f99CC39824a0793eF4933DD8Bb74B"
           withIcon={false}
         >
           <Space size="small">
@@ -111,20 +96,35 @@ export function Navigation() {
       </Menu.Item>
       <Menu.SubMenu
         title={NETWORKS_BY_ID[chainId].name}
-        icon={<Icon component={() => <NetworkIcon chainId={chainId} />} style={{ position: "relative", top: -2, left: -10 }} />}
+        icon={
+          <Icon
+            component={() => <NetworkIcon chainId={chainId} />}
+            style={{ position: "relative", top: -2, left: -10 }}
+          />
+        }
       >
         {SUPPORTED_NETWORKS.filter((n) => n !== chainId).map((id) => {
           const { name } = NETWORKS_BY_ID[id];
-          return <Menu.Item key={`${name}-network`} onClick={() => requestChangeNetwork(id)}>
-          {/* <Link to="/index-pools"> */}
-            <Space size="large">
-              <Icon component={() => <NetworkIcon chainId={id} />} style={{ position: "relative", top: -4 }}  />
-              <span style={{ textTransform: "uppercase", fontSize: 20 }}>{name}</span>
-            </Space>
-          {/* </Link> */}
-        </Menu.Item>
+          return (
+            <Menu.Item
+              key={`${name}-network`}
+              onClick={() => requestChangeNetwork(id)}
+            >
+              {/* <Link to="/index-pools"> */}
+              <Space size="large">
+                <Icon
+                  component={() => <NetworkIcon chainId={id} />}
+                  style={{ position: "relative", top: -4 }}
+                />
+                <span style={{ textTransform: "uppercase", fontSize: 20 }}>
+                  {name}
+                </span>
+              </Space>
+              {/* </Link> */}
+            </Menu.Item>
+          );
         })}
-       {/*  <Menu.Item key="eth-network">
+        {/*  <Menu.Item key="eth-network">
           <Link to="/index-pools">
             <Space size="large">
               <Icon component={MaticIcon} style={{ position: "relative", top: -4 }}  />{" "}
diff --git a/src/components/atomic/organisms/IndexPoolChart.tsx b/src/components/atomic/organisms/IndexPoolChart.tsx
index ade3a0c7..81f78b41 100644
--- a/src/components/atomic/organisms/IndexPoolChart.tsx
+++ b/src/components/atomic/organisms/IndexPoolChart.tsx
@@ -1,11 +1,11 @@
-import { AppState, Timeframe, requests, selectors } from "features";
-import { Card, Radio, RadioChangeEvent, Spin } from "antd";
-import { LineSeriesChart, Quote } from "components/atomic/molecules";
-import { convert } from "helpers";
-import { last, useFormattedIndexPool } from "hooks";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { useDispatch, useSelector } from "react-redux";
-import noop from "lodash.noop";
+import { AppState, Timeframe, requests, selectors } from 'features';
+import { Card, Radio, RadioChangeEvent, Spin } from 'antd';
+import { LineSeriesChart, Quote } from 'components/atomic/molecules';
+import { convert } from 'helpers';
+import { last, useFormattedIndexPool } from 'hooks';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import noop from 'lodash.noop';
 
 interface Props {
   poolId: string;
@@ -14,15 +14,16 @@ interface Props {
 
 export function IndexPoolChart({ poolId, expanded = false }: Props) {
   const dispatch = useDispatch();
-  const [timeframe, setTimeframe] = useState<Timeframe>("1W");
+  const [timeframe, setTimeframe] = useState<Timeframe>('1W');
   const [rerendering, setRerendering] = useState(false);
   const data = useSelector((state: AppState) =>
-    selectors.selectTimeSeriesSnapshotData(state, poolId, timeframe, "value")
+    selectors.selectTimeSeriesSnapshotData(state, poolId, timeframe, 'value')
   );
-  const [historicalData, setHistoricalData] = useState<null | {
-    when: string;
-    price: string;
-  }>(null);
+  const [historicalData, setHistoricalData] =
+    useState<null | {
+      when: string;
+      price: string;
+    }>(null);
   const [netChange, netChangePercent] = useMemo(() => {
     const _first = data[0];
     const _last = last(data);
@@ -32,11 +33,11 @@ export function IndexPoolChart({ poolId, expanded = false }: Props) {
       : [0, 0];
     const delta = currentValue - firstValue;
     return [
-      convert.toCurrency(delta, { signDisplay: "always" }),
-      convert.toPercent(delta / firstValue, { signDisplay: "always" }),
+      convert.toCurrency(delta, { signDisplay: 'always' }),
+      convert.toPercent(delta / firstValue, { signDisplay: 'always' }),
     ];
   }, [data]);
-  const formattedPool = useFormattedIndexPool(poolId)
+  const formattedPool = useFormattedIndexPool(poolId);
   const handleTimeframeChange = useCallback(
     (event: RadioChangeEvent) => setTimeframe(event.target.value),
     []
@@ -46,18 +47,18 @@ export function IndexPoolChart({ poolId, expanded = false }: Props) {
     setRerendering(true);
     setTimeout(() => setRerendering(false), 0);
 
-    dispatch(requests.fetchSnapshotsData({ poolId, timeframe }));
-  }, [dispatch, poolId, timeframe]);
+    dispatch(requests.fetchSnapshotsData({ poolId }));
+  }, [dispatch, poolId]);
 
   return (
-    <Card style={{ height: "100%" }}>
+    <Card style={{ height: '100%' }}>
       {formattedPool ? (
         <>
           <div
             style={{
-              display: "flex",
-              alignItems: "flex-start",
-              justifyContent: "space-between",
+              display: 'flex',
+              alignItems: 'flex-start',
+              justifyContent: 'space-between',
             }}
           >
             <div style={{ flex: 1 }}>
@@ -69,7 +70,7 @@ export function IndexPoolChart({ poolId, expanded = false }: Props) {
                   historicalData ? historicalData.price : formattedPool.priceUsd
                 }
                 netChange={historicalData ? historicalData.when : netChange}
-                netChangePercent={historicalData ? "" : netChangePercent}
+                netChangePercent={historicalData ? '' : netChangePercent}
                 inline={true}
                 textSize="large"
                 style={{
@@ -78,13 +79,13 @@ export function IndexPoolChart({ poolId, expanded = false }: Props) {
                 }}
               />
             </div>
-            <div style={{ flex: 1, textAlign: "right" }}>
+            <div style={{ flex: 1, textAlign: 'right' }}>
               <Radio.Group
                 onChange={handleTimeframeChange}
                 value={timeframe}
                 size="large"
               >
-                {["1D", "1W", "2W", "1M" /*, "3M", "6M", "1Y"*/].map(
+                {['1D', '1W', '2W', '1M' /*, "3M", "6M", "1Y"*/].map(
                   (timeframe) => (
                     <Radio.Button key={timeframe} value={timeframe}>
                       {timeframe}
@@ -94,19 +95,21 @@ export function IndexPoolChart({ poolId, expanded = false }: Props) {
               </Radio.Group>
             </div>
           </div>
-          {<div
-            style={{ height: 260, overflow: "auto" }}
-            onMouseOut={() => setHistoricalData(null)}
-          >
-            {!rerendering && (
-              <LineSeriesChart
-                data={data}
-                expanded={expanded}
-                onChangeTheme={noop}
-                onMoveCrosshair={setHistoricalData}
-              />
-            )}
-          </div>}
+          {
+            <div
+              style={{ height: 260, overflow: 'auto' }}
+              onMouseOut={() => setHistoricalData(null)}
+            >
+              {!rerendering && (
+                <LineSeriesChart
+                  data={data}
+                  expanded={expanded}
+                  onChangeTheme={noop}
+                  onMoveCrosshair={setHistoricalData}
+                />
+              )}
+            </div>
+          }
         </>
       ) : (
         <Spin />
diff --git a/src/components/atomic/organisms/IndexPoolExternalLinks.tsx b/src/components/atomic/organisms/IndexPoolExternalLinks.tsx
index feceae70..09688c4b 100644
--- a/src/components/atomic/organisms/IndexPoolExternalLinks.tsx
+++ b/src/components/atomic/organisms/IndexPoolExternalLinks.tsx
@@ -4,8 +4,8 @@ import { ExternalLink } from "components/atomic/atoms";
 import { FormattedIndexPool } from "features";
 import { Fragment, useMemo } from "react";
 import { NETWORKS_BY_ID } from "../../../config/network";
-import { exchangeAddLiquidityLink, exchangeSwapLink, explorerAddressLink, uniswapInfoTokenLink } from "helpers";
-import { getPoolQuickswapLink, useChainId } from "hooks";
+import { exchangeAddLiquidityLink, exchangeSwapLink, explorerAddressLink } from "helpers";
+import { useChainId } from "hooks";
 
 const usePoolExternalLinks = (address: string, chainId: number): Array<{
   text: string;
diff --git a/src/components/atomic/organisms/IndexPoolWidget.tsx b/src/components/atomic/organisms/IndexPoolWidget.tsx
index 52280ed8..0006d8b4 100644
--- a/src/components/atomic/organisms/IndexPoolWidget.tsx
+++ b/src/components/atomic/organisms/IndexPoolWidget.tsx
@@ -1,6 +1,6 @@
-import { AppState, FormattedIndexPool, selectors } from "features";
 import { Card, Col, Row, Statistic } from "antd";
 import { Fade } from "components/animations";
+import { FormattedIndexPool, selectors } from "features";
 import { INDEX_POOL_TAGLINES } from "config";
 import { Quote } from "../molecules";
 import { Token } from "../atoms";
@@ -35,7 +35,7 @@ export function IndexPoolWidgetGroup() {
 }
 
 export function IndexPoolWidget(props: FormattedIndexPool) {
-  const tokenIds = useMemo(() => props.assets.map(a => a.id), [props]);
+  const tokenIds = useMemo(() => props.assets.map(({ id }) => id), [props]);
   const { push } = useHistory();
 
   usePoolDetailRegistrar(props.id, tokenIds);
diff --git a/src/components/atomic/organisms/LayoutHeader.tsx b/src/components/atomic/organisms/LayoutHeader.tsx
index 18a4e766..dcea0e29 100644
--- a/src/components/atomic/organisms/LayoutHeader.tsx
+++ b/src/components/atomic/organisms/LayoutHeader.tsx
@@ -1,4 +1,3 @@
-import { AiOutlineUser } from "react-icons/ai";
 import { ExternalLink } from "components/atomic/atoms";
 import {
   FaCaretDown,
@@ -17,17 +16,15 @@ import {
 } from "components/atomic/molecules";
 import { Layout, Menu, Space } from "antd";
 import { Link } from "react-router-dom";
-import { ReactNode, useEffect, useState } from "react";
-import { RiSafe2Line } from "react-icons/ri";
 import { selectors } from "features";
-import { useBreakpoints, useTranslator } from "hooks";
+import { useBreakpoints } from "hooks";
+import { useEffect, useState } from "react";
 import { useSelector } from "react-redux";
 import EthIcon from "images/eth.png";
 import Icon from "@ant-design/icons";
 import MaticIcon from "images/matic.png";
 
 export function LayoutHeader() {
-  const tx = useTranslator();
   const { isMobile, xl } = useBreakpoints();
   const [showingUserControls, setShowingUserControls] = useState(false);
   const selectedAddress = useSelector(selectors.selectUserAddress);
@@ -40,14 +37,6 @@ export function LayoutHeader() {
     <>
       {!xl && (
         <Menu mode="vertical" style={{ width: "100%" }}>
-          <Menu.Item key="vaults">
-            <Link to="/vaults">
-              <Space size="small">
-                <RiSafe2Line style={{ position: "relative", top: 2 }} /> Vaults
-              </Space>
-            </Link>
-          </Menu.Item>
-
           <Menu.Item key="index-pools">
             <Link to="/index-pools">
               <Space size="small">
@@ -57,25 +46,9 @@ export function LayoutHeader() {
             </Link>
           </Menu.Item>
 
-          <Menu.Item key="staking">
-            <Link to="/staking">
-              <Space>
-                <RiSafe2Line style={{ position: "relative", top: 2 }} /> Staking
-              </Space>
-            </Link>
-          </Menu.Item>
-
-          <Menu.Item key="portfolio">
-            <Link to="/portfolio">
-              <Space size="small">
-                <AiOutlineUser style={{ position: "relative", top: 2 }} />
-                {tx("PORTFOLIO")}
-              </Space>
-            </Link>
-          </Menu.Item>
           <Menu.Item>
             <ExternalLink
-              to="https://legacy.indexed.finance/governance"
+              to="https://www.tally.xyz/governance/eip155:1:0x95129751769f99CC39824a0793eF4933DD8Bb74B"
               withIcon={false}
             >
               <Space size="small">
@@ -95,10 +68,15 @@ export function LayoutHeader() {
             className="make_blocky"
           >
             <Menu.Item key="eth-network">
-              <Icon src={EthIcon} style={{ position: "relative", top: 2 }} />{" "} Ethereum
+              <Icon src={EthIcon} style={{ position: "relative", top: 2 }} />{" "}
+              Ethereum
             </Menu.Item>
             <Menu.Item key="matic-network">
-              <Icon src={MaticIcon} style={{ position: "relative", top: 2, maxHeight: '20px' }} />{" "} Polygon
+              <Icon
+                src={MaticIcon}
+                style={{ position: "relative", top: 2, maxHeight: "20px" }}
+              />{" "}
+              Polygon
             </Menu.Item>
           </Menu.SubMenu>
 
diff --git a/src/components/atomic/organisms/PortfolioPieChart.tsx b/src/components/atomic/organisms/PortfolioPieChart.tsx
deleted file mode 100644
index f13f960e..00000000
--- a/src/components/atomic/organisms/PortfolioPieChart.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-// Taken from https://recharts.org/en-US/examples/StraightAnglePieChart
-import { Cell, Legend, Pie, PieChart } from "recharts";
-import { Component } from "react";
-import { convert } from "helpers";
-
-interface Props {
-  data: Array<{ name: string; value: number }>;
-}
-
-const RADIAN = Math.PI / 180;
-const renderCustomizedLabel = ({
-  cx,
-  cy,
-  midAngle,
-  innerRadius,
-  outerRadius,
-  percent,
-  name,
-}: any) => {
-  const radius = innerRadius + (outerRadius - innerRadius) * 0.5;
-  const x = cx + radius * Math.cos(-midAngle * RADIAN);
-  const y = cy + radius * Math.sin(-midAngle * RADIAN);
-
-  return (
-    <text
-      x={x}
-      y={y}
-      fill="#eee"
-      textAnchor={x > cx ? "start" : "end"}
-      dominantBaseline="central"
-      fontSize={10}
-    >
-      {/* {name.toUpperCase()}: {convert.toPercent(percent)} */}
-    </text>
-  );
-};
-
-const colors = [
-  // Green
-  "#38ee7b",
-  // Magenta
-  "#ff0482",
-  // Blue
-  "#00afaf",
-  // Orange
-  "#d89614",
-];
-
-export class PortfolioPieChart extends Component<Props> {
-  render() {
-    return (
-      <PieChart
-        width={400}
-        height={400}
-        // margin={{
-        //   top: 0,
-        //   left: 0,
-        //   right: 0,
-        //   bottom: 0,
-        // }}
-      >
-        <Pie
-          dataKey="value"
-          isAnimationActive={false}
-          startAngle={180}
-          endAngle={0}
-          data={this.props.data}
-          cx="33%"
-          cy="60%"
-          outerRadius={80}
-          fill="#032939"
-          stroke="black"
-          label={renderCustomizedLabel}
-          labelLine={false}
-        >
-          {this.props.data.map((entry, index) => (
-            <Cell
-              key={entry.name}
-              fill={colors[index % colors.length]}
-              name={entry.name}
-            />
-          ))}
-        </Pie>
-        <Legend
-          layout="vertical"
-          wrapperStyle={{ top: 0, left: 0 }}
-          payload={this.props.data.map((entry, index) => ({
-            id: entry.name,
-            type: "square",
-            value: `${entry.name}: ${convert.toPercent(entry.value)}`,
-            color: colors[index % colors.length],
-          }))}
-        />
-      </PieChart>
-    );
-  }
-}
diff --git a/src/components/atomic/organisms/PortfolioWidget.tsx b/src/components/atomic/organisms/PortfolioWidget.tsx
deleted file mode 100644
index e7ca4404..00000000
--- a/src/components/atomic/organisms/PortfolioWidget.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-import { AppState, FormattedPortfolioAsset, selectors } from "features";
-import { Card, Space, Statistic, Typography } from "antd";
-import { ExternalLink, Progress, Token } from "../atoms";
-import { Link } from "react-router-dom";
-import { Quote } from "../molecules";
-import { ReactNode } from "react";
-import { convert } from "helpers";
-import { useBreakpoints, usePoolDetailRegistrar, useTranslator } from "hooks";
-import { useSelector } from "react-redux";
-
-export function PortfolioWidget(props: FormattedPortfolioAsset) {
-  const tx = useTranslator();
-  const isNdx = props.symbol === "NDX";
-  const { isMobile } = useBreakpoints();
-  const tokenIds = useSelector((state: AppState) =>
-    selectors.selectPoolTokenAddresses(state, props.address)
-  );
-  const fontSize = isMobile ? 16 : 20;
-  const earned = props.isSushiswapPair
-    ? `${props.sushiEarned} SUSHI`
-    : `${props.ndxEarned} NDX`;
-  const symbol = props.symbol.replace("UNIV2:", "").replace("SUSHI:", "");
-  const actions = [
-    <Statistic
-      key="earned"
-      title={tx("EARNED")}
-      style={{ fontSize }}
-      valueStyle={{ fontSize }}
-      value={earned}
-    />,
-  ];
-
-  usePoolDetailRegistrar(isNdx ? "" : props.address, tokenIds);
-
-  if (props.hasStakingPool) {
-    actions.push(
-      <Statistic
-        style={{ fontSize }}
-        valueStyle={{ fontSize }}
-        title={tx("STAKED")}
-        value={props.staking ? `${props.staking} ${symbol}` : `0.00 ${symbol}`}
-      />
-    );
-  }
-
-  return (
-    <FormattedLink
-      link={props.link}
-      isNdx={isNdx}
-      isUniswapPair={props.isUniswapPair}
-      isSushiswapPair={props.isSushiswapPair}
-    >
-      <Card
-        // hoverable={true}
-        title={<Token size="medium" symbol={props.symbol} name={props.name} />}
-        actions={actions}
-        extra={
-          <Quote
-            address={props.address}
-            price={convert.toCurrency(props.price)}
-            inline={true}
-          />
-        }
-      >
-        <div
-          style={{
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "space-between",
-          }}
-        >
-          <Progress
-            style={{
-              marginTop: 12,
-              fontSize: 24,
-              textAlign: "center",
-            }}
-            width={90}
-            status="active"
-            type="dashboard"
-            percent={parseFloat(props.weight.replace(/%/g, ""))}
-          />
-
-          <Space direction="vertical">
-            <Typography.Text
-              key="foo"
-              style={{
-                flex: 1,
-                fontSize: isMobile ? 16 : 24,
-                marginBottom: 0,
-                textAlign: "right",
-              }}
-            >
-              <Typography.Title
-                type="secondary"
-                style={{ fontSize: 12 }}
-                level={5}
-              >
-                Balance
-              </Typography.Title>
-              <div style={{ fontSize: 16 }}>
-                {convert.toComma(parseFloat(props.balance))}
-              </div>
-            </Typography.Text>
-
-            <Typography.Text
-              key="bar"
-              type="success"
-              style={{
-                flex: 1,
-                fontSize: isMobile ? 16 : 24,
-                marginBottom: 0,
-                textAlign: "right",
-              }}
-            >
-              <Typography.Title
-                type="secondary"
-                style={{ fontSize: 12 }}
-                level={5}
-              >
-                Currently worth
-              </Typography.Title>
-              <div>{props.value}</div>
-            </Typography.Text>
-          </Space>
-        </div>
-      </Card>
-    </FormattedLink>
-  );
-}
-
-function FormattedLink({
-  link,
-  isNdx,
-  isUniswapPair,
-  isSushiswapPair,
-  children,
-}: {
-  children: ReactNode;
-  link: string;
-  isNdx: boolean;
-  isUniswapPair: boolean;
-  isSushiswapPair: boolean;
-}) {
-  if (isNdx || isUniswapPair || isSushiswapPair) {
-    return (
-      <ExternalLink to={link} withIcon={false} style={{ display: "block" }}>
-        {children}
-      </ExternalLink>
-    );
-  }
-
-  return <Link to={link}>{children}</Link>;
-}
diff --git a/src/components/atomic/organisms/StakeForm.tsx b/src/components/atomic/organisms/StakeForm.tsx
deleted file mode 100644
index bcacbca0..00000000
--- a/src/components/atomic/organisms/StakeForm.tsx
+++ /dev/null
@@ -1,265 +0,0 @@
-import { Alert, Button, Col, Divider, Row, Space, Statistic } from "antd";
-import { BigNumber } from "ethereum";
-import {
-  FormattedPortfolioAsset,
-  MasterChefPool,
-  NewStakingPool,
-} from "features";
-import { Formik, useFormikContext } from "formik";
-import { Page } from "./Page";
-import { ReactNode, useMemo } from "react";
-import { StakingStats } from "./StakeStats";
-import { TokenSelector } from "./TokenSelector";
-import { convert } from "helpers";
-import { useBreakpoints, useTokenApproval, useTokenBalance } from "hooks";
-
-export function StakeForm({
-  stakingPool,
-  portfolioToken,
-  rewardsPerDay,
-  rewardsAsset,
-  decimals,
-  spender,
-  onStake,
-  onWithdraw,
-  onExit,
-  onClaim,
-  poolLink,
-  stakingTokenLink,
-  formatAssetText,
-}: {
-  stakingPool: NewStakingPool | MasterChefPool;
-  portfolioToken: FormattedPortfolioAsset;
-  rewardsPerDay: string;
-  rewardsAsset: string;
-  decimals: number;
-  spender: string;
-  onStake(amount: string): void;
-  onWithdraw(amount: string): void;
-  onExit(): void;
-  onClaim(): void;
-  poolLink: ReactNode;
-  stakingTokenLink: ReactNode;
-  formatAssetText(amount: string): string;
-}) {
-  const { isMobile } = useBreakpoints();
-  const balance = useTokenBalance(stakingPool?.token ?? "");
-
-  return (
-    <Page hasPageHeader={true} title={`Stake ${portfolioToken.symbol}`}>
-      <Space direction="vertical" style={{ width: "100%" }} size="large">
-        <Row gutter={100}>
-          <Col xs={24} md={10}>
-            <Formik
-              initialValues={{
-                asset: "",
-                amount: {
-                  displayed: "0.00",
-                  exact: convert.toBigNumber("0.00"),
-                },
-                inputType: "stake",
-              }}
-              onSubmit={console.info}
-              validateOnChange={true}
-              validateOnBlur={true}
-              validate={(values) => {
-                const errors: Record<string, string> = {};
-                const maximum = parseFloat(
-                  values.inputType === "stake"
-                    ? balance
-                    : convert.toBalance(stakingPool.userStakedBalance ?? "0")
-                );
-
-                if (values.amount.exact.isGreaterThan(maximum)) {
-                  errors.amount = "Insufficient balance.";
-                }
-
-                return errors;
-              }}
-            >
-              <StakeFormInner
-                rewardsPerDay={rewardsPerDay}
-                token={portfolioToken}
-                stakingPool={stakingPool}
-                spender={spender}
-                onWithdraw={onWithdraw}
-                onStake={onStake}
-                formatAssetText={formatAssetText}
-              />
-            </Formik>
-          </Col>
-          <Col xs={24} md={14}>
-            {isMobile && <Divider />}
-            <StakingStats
-              symbol={portfolioToken.symbol}
-              portfolioToken={portfolioToken}
-              stakingPool={stakingPool}
-              onExit={onExit}
-              onClaim={onClaim}
-              poolLink={poolLink}
-              stakingPoolLink={stakingTokenLink}
-              decimals={decimals}
-              rewardsPerDay={rewardsPerDay}
-              rewardsAsset={rewardsAsset}
-            />
-          </Col>
-        </Row>
-      </Space>
-    </Page>
-  );
-}
-
-function StakeFormInner({
-  token,
-  stakingPool,
-  rewardsPerDay,
-  spender,
-  onStake,
-  onWithdraw,
-  formatAssetText,
-}: {
-  token: FormattedPortfolioAsset;
-  stakingPool: NewStakingPool | MasterChefPool;
-  rewardsPerDay: string;
-  spender: string;
-  onStake(amount: string): void;
-  onWithdraw(amount: string): void;
-  formatAssetText(amount: string): string;
-}) {
-  const { setFieldValue, values, errors } = useFormikContext<{
-    amount: {
-      displayed: string;
-      exact: BigNumber;
-    };
-    inputType: "stake" | "unstake";
-  }>();
-  const [staked] = useMemo(() => {
-    const staked = stakingPool.userStakedBalance;
-    const earned = stakingPool.userEarnedRewards;
-
-    return [staked, earned];
-  }, [stakingPool]);
-  const [estimatedReward, weight] = useMemo<[string, BigNumber]>(() => {
-    const stakedAmount = convert.toBigNumber(staked ?? "0");
-    const addAmount = values.inputType === "stake"
-      ? values.amount.exact
-      : values.amount.exact.negated()
-    
-    const userNewStaked = stakedAmount.plus(addAmount);
-
-    if (userNewStaked.isLessThan(0)) {
-      return ["0.00", convert.toBigNumber("0.00")];
-    }
-
-    const totalStaked = convert.toBigNumber(stakingPool.totalStaked);
-    const newTotalStaked = totalStaked.plus(addAmount);
-    const weight = userNewStaked.dividedBy(newTotalStaked);
-    const dailyRewardsTotal = convert.toBalanceNumber(rewardsPerDay);
-    const result = weight.multipliedBy(dailyRewardsTotal);
-
-    return [convert.toComma(result.toNumber()), weight];
-  }, [values.amount, stakingPool, staked, values.inputType, rewardsPerDay]);
-  const handleSubmit = () => {
-    (values.inputType === "stake" ? onStake : onWithdraw)(values.amount.exact.toString());
-  };
-  const balance = useTokenBalance(stakingPool.token);
-  const { status, approve } = useTokenApproval({
-    spender,
-    tokenId: stakingPool.token,
-    amount: values.amount.displayed,
-    rawAmount: values.amount.exact.toString(),
-    symbol: stakingPool.token,
-  });
-  const estimatedRewardAssetText = formatAssetText(estimatedReward);
-
-  return (
-    <Space direction="vertical" size="large" style={{ width: "100%" }}>
-      <TokenSelector
-        assets={[]}
-        value={{
-          token: token.symbol,
-          amount: values.amount,
-        }}
-        isInput={true}
-        autoFocus={true}
-        balanceLabel={values.inputType === "unstake" ? "Staked" : undefined}
-        balanceOverride={
-          values.inputType === "unstake"
-            ? {
-                displayed:
-                  convert.toBalance(
-                    convert.toBigNumber(staked ?? "0"),
-                    token.decimals
-                  ) ?? "0.00",
-                exact: convert.toBigNumber(staked ?? "0"),
-              }
-            : {
-                displayed: convert.toBalance(balance, token.decimals) ?? "0.00",
-                exact: convert.toBigNumber(balance ?? "0"),
-              }
-        }
-        selectable={false}
-        onChange={(value) => setFieldValue("amount", value.amount)}
-        error={errors.amount?.displayed}
-      />
-
-      <Alert
-        type="warning"
-        message={
-          <div
-            style={{
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "space-between",
-            }}
-          >
-            <Statistic
-              title="Estimated Reward"
-              value={estimatedRewardAssetText}
-            />
-            <Statistic
-              title="Pool Weight"
-              value={convert.toPercent(weight.toNumber())}
-              style={{ textAlign: "right" }}
-            />
-          </div>
-        }
-      />
-      <Button.Group style={{ width: "100%" }}>
-        {values.inputType === "stake" && status === "approval needed" ? (
-          <Button
-            type="primary"
-            block={true}
-            onClick={approve}
-            disabled={Boolean(errors.amount?.displayed)}
-          >
-            Approve
-          </Button>
-        ) : (
-          <Button
-            type="primary"
-            danger={values.inputType === "unstake"}
-            block={true}
-            onClick={handleSubmit}
-            disabled={Boolean(errors.amount?.displayed)}
-          >
-            {values.inputType === "stake" ? "Deposit" : "Withdraw"}
-          </Button>
-        )}
-        <Button
-          type="primary"
-          danger={values.inputType === "stake"}
-          block={true}
-          onClick={() =>
-            setFieldValue(
-              "inputType",
-              values.inputType === "stake" ? "unstake" : "stake"
-            )
-          }
-        >
-          {values.inputType === "stake" ? "Withdraw" : "Deposit"}
-        </Button>
-      </Button.Group>
-    </Space>
-  );
-}
diff --git a/src/components/atomic/organisms/StakeStats.tsx b/src/components/atomic/organisms/StakeStats.tsx
deleted file mode 100644
index 999b102f..00000000
--- a/src/components/atomic/organisms/StakeStats.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { Button, Col, Descriptions, Row } from "antd";
-import {
-  FormattedPortfolioAsset,
-  MasterChefPool,
-  NewStakingPool,
-} from "features";
-import { ReactNode, useMemo } from "react";
-import { convert } from "helpers";
-
-export function StakingStats({
-  decimals,
-  symbol,
-  portfolioToken,
-  stakingPool,
-  poolLink,
-  stakingPoolLink,
-  rewardsPerDay,
-  rewardsAsset,
-  onExit,
-  onClaim,
-}: {
-  decimals: number;
-  symbol: string;
-  portfolioToken: FormattedPortfolioAsset;
-  stakingPool: NewStakingPool | MasterChefPool;
-  poolLink: ReactNode;
-  stakingPoolLink: ReactNode;
-  rewardsPerDay: string;
-  rewardsAsset: string;
-  onExit(): void;
-  onClaim(): void;
-}) {
-  const [staked, earned] = useMemo(() => {
-    let staked = stakingPool.userStakedBalance;
-    let earned = stakingPool.userEarnedRewards;
-    staked = staked
-      ? convert.toBalance(staked, portfolioToken.decimals, false, 10)
-      : "0";
-    earned = earned
-      ? convert.toBalance(earned, portfolioToken.decimals, false, 10)
-      : "0";
-
-    return [staked, earned];
-  }, [stakingPool, portfolioToken.decimals]);
-
-  return (
-    <Descriptions bordered={true} column={1}>
-      {/* Left Column */}
-      {parseFloat(staked) > 0 && (
-        <Descriptions.Item label="Staked">
-          <Row>
-            <Col xs={24} md={14}>
-              {staked} {symbol}
-            </Col>
-            <Col xs={24} md={8}>
-              <Button danger type="primary" block={true} onClick={onExit}>
-                Exit
-              </Button>
-            </Col>
-          </Row>
-        </Descriptions.Item>
-      )}
-      {parseFloat(earned) > 0 && (
-        <Descriptions.Item label="Earned Rewards">
-          <Row>
-            <Col xs={24} md={14}>
-              {earned} {rewardsAsset}
-            </Col>
-            <Col xs={24} md={8}>
-              <Button type="primary" block={true} onClick={onClaim}>
-                Claim
-              </Button>
-            </Col>
-          </Row>
-        </Descriptions.Item>
-      )}
-
-      <Descriptions.Item label="Reward Rate per Day">
-        {`${convert.toBalance(rewardsPerDay, 18)} ${rewardsAsset}`}
-      </Descriptions.Item>
-
-      <Descriptions.Item label="Rewards Pool">{poolLink}</Descriptions.Item>
-
-      {/* Right Column */}
-      <Descriptions.Item label="Total Staked">
-        {convert.toBalance(stakingPool.totalStaked, decimals, true)} {symbol}
-      </Descriptions.Item>
-
-      <Descriptions.Item label="Staking Token">
-        {stakingPoolLink}
-      </Descriptions.Item>
-    </Descriptions>
-  );
-}
diff --git a/src/components/atomic/organisms/StakingCard.tsx b/src/components/atomic/organisms/StakingCard.tsx
deleted file mode 100644
index e62e87d8..00000000
--- a/src/components/atomic/organisms/StakingCard.tsx
+++ /dev/null
@@ -1,210 +0,0 @@
-import { Badge, Card, Col, Row, Spin, Typography } from "antd";
-import { FormattedNewStakingData } from "features";
-import { Label, Token } from "components/atomic/atoms";
-import { Link } from "react-router-dom";
-import {
-  useBreakpoints,
-  useMasterChefApy,
-  useNewStakingApy,
-  useStakingApy,
-} from "hooks";
-import noop from "lodash.noop";
-
-interface Props
-  extends Omit<FormattedNewStakingData, "indexPool" | "rewardsPerDay"> {
-  linkPath?: string;
-  indexPool?: string;
-  rewardsPerDay?: string;
-  backdrop?: string;
-  badge?: string;
-  badgeColor?: string;
-  useApy?: any;
-}
-
-export function StakingCard({
-  id,
-  name,
-  symbol,
-  earned,
-  staked,
-  rewardsPerDay,
-  totalStaked,
-  backdrop,
-  badge,
-  badgeColor,
-  linkPath,
-  useApy = noop,
-}: Props) {
-  const { lg } = useBreakpoints();
-  const apy = useApy(id);
-  const token = (
-    <Token
-      name={symbol}
-      address={id}
-      symbol={symbol}
-      symbolOverride={
-        ["UNIV2:", "SUSHI:"].some((prefix) => symbol.startsWith(prefix))
-          ? symbol.split(":")[1].replace(/-/g, "/")
-          : symbol
-      }
-      size="medium"
-      style={{ marginRight: 24 }}
-    />
-  );
-  const inner = (
-    <Link to={`/${linkPath}/${id}`}>
-      <Card
-        key={id}
-        bordered={true}
-        hoverable={true}
-        style={{ marginTop: 24, position: "relative", overflow: "hidden" }}
-        title={
-          lg ? (
-            <Row gutter={24}>
-              <Col xs={24} sm={6}>
-                {name}
-              </Col>
-              <Col xs={24} sm={5}>
-                {!["0.00 NDX", "0.00 SUSHI"].includes(earned) && (
-                  <em>
-                    <Typography.Text type="success">
-                      Earned {earned}
-                    </Typography.Text>
-                  </em>
-                )}
-              </Col>
-              <Col xs={24} sm={5}>
-                {staked !== "0.00" && (
-                  <em>
-                    <Typography.Text type="success">
-                      Staking {staked} {symbol}
-                    </Typography.Text>
-                  </em>
-                )}
-              </Col>
-            </Row>
-          ) : (
-            token
-          )
-        }
-      >
-        <Row gutter={24} align="middle">
-          {/* CC10 */}
-          <Col xs={24} lg={6} style={{ marginBottom: lg ? 12 : 0 }}>
-            {!lg ? name : token}
-          </Col>
-
-          {/* 200 NDX/Day */}
-          <Col xs={24} lg={5} style={{ marginBottom: lg ? 12 : 0 }}>
-            {!lg && <Label>Rewards Per Day</Label>}
-            <Typography.Title level={3} style={{ margin: 0 }}>
-              {rewardsPerDay}
-            </Typography.Title>
-          </Col>
-
-          {/* 12,000.00 UNI */}
-          <Col xs={24} lg={6} style={{ marginBottom: lg ? 12 : 0 }}>
-            {!lg && <Label>Total Staked</Label>}
-            <Typography.Title level={3} style={{ margin: 0 }}>
-              {totalStaked} {symbol}
-            </Typography.Title>
-          </Col>
-
-          {/* 13.37% APY */}
-          <Col xs={24} lg={4} style={{ textAlign: lg ? "right" : "left" }}>
-            {!lg && <Label>APR</Label>}
-            <Typography.Title level={2} type="success" style={{ margin: 0 }}>
-              {apy ?? <Spin />}
-            </Typography.Title>
-          </Col>
-        </Row>
-
-        {backdrop && (
-          <img
-            src={backdrop}
-            alt="Backdrop"
-            style={{
-              position: "absolute",
-              bottom: -34,
-              right: -34,
-              width: 128,
-              height: 128,
-              opacity: 0.2,
-            }}
-          />
-        )}
-      </Card>
-    </Link>
-  );
-
-  return badge ? (
-    <Badge.Ribbon color={badgeColor} text={badge}>
-      {inner}
-    </Badge.Ribbon>
-  ) : (
-    inner
-  );
-}
-
-// Variants
-export function UniswapStakingCard(props: Props) {
-  return (
-    <StakingCard
-      {...props}
-      linkPath="staking-new"
-      badge="Uniswap LP"
-      badgeColor="pink"
-      backdrop={require("images/uni.png").default}
-      useApy={useNewStakingApy}
-    />
-  );
-}
-
-export function SingleSidedStakingCard(props: Props) {
-  return (
-    <StakingCard
-      {...props}
-      linkPath="staking-new"
-      badge=""
-      badgeColor=""
-      useApy={useNewStakingApy}
-    />
-  );
-}
-
-export function SushiswapStakingCard(props: Props) {
-  return (
-    <StakingCard
-      {...props}
-      linkPath="stake-sushi"
-      badge="Sushiswap LP"
-      badgeColor="violet"
-      backdrop={require("images/sushi.png").default}
-      useApy={useMasterChefApy}
-    />
-  );
-}
-
-export function ExpiredStakingCard(props: Props) {
-  return (
-    <StakingCard
-      {...props}
-      linkPath="staking"
-      badge="Expired"
-      badgeColor="red"
-      useApy={useStakingApy}
-    />
-  );
-}
-
-export function ExpiredNewStakingCard(props: Props) {
-  return (
-    <StakingCard
-      {...props}
-      linkPath="staking-new"
-      badge="Expired"
-      badgeColor="red"
-      useApy={useNewStakingApy}
-    />
-  );
-}
diff --git a/src/components/atomic/organisms/VaultAdapterPieChart.tsx b/src/components/atomic/organisms/VaultAdapterPieChart.tsx
deleted file mode 100644
index ae0a684d..00000000
--- a/src/components/atomic/organisms/VaultAdapterPieChart.tsx
+++ /dev/null
@@ -1,175 +0,0 @@
-// Taken from https://recharts.org/en-US/examples/CustomActiveShapePieChart
-import { Pie, PieChart, ResponsiveContainer, Sector } from "recharts";
-import { PureComponent } from "react";
-
-const renderActiveShape = (props: any) => {
-  const RADIAN = Math.PI / 260;
-  const {
-    cx,
-    cy,
-    midAngle,
-    innerRadius,
-    outerRadius,
-    startAngle,
-    endAngle,
-    fill,
-    payload,
-    baseAPR,
-    apr,
-    value,
-  } = props;
-  const sin = Math.sin(-RADIAN * midAngle );
-  const cos = Math.cos(-RADIAN * midAngle * -1);
-  const sx = cx + (outerRadius + 10) * cos;
-  const sy = cy + (outerRadius + 10) * sin;
-  const mx = cx + (outerRadius + 30) * cos;
-  const my = cy + (outerRadius + 30) * sin;
-  const ex = mx + (cos >= 0 ? 1 : -1) * 10;
-  const ey = my;
-  const textAnchor = cos >= 0 ? "start" : "end";
-
-  return (
-    <g>
-      <text x={cx} y={cy} dy={8} textAnchor="middle" fill={fill}>
-        {payload.name}
-      </text>
-      <Sector
-        cx={cx}
-        cy={cy}
-        innerRadius={innerRadius}
-        outerRadius={outerRadius}
-        startAngle={startAngle}
-        endAngle={endAngle}
-        fill={fill}
-      />
-      <Sector
-        cx={cx}
-        cy={cy}
-        startAngle={startAngle}
-        endAngle={endAngle}
-        innerRadius={outerRadius + 6}
-        outerRadius={outerRadius + 10}
-        fill={fill}
-      />
-      <path
-        d={`M${sx},${sy}L${mx},${my}L${ex},${ey}`}
-        stroke={fill}
-        fill="none"
-      />
-      <circle cx={ex} cy={ey} r={2} fill={fill} stroke="none" />
-      <text
-        x={ex + (cos >= 0 ? 1 : -1) * 12}
-        y={ey}
-        textAnchor={textAnchor}
-        fill="#888"
-      >{`Weight ${value}%`}</text>
-      <text
-        x={ex + (cos >= 0 ? 1 : -1) * 12}
-        y={ey}
-        dy={18}
-        textAnchor={textAnchor}
-        fill="#999"
-      >
-        {`Base APR ${baseAPR}%`}
-      </text>
-      <text
-        x={ex + (cos >= 0 ? 1 : -1) * 12}
-        y={ey}
-        dy={36}
-        textAnchor={textAnchor}
-        fill="#999"
-      >
-        {`Net APR ${apr}%`}
-      </text>
-    </g>
-  );
-};
-
-interface Props {
-  data: Array<{ name: string; weight: number }>;
-}
-export class VaultAdapterPieChart extends PureComponent<Props> {
-  state = {
-    activeIndex: 0,
-  };
-
-  onPieEnter = (_: any, index: number) => {
-    this.setState({
-      activeIndex: index,
-    });
-  };
-
-  render() {
-    return (
-      <ResponsiveContainer width="100%" height="100%">
-        <PieChart width={400} height={400}>
-          <Pie
-            activeIndex={this.state.activeIndex}
-            activeShape={renderActiveShape}
-            data={this.props.data}
-            cx="50%"
-            cy="50%"
-            innerRadius={60}
-            outerRadius={80}
-            fill="#8884d8"
-            dataKey="value"
-            onMouseEnter={this.onPieEnter}
-          />
-        </PieChart>
-      </ResponsiveContainer>
-      // <ResponsiveContainer width="100%" height="100%">
-      //   <PieChart width={400} height={400}>
-      //     <Pie
-      //       activeIndex={this.state.activeIndex}
-      //       dataKey="value"
-      //       isAnimationActive={false}
-      //       data={this.props.data}
-      //       cx="50%"
-      //       cy="50%"
-      //       outerRadius={80}
-      //       fill="#8884d8"
-      //       // label={renderCustomizedLabel}
-      //     />
-      //     <Tooltip content={<CustomTooltip />} />
-      //   </PieChart>
-      // </ResponsiveContainer>
-    );
-  }
-}
-
-/* extends PureComponent<Props> {
-  static demoUrl =
-    "https://codesandbox.io/s/pie-chart-with-customized-active-shape-y93si";
-
-  state = {
-    activeIndex: 0,
-  };
-
-  onPieEnter = (_: any, index: number) => {
-    this.setState({
-      activeIndex: index,
-    });
-  };
-
-  render() {
-    return (
-      <ResponsiveContainer width="100%" height="100%">
-        <PieChart>
-          <Pie
-            activeIndex={this.state.activeIndex}
-            activeShape={renderActiveShape}
-            data={this.props.data}
-            cx="50%"
-            cy="50%"
-            innerRadius={60}
-            outerRadius={80}
-            fill="#8884d8"
-            dataKey="value"
-            onMouseEnter={this.onPieEnter}
-            label={renderCustomizedLabel}
-          />
-        </PieChart>
-      </ResponsiveContainer>
-    );
-  }
-} */
diff --git a/src/components/atomic/organisms/VaultCard.tsx b/src/components/atomic/organisms/VaultCard.tsx
deleted file mode 100644
index 95c56cc3..00000000
--- a/src/components/atomic/organisms/VaultCard.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import { Card, Col, Row, Space, Spin, Tooltip, Typography } from "antd";
-import { FormattedVault, useAllVaults, useVault, useVaultAPR } from "hooks";
-import { NirnProtocol } from "../atoms/NirnProtocol";
-import { Token } from "../atoms";
-import { useHistory } from "react-router";
-
-type Props = {
-  hoverable?: boolean;
-  bordered?: boolean;
-  withTitle?: boolean;
-  vault: FormattedVault;
-};
-
-export function VaultCard({
-  hoverable,
-  bordered,
-  withTitle,
-  vault: { id: vaultId, underlying, usdValue, adapters },
-}: Props) {
-  const apr = useVaultAPR(vaultId);
-  const { push } = useHistory();
-  const isLoadingApr = apr === 0;
-  const isLoadingTvl = !usdValue || parseFloat(usdValue) === 0;
-
-  useVault(vaultId);
-
-  return (
-    <Card
-      hoverable={hoverable}
-      bordered={bordered}
-      style={{
-        position: "relative",
-        overflow: "hidden",
-        borderTopLeftRadius: 12,
-        borderTopRightRadius: 12,
-        borderBottomLeftRadius: 12,
-        borderBottomRightRadius: 12,
-        marginBottom: 24,
-      }}
-      onClick={() => push(`/vaults/${underlying.symbol.toLowerCase()}`)}
-    >
-      {withTitle && (
-        <Row>
-          <Col xs={24} md={6} style={{ textAlign: "left" }}></Col>
-          <Col xs={24} md={6} style={{ textAlign: "center" }}>
-            <Typography.Title level={2}>TVL</Typography.Title>
-          </Col>
-          <Col xs={24} md={6} style={{ textAlign: "center" }}>
-            <Typography.Title level={2}>APR</Typography.Title>
-          </Col>
-          <Col xs={24} md={6} style={{ textAlign: "center" }}>
-            <Typography.Title level={2}>Protocols</Typography.Title>
-          </Col>
-        </Row>
-      )}
-      <Row align="middle">
-        <Col xs={24} md={6}>
-          <Typography.Title level={2} style={{ margin: 0 }}>
-            <Token
-              name={underlying.name}
-              address={underlying.id}
-              symbol={underlying.symbol}
-              size="small"
-            />
-          </Typography.Title>
-        </Col>
-        <Col xs={24} md={6} style={{ textAlign: "center" }}>
-          <Typography.Title level={2} style={{ margin: 0 }}>
-            {isLoadingTvl ? <Spin /> : `$${usdValue}`}
-          </Typography.Title>
-        </Col>
-        <Col xs={24} md={6} style={{ textAlign: "center" }}>
-          {isLoadingApr ? (
-            <Spin />
-          ) : (
-            <Tooltip title="Annualized based on the current interest rate.">
-              <Typography.Title level={3} style={{ margin: 0 }} type="success">
-                {apr}%
-              </Typography.Title>
-            </Tooltip>
-          )}
-        </Col>
-        <Col xs={24} md={6} style={{ textAlign: "center" }}>
-          <Tooltip title="Protocols in use by the vault.">
-            <Typography.Title level={3} style={{ margin: 0 }} type="success">
-              <Space direction="vertical">
-                {adapters.map((a) => (
-                  <NirnProtocol
-                    key={a.id}
-                    name={a.protocol.name}
-                    showName={true}
-                  />
-                ))}
-              </Space>
-            </Typography.Title>
-          </Tooltip>
-        </Col>
-      </Row>
-    </Card>
-  );
-}
-
-export function VaultGroup({ withTitle = false }: { withTitle?: boolean }) {
-  const vaults = useAllVaults();
-
-  return (
-    <>
-      {withTitle && (
-        <Row>
-          <Col xs={24} md={6} offset={6} style={{ textAlign: "center" }}>
-            <Typography.Title level={2}>TVL</Typography.Title>
-          </Col>
-          <Col xs={24} md={6} style={{ textAlign: "center" }}>
-            <Typography.Title level={2}>APR</Typography.Title>
-          </Col>
-          <Col xs={24} md={6} style={{ textAlign: "center" }}>
-            <Typography.Title level={2}>Protocols</Typography.Title>
-          </Col>
-        </Row>
-      )}
-      {vaults.map((vault) => (
-        <VaultCard
-          key={vault.symbol}
-          hoverable={true}
-          bordered={true}
-          vault={vault}
-        />
-      ))}
-    </>
-  );
-}
diff --git a/src/components/atomic/organisms/VaultForm.tsx b/src/components/atomic/organisms/VaultForm.tsx
deleted file mode 100644
index b456d081..00000000
--- a/src/components/atomic/organisms/VaultForm.tsx
+++ /dev/null
@@ -1,191 +0,0 @@
-import {
-  Alert,
-  Button,
-  Card,
-  Col,
-  Divider,
-  Row,
-  Space,
-  Tooltip,
-  Typography,
-} from "antd";
-import { BigNumber, convert } from "helpers";
-import {
-  FormattedVault,
-  useBalanceAndApprovalRegistrar,
-  useNirnTransactionCallbacks,
-  useTokenApproval,
-  useVaultUserBalance,
-} from "hooks";
-import { Formik } from "formik";
-import { TokenSelector } from "components/atomic/organisms/TokenSelector";
-import { useCallback, useMemo, useState } from "react";
-
-type TokenAmount = { exact: BigNumber; displayed: string };
-
-export function VaultForm({ vault }: { vault: FormattedVault }) {
-  return (
-    <Formik
-      initialValues={{
-        asset: "",
-        amount: {
-          displayed: "0.00",
-          exact: convert.toBigNumber("0.00"),
-        },
-        inputType: "stake",
-      }}
-      onSubmit={console.info}
-      validateOnChange={true}
-      validateOnBlur={true}
-    >
-      <Inner vault={vault} />
-    </Formik>
-  );
-}
-
-export function Inner({ vault }: { vault: FormattedVault }) {
-  const { underlying, performanceFee } = vault;
-  const { deposit, withdrawUnderlying } = useNirnTransactionCallbacks(vault.id);
-  const [mode, setMode] = useState<"deposit" | "withdraw">("deposit");
-  const [amount, setAmount] = useState<TokenAmount>({
-    exact: convert.toBigNumber("0.00"),
-    displayed: "0.00",
-  });
-  const dependentAmount = useMemo(() => {
-    if (!vault.price) return convert.toBigNumber("0");
-    const exact = amount.exact
-      .times(convert.toToken("1", 18))
-      .div(convert.toBigNumber(vault.price));
-    return convert.toBalance(exact, underlying.decimals, true, 2);
-  }, [amount, vault, underlying]);
-  const { balance, unwrappedBalance } = useVaultUserBalance(vault.id);
-  const handleSubmit = useCallback(() => {
-    if (mode === "deposit") {
-      deposit(amount.exact.integerValue().toString(10));
-    } else {
-      withdrawUnderlying(amount.exact.integerValue().toString(10));
-    }
-  }, [mode, amount, deposit, withdrawUnderlying]);
-  const { status, approve } = useTokenApproval({
-    tokenId: vault.underlying.id,
-    spender: vault.id,
-    amount: amount.displayed,
-    rawAmount: amount.exact.toString(),
-    symbol: vault.symbol,
-  });
-
-  // 10/27 Cream was exploited, temporarily disable deposits there.
-  const isTemporarilyDisabled = useMemo(
-    () => mode === "deposit" && ["nWBTC", "nAAVE"].includes(vault.symbol),
-    [mode, vault]
-  );
-
-  useBalanceAndApprovalRegistrar(vault.id, [vault.underlying.id]);
-
-  return (
-    <Card
-      bordered={true}
-      title={
-        <Row gutter={24} align="middle">
-          <Col span={24}>
-            <Typography.Title level={2}>I want to</Typography.Title>
-          </Col>
-          <Col span={10}>
-            <Button
-              block={true}
-              size="large"
-              type={mode === "deposit" ? "primary" : "default"}
-              onClick={() => setMode("deposit")}
-            >
-              Deposit
-            </Button>
-          </Col>
-          <Col span={4}>
-            <Divider>or</Divider>
-          </Col>
-          <Col span={10}>
-            <Button
-              block={true}
-              size="large"
-              type={mode === "withdraw" ? "primary" : "default"}
-              onClick={() => setMode("withdraw")}
-            >
-              Withdraw
-            </Button>
-          </Col>
-        </Row>
-      }
-    >
-      {isTemporarilyDisabled ? (
-        <Alert
-          type="error"
-          message="Due to the recent Cream Finance exploit, deposits into vaults which were targeting Cream have been temporarily disabled."
-        />
-      ) : (
-        <Space direction="vertical" size="large" style={{ width: "100%" }}>
-          <TokenSelector
-            assets={[]}
-            balanceOverride={mode === "deposit" ? balance : unwrappedBalance}
-            selectable={false}
-            value={{
-              token: underlying.symbol,
-              amount,
-            }}
-            onChange={(next) => {
-              if (next?.amount) {
-                setAmount(next.amount);
-              }
-            }}
-            isInput={true}
-          />
-          <Alert
-            showIcon={true}
-            type="info"
-            style={{ borderRadius: 0 }}
-            message={
-              <Tooltip
-                title={`The Indexed DAO treasury receives a small percentage of the vault's profits.`}
-              >
-                {`Performance Fee: ${convert.toPercent(
-                  performanceFee
-                )} of yield`}
-              </Tooltip>
-            }
-          />
-          <Alert
-            showIcon={true}
-            type="success"
-            message={
-              <Tooltip
-                title={`${vault.symbol} is the Nirn wrapper for ${underlying.symbol} - it can be burned to redeem ${underlying.symbol}.`}
-              >
-                You will {mode === "deposit" ? "receive" : "burn"}{" "}
-                {dependentAmount} {vault.symbol}
-              </Tooltip>
-            }
-          />
-          {status === "approval needed" && mode === "deposit" ? (
-            <Button
-              type="primary"
-              block={true}
-              style={{ fontSize: 30, height: 60 }}
-              onClick={approve}
-            >
-              Approve
-            </Button>
-          ) : (
-            <Button
-              type="primary"
-              disabled={status === "unknown" || amount.exact.eq(0)}
-              block={true}
-              style={{ fontSize: 30, height: 60 }}
-              onClick={handleSubmit}
-            >
-              {mode === "deposit" ? "Deposit" : "Withdraw"}
-            </Button>
-          )}
-        </Space>
-      )}
-    </Card>
-  );
-}
diff --git a/src/components/atomic/organisms/index.ts b/src/components/atomic/organisms/index.ts
index 2316e6c0..c03ba6fe 100644
--- a/src/components/atomic/organisms/index.ts
+++ b/src/components/atomic/organisms/index.ts
@@ -1,24 +1,16 @@
 // This file was generated via a script in `scripts/`.
 // Do not manually modify this (or any) index files.
 
-export * from './IndexPoolAssets';
-export * from './IndexPoolChart';
-export * from './IndexPoolDescription';
-export * from './IndexPoolExternalLinks';
-export * from './IndexPoolPerformance';
-export * from './IndexPoolRecentTrades';
-export * from './IndexPoolWidget';
-export * from './LayoutHeader';
-export * from './Page';
-export * from './PortfolioPieChart';
-export * from './PortfolioWidget';
-export * from './StakeForm';
-export * from './StakeStats';
-export * from './StakingCard';
-export * from './TokenSelector';
-export * from './TooltipProvider';
-export * from './TransactionList';
-export * from './VaultAdapterPieChart';
-export * from './VaultCard';
-export * from './VaultForm';
-export * from './Widget';
\ No newline at end of file
+export * from "./IndexPoolAssets";
+export * from "./IndexPoolChart";
+export * from "./IndexPoolDescription";
+export * from "./IndexPoolExternalLinks";
+export * from "./IndexPoolPerformance";
+export * from "./IndexPoolRecentTrades";
+export * from "./IndexPoolWidget";
+export * from "./LayoutHeader";
+export * from "./Page";
+export * from "./TokenSelector";
+export * from "./TooltipProvider";
+export * from "./TransactionList";
+export * from "./Widget";
diff --git a/src/components/drawers/WalletConnectionDrawer.tsx b/src/components/drawers/WalletConnectionDrawer.tsx
index 4addbe7f..24c9fa43 100644
--- a/src/components/drawers/WalletConnectionDrawer.tsx
+++ b/src/components/drawers/WalletConnectionDrawer.tsx
@@ -3,7 +3,6 @@ import { BaseDrawer, useDrawer } from "./Drawer";
 import { Divider, Space, Typography, notification } from "antd";
 import { Fade } from "components/animations";
 import { OVERLAY_READY, fortmatic } from "ethereum";
-import { SUPPORTED_NETWORKS } from "config";
 import { UnsupportedChainIdError, useWeb3React } from "@web3-react/core";
 import { WalletConnectConnector } from "@web3-react/walletconnect-connector";
 import { actions } from "features";
@@ -48,7 +47,7 @@ export function WalletConnectionDrawer() {
   const { close } = useDrawer();
   const tx = useTranslator();
   const dispatch = useDispatch();
-  const { account, activate, chainId } = useWeb3React();
+  const { account, activate } = useWeb3React();
   const [attemptingActivation, setAttemptingActivation] = useState(false);
   const walletOptions = useWalletOptions();
   const attemptActivation = useCallback(
diff --git a/src/components/index.ts b/src/components/index.ts
index 40340107..8d8535df 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -1,10 +1,9 @@
 // This file was generated via a script in `scripts/`.
 // Do not manually modify this (or any) index files.
 
-export * from './animations';
-export * from './atomic';
-export * from './dndx';
-export * from './drawers';
-export * from './interactions';
-export * from './portfolio';
-export * from './routes';
\ No newline at end of file
+export * from "./animations";
+export * from "./atomic";
+export * from "./dndx";
+export * from "./drawers";
+export * from "./interactions";
+export * from "./routes";
diff --git a/src/components/interactions/BaseInteraction.tsx b/src/components/interactions/BaseInteraction.tsx
index ac3bcf63..dfe282b5 100644
--- a/src/components/interactions/BaseInteraction.tsx
+++ b/src/components/interactions/BaseInteraction.tsx
@@ -18,7 +18,6 @@ import {
   useCachedValue,
   useDebounce,
   useMultiTokenMintCallbacks,
-  usePrevious,
   useTokenApproval,
   useTokenBalance,
   useTokenBalances,
@@ -47,7 +46,9 @@ interface Props {
   defaultOutputSymbol?: string;
   requiresApproval?: boolean;
   onSubmit(values: SingleInteractionValues): void;
-  onChange(values: SingleInteractionValues): void | string | Promise<string | void>;
+  onChange(
+    values: SingleInteractionValues
+  ): void | string | Promise<string | void>;
   loading?: boolean;
   disableInputEntry?: boolean;
   disableOutputEntry?: boolean;
@@ -90,7 +91,7 @@ export function SingleInteraction({
   requiresApproval = true,
   loading,
   disableInputEntry,
-  disableOutputEntry
+  disableOutputEntry,
 }: Props) {
   const interactionRef = useRef<null | HTMLDivElement>(null);
 
@@ -152,7 +153,7 @@ function SingleInteractionInner({
   disableInputEntry,
   disableOutputEntry,
 }: InnerSingleProps) {
-  const [calculating, setCalculating] = useState<"from" | "to" | null>(null)
+  const [calculating, setCalculating] = useState<"from" | "to" | null>(null);
   const tx = useTranslator();
   const tokenLookup = useSelector(selectors.selectTokenLookupBySymbol);
   const { tokenId, symbol, approveAmount, rawApproveAmount } = useMemo(() => {
@@ -174,15 +175,19 @@ function SingleInteractionInner({
       rawApproveAmount: "0",
     };
   }, [values.fromAmount, values.fromToken, tokenLookup]);
-  const cachedValues = useCachedValue(values)
-  const [lastCalculatedInput, setLastCalculatedInput] = useState<SingleInteractionValues>(values)
-  const debouncedValues = useDebounce(cachedValues, 200);
+
+  const [lastCalculatedInput, setLastCalculatedInput] =
+    useState<SingleInteractionValues>(values);
+  const debouncedValues = useDebounce(useCachedValue(values), 200);
   useEffect(() => {
-    if (/* calculating === null && */ debouncedValues.fromToken && debouncedValues.toToken) {
-      console.log('debounce values')
-      setCalculating("from")
+    if (
+      /* calculating === null && */ debouncedValues.fromToken &&
+      debouncedValues.toToken
+    ) {
+      console.log("debounce values");
+      setCalculating("from");
     }
-  }, [debouncedValues, setCalculating, /* calculating */])
+  }, [debouncedValues, setCalculating /* calculating */]);
   // @todo Clean this up at some point.
   // Not doing the lookup by symbol in the hook because we already have it in scope
   const { status, approve } = useTokenApproval({
@@ -204,36 +209,48 @@ function SingleInteractionInner({
 
   useEffect(() => {
     if (calculating !== null && !isEqual(values, lastCalculatedInput)) {
-      console.log(`CALC HANDLING UPDATE`)
-      setLastCalculatedInput(values)
-      const newValues: SingleInteractionValues = { ...values, fromAmount: {...values.fromAmount}, toAmount: {...values.toAmount} }
+      console.log(`CALC HANDLING UPDATE`);
+      setLastCalculatedInput(values);
+      const newValues: SingleInteractionValues = {
+        ...values,
+        fromAmount: { ...values.fromAmount },
+        toAmount: { ...values.toAmount },
+      };
       Promise.resolve(onChange(newValues as SingleInteractionValues)).then(
         (error) => {
           if (error) {
-            console.log(`CALC GOT ERR`)
-            console.log(error)
+            console.log(`CALC GOT ERR`);
+            console.log(error);
             const inputErr =
               error.includes("Input") ||
-              (newValues.lastTouchedField === "from" && !error.includes("Output"));
-    
+              (newValues.lastTouchedField === "from" &&
+                !error.includes("Output"));
+
             if (inputErr) {
               setFieldError("fromAmount.displayed", error);
             } else {
               setFieldError("toAmount.displayed", error);
             }
           }
-          setCalculating(null)
+          setCalculating(null);
           if (!isEqual(newValues, values)) {
-            console.log(`CALC WRITING NEW VALUES`)
+            console.log(`CALC WRITING NEW VALUES`);
             setValues(newValues);
-
           } else {
-            console.log(`CALC values did not change, skipping update`)
+            console.log(`CALC values did not change, skipping update`);
           }
         }
-      )
+      );
     }
-  }, [calculating, values, onChange, setValues, setFieldError, lastCalculatedInput, setLastCalculatedInput]);
+  }, [
+    calculating,
+    values,
+    onChange,
+    setValues,
+    setFieldError,
+    lastCalculatedInput,
+    setLastCalculatedInput,
+  ]);
 
   const handleFlip = useCallback(() => {
     if (!disableFlip) {
@@ -273,7 +290,7 @@ function SingleInteractionInner({
       error?: string;
     }
   ) => {
-    if (calculating !== null) return
+    if (calculating !== null) return;
     const [tokenField, amountField] =
       field === "from" ? ["fromToken", "fromAmount"] : ["toToken", "toAmount"];
     const newValues = {
@@ -282,8 +299,8 @@ function SingleInteractionInner({
       [amountField]: amount || DEFAULT_ENTRY,
       lastTouchedField: field,
     } as SingleInteractionValues;
-    console.log(`HANDLING CHANGE`)
-    setValues({...newValues})
+    console.log(`HANDLING CHANGE`);
+    setValues({ ...newValues });
     // setCalculating(field === "to" ? "from" : "to")
     if (fieldError) {
       setFieldError(amountField, fieldError);
diff --git a/src/components/interactions/MintInteraction.tsx b/src/components/interactions/MintInteraction.tsx
index e33e3298..c63789f1 100644
--- a/src/components/interactions/MintInteraction.tsx
+++ b/src/components/interactions/MintInteraction.tsx
@@ -21,7 +21,7 @@ import {
   usePoolTokenAddresses,
   useSingleTokenMintCallbacks,
 } from "hooks";
-import { useCallback, useState } from "react";
+import { useCallback } from "react";
 import { useSelector } from "react-redux";
 import BigNumber from "bignumber.js";
 
@@ -179,7 +179,6 @@ function UniswapMintInteraction({ indexPool }: Props) {
         fromToken,
         toToken,
         toAmount,
-        lastTouchedField,
       } = values;
       if (!toToken || !fromToken) {
         return;
@@ -260,7 +259,7 @@ function UniswapMintInteraction({ indexPool }: Props) {
           id: string;
         }[]
       }
-      
+
       loading={loading}
       spender={narwhalRouter}
       onSubmit={handleSubmit}
diff --git a/src/components/portfolio/IndexCard.tsx b/src/components/portfolio/IndexCard.tsx
deleted file mode 100644
index ea571e1f..00000000
--- a/src/components/portfolio/IndexCard.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { Label } from "components/atomic";
-import { List } from "antd";
-import { PortfolioCard } from "./PortfolioCard";
-import { usePoolDetailRegistrar, usePoolTokenIds } from "hooks";
-
-interface Props {
-  address: string;
-  symbol: string;
-  name: string;
-  walletAmount: string;
-  walletUsdValue: string;
-  accruedSymbol?: string;
-  accruedAmount?: string;
-  accruedUsdValue?: string;
-  stakingAmount?: string;
-  stakingUsdValue?: string;
-  hasStakingPool: boolean;
-  staking?: string;
-  earnedAmount?: string;
-  earnedSymbol: string;
-  link?: string;
-}
-
-export function IndexCard({
-  address,
-  symbol,
-  name,
-  walletAmount,
-  walletUsdValue,
-  accruedSymbol,
-  accruedAmount,
-  accruedUsdValue,
-  stakingAmount,
-  stakingUsdValue,
-  hasStakingPool,
-  staking = "0.00",
-  earnedAmount = "0.00",
-  earnedSymbol,
-  link,
-}: Props) {
-  const tokenIds = usePoolTokenIds(address);
-  const actualSymbol = ["UNIV2:", "SUSHI:"].some((prefix) =>
-    symbol.startsWith(prefix)
-  )
-    ? symbol.split(":")[1].replace(/-/g, "/")
-    : symbol;
-
-  usePoolDetailRegistrar(address, tokenIds);
-
-  return (
-    <PortfolioCard
-      walletAmount={walletAmount}
-      walletUsdValue={walletUsdValue}
-      accruedSymbol={accruedSymbol}
-      accruedAmount={accruedAmount}
-      accruedUsdValue={accruedUsdValue}
-      stakingAmount={stakingAmount}
-      stakingUsdValue={stakingUsdValue}
-      symbol={actualSymbol}
-      name={name}
-      link={link}
-      showStaking={hasStakingPool || earnedAmount !== "0.00"}
-      actions={
-        hasStakingPool
-          ? [
-              <List key="list">
-                <List.Item>
-                  <Label>Asset</Label>
-                  {name}
-                </List.Item>
-                <List.Item>
-                  <Label>Currently staking</Label>
-                  {staking || "0.00"} {actualSymbol}
-                </List.Item>
-                <List.Item>
-                  <Label>Rewards ready to claim</Label>
-                  {earnedAmount} {earnedSymbol}
-                </List.Item>
-              </List>,
-            ]
-          : []
-      }
-    />
-  );
-}
diff --git a/src/components/portfolio/IndexSection.tsx b/src/components/portfolio/IndexSection.tsx
deleted file mode 100644
index d67f13ac..00000000
--- a/src/components/portfolio/IndexSection.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Col, Row } from "antd";
-import { IndexCard } from "./IndexCard";
-import { PortfolioSection } from "./PortfolioSection";
-import { convert } from "helpers";
-import { useAllPortfolioData, useBreakpoints, usePortfolioData } from "hooks";
-
-export function IndexSection() {
-  const { isMobile } = useBreakpoints();
-  const {
-    assets: { indexes },
-  } = useAllPortfolioData();
-  const lookup = indexes.reduce((prev, next) => {
-    prev[next.id] = next;
-    return prev;
-  }, {} as Record<string, typeof indexes[0]>);
-  const { tokens } = usePortfolioData({
-    onlyOwnedAssets: true,
-  });
-  const indexTokens = tokens.filter(
-    (token) => !token.isSushiswapPair && !token.isUniswapPair
-  );
-
-  return (
-    <PortfolioSection title="Indexes">
-      <Row gutter={12} align="bottom">
-        {indexTokens.map((token) => {
-          const entry = lookup[token.address];
-          const walletAmount = entry.inWallet.amount.toFixed(2);
-          const walletUsdValue = convert.toCurrency(entry.inWallet.value);
-          const accruedAmount = entry.accrued.amount.toFixed(2);
-          const accruedUsdValue = convert.toCurrency(entry.accrued.value);
-          const stakingAmount = entry.staking.amount.toFixed(2);
-          const stakingUsdValue = convert.toCurrency(entry.staking.value);
-
-          return (
-            <Col
-              key={token.address}
-              xs={24}
-              lg={8}
-              style={{ marginBottom: isMobile ? 12 : 0 }}
-            >
-              <IndexCard
-                name={token.name}
-                symbol={token.symbol}
-                address={token.address}
-                walletAmount={walletAmount}
-                walletUsdValue={walletUsdValue}
-                accruedAmount={accruedAmount}
-                accruedUsdValue={accruedUsdValue}
-                accruedSymbol={entry.accrued.symbol}
-                stakingAmount={stakingAmount}
-                stakingUsdValue={stakingUsdValue}
-                hasStakingPool={token.hasStakingPool}
-                staking={token.staking}
-                earnedSymbol="NDX"
-                earnedAmount={token.ndxEarned}
-                link={token.link}
-              />
-            </Col>
-          );
-        })}
-      </Row>
-    </PortfolioSection>
-  );
-}
diff --git a/src/components/portfolio/LiquiditySection.tsx b/src/components/portfolio/LiquiditySection.tsx
deleted file mode 100644
index d9a320ff..00000000
--- a/src/components/portfolio/LiquiditySection.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Col, Row } from "antd";
-import { IndexCard } from "./IndexCard";
-import { PortfolioSection } from "./PortfolioSection";
-import { convert } from "helpers";
-import {
-  useAllPortfolioData,
-  useBreakpoints,
-  useMasterChefRegistrar,
-  useNewStakingRegistrar,
-  usePortfolioData,
-  useStakingRegistrar,
-} from "hooks";
-
-export function LiquiditySection() {
-  const { isMobile } = useBreakpoints();
-  const {
-    assets: { liquidity },
-  } = useAllPortfolioData();
-  const lookup = liquidity.reduce((prev, next) => {
-    prev[next.id] = next;
-    return prev;
-  }, {} as Record<string, typeof liquidity[0]>);
-  const { tokens } = usePortfolioData({
-    onlyOwnedAssets: true,
-  });
-  const liquidityTokens = tokens.filter(
-    (token) => token.isSushiswapPair || token.isUniswapPair
-  );
-
-  useStakingRegistrar();
-  useNewStakingRegistrar();
-  useMasterChefRegistrar();
-
-  return (
-    <PortfolioSection title="Liquidity">
-      <Row gutter={12} align="bottom">
-        {liquidityTokens.map((token) => {
-          const entry = lookup[token.address];
-          const walletAmount = entry.inWallet.amount.toFixed(2);
-          const walletUsdValue = convert.toCurrency(entry.inWallet.value);
-          const accruedAmount = entry.accrued.amount.toFixed(2);
-          const accruedUsdValue = convert.toCurrency(entry.accrued.value);
-          const stakingAmount = entry.staking.amount.toFixed(2);
-          const stakingUsdValue = convert.toCurrency(entry.staking.value);
-
-          return (
-            <Col
-              key={token.address}
-              xs={24}
-              lg={8}
-              style={{ marginBottom: isMobile ? 12 : 0 }}
-            >
-              <IndexCard
-                name={token.name}
-                symbol={token.symbol}
-                address={token.address}
-                walletAmount={walletAmount}
-                walletUsdValue={walletUsdValue}
-                accruedAmount={accruedAmount}
-                accruedUsdValue={accruedUsdValue}
-                accruedSymbol={entry.accrued.symbol}
-                stakingAmount={stakingAmount}
-                stakingUsdValue={stakingUsdValue}
-                hasStakingPool={token.hasStakingPool}
-                staking={token.staking}
-                earnedSymbol={token.isSushiswapPair ? "SUSHI" : "NDX"}
-                earnedAmount={
-                  token.isSushiswapPair ? token.sushiEarned : token.ndxEarned
-                }
-              />
-            </Col>
-          );
-        })}
-      </Row>
-    </PortfolioSection>
-  );
-}
diff --git a/src/components/portfolio/PortfolioCard.tsx b/src/components/portfolio/PortfolioCard.tsx
deleted file mode 100644
index 6e6909af..00000000
--- a/src/components/portfolio/PortfolioCard.tsx
+++ /dev/null
@@ -1,164 +0,0 @@
-import { Card, Space, Typography } from "antd";
-import { ExternalLink, Token } from "components/atomic";
-import { Link } from "react-router-dom";
-import { ReactNode, useCallback, useState } from "react";
-
-export function PortfolioCard({
-  showStaking = true,
-  walletAmount,
-  symbol,
-  name,
-  walletUsdValue,
-  accruedSymbol,
-  accruedAmount,
-  accruedUsdValue,
-  stakingAmount,
-  stakingUsdValue,
-  link,
-  actions,
-  extra,
-  removeTheN = false,
-}: {
-  link?: string;
-  showStaking?: boolean;
-  walletAmount: string;
-  walletUsdValue: string;
-  accruedSymbol?: string;
-  accruedAmount?: string;
-  accruedUsdValue?: string;
-  stakingAmount?: string;
-  stakingUsdValue?: string;
-  symbol: string;
-  name: string;
-  actions: ReactNode[];
-  extra?: ReactNode;
-  removeTheN?: boolean;
-}) {
-  const [expanded, setExpanded] = useState(false);
-  const toggleExpanded = useCallback(() => setExpanded((prev) => !prev), []);
-  const symbolToUse = removeTheN ? symbol.split("").slice(1).join("") : symbol;
-
-  return (
-    <Card
-      extra={extra}
-      hoverable={true}
-      bordered={false}
-      onClick={toggleExpanded}
-      title={
-        <Space direction="vertical" style={{ width: "100%" }}>
-          <Space direction="horizontal" style={{ width: "100%" }}>
-            <Token
-              symbol={symbolToUse}
-              symbolOverride={symbol}
-              name={name}
-              size="medium"
-            />
-            {
-              link
-                ?
-                  link.startsWith('https')
-                    ? <ExternalLink to={link}>Go To</ExternalLink>
-                    : <Link to={link}>Go To</Link>
-                : ""
-            }
-          </Space>
-          {/* Wallet */}
-          <Card
-            type="inner"
-            bordered={false}
-            title="In Wallet"
-            bodyStyle={{
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "space-between",
-            }}
-          >
-            <Token
-              amount={walletAmount}
-              symbol={symbolToUse}
-              symbolOverride={symbol}
-              name={name}
-              size="small"
-              style={{ textAlign: "left" }}
-            />
-            <Typography.Title
-              level={4}
-              type="success"
-              style={{
-                margin: 0,
-              }}
-            >
-              {walletUsdValue}
-            </Typography.Title>
-          </Card>
-
-          {/* Staking */}
-          {showStaking && (
-            <>
-              <Card
-                bordered={false}
-                type="inner"
-                title="Accrued"
-                bodyStyle={{
-                  display: "flex",
-                  alignItems: "center",
-                  justifyContent: "space-between",
-                }}
-              >
-                <Token
-                  amount={accruedAmount}
-                  symbol={accruedSymbol ?? ""}
-                  name={name}
-                  size="small"
-                  style={{ textAlign: "left" }}
-                />
-                <Typography.Title
-                  level={4}
-                  type="danger"
-                  style={{
-                    margin: 0,
-                  }}
-                >
-                  {accruedUsdValue}
-                </Typography.Title>
-              </Card>
-              <Card
-                bordered={false}
-                type="inner"
-                title="Staking"
-                bodyStyle={{
-                  display: "flex",
-                  alignItems: "center",
-                  justifyContent: "space-between",
-                }}
-              >
-                <Token
-                  amount={stakingAmount}
-                  symbol={symbolToUse}
-                  symbolOverride={symbol}
-                  name={name}
-                  size="small"
-                  style={{ textAlign: "left" }}
-                />
-                <Typography.Title
-                  level={4}
-                  type="secondary"
-                  style={{
-                    margin: 0,
-                  }}
-                >
-                  {stakingUsdValue}
-                </Typography.Title>
-              </Card>
-            </>
-          )}
-        </Space>
-      }
-      bodyStyle={{
-        display: expanded ? undefined : "none",
-      }}
-    >
-      {expanded && actions}
-    </Card>
-  );
-}
diff --git a/src/components/portfolio/PortfolioSection.tsx b/src/components/portfolio/PortfolioSection.tsx
deleted file mode 100644
index abec1207..00000000
--- a/src/components/portfolio/PortfolioSection.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ReactNode } from "react";
-import { Typography } from "antd";
-
-export function PortfolioSection({
-  title,
-  children,
-}: {
-  title: ReactNode;
-  children: ReactNode;
-}) {
-  return (
-    <div style={{ marginBottom: 48 }}>
-      <Typography.Title
-        level={1}
-        type="warning"
-        style={{ textTransform: "uppercase" }}
-      >
-        {title}
-      </Typography.Title>
-
-      {children}
-    </div>
-  );
-}
diff --git a/src/components/portfolio/VaultCard.tsx b/src/components/portfolio/VaultCard.tsx
deleted file mode 100644
index 3164f7c0..00000000
--- a/src/components/portfolio/VaultCard.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Col, List } from "antd";
-import { Label } from "components/atomic";
-import { PortfolioCard } from "./PortfolioCard";
-import {
-  useBreakpoints,
-  useVault,
-  useVaultAPR,
-  useVaultRegistrar,
-  useVaultUserBalance,
-} from "hooks";
-
-interface Props {
-  address: string;
-  link?: string;
-}
-
-export function VVaultCard({ address, link }: Props) {
-  const { isMobile } = useBreakpoints();
-  const vault = useVault(address);
-  const { wrappedBalance, usdValue } = useVaultUserBalance(address);
-  const apr = useVaultAPR(address);
-  const symbol = vault?.symbol ?? "";
-  const name = vault?.name ?? "";
-
-  useVaultRegistrar(address);
-
-  return parseFloat(usdValue ?? "0.00") === 0 ? null : (
-    <Col xs={24} lg={8} style={{ marginBottom: isMobile ? 12 : 0 }}>
-      <PortfolioCard
-        showStaking={false}
-        walletAmount={shortenAmount(wrappedBalance.displayed).toString()}
-        walletUsdValue={`$${usdValue}`}
-        symbol={symbol}
-        removeTheN={true}
-        name={name}
-        link={link}
-        actions={[
-          <List key="list">
-            <List.Item>
-              <Label>Vault</Label>
-              {name}
-            </List.Item>
-            <List.Item>
-              <Label>APR</Label>
-              {apr}%
-            </List.Item>
-            <List.Item>
-              <Label>Earned</Label>${usdValue}
-            </List.Item>
-          </List>,
-        ]}
-      />
-    </Col>
-  );
-}
-
-// #region Helpers
-function toFixed(num: number, fixed: number) {
-  const re = new RegExp("^-?\\d+(?:.\\d{0," + (fixed || -1) + "})?");
-  const res = num.toString().match(re);
-  return res ? res[0] : "";
-}
-
-function shortenAmount(amount: string) {
-  let shortenedAmount: string | number = +toFixed(parseFloat(amount), 3);
-  if (shortenedAmount !== parseFloat(amount)) {
-    shortenedAmount = `${shortenedAmount}…`;
-  }
-  return shortenedAmount;
-}
-// #endregion
diff --git a/src/components/portfolio/VaultSection.tsx b/src/components/portfolio/VaultSection.tsx
deleted file mode 100644
index 9577392a..00000000
--- a/src/components/portfolio/VaultSection.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { PortfolioSection } from "./PortfolioSection";
-import { Row } from "antd";
-import { VVaultCard } from "./VaultCard";
-import { useAllVaults } from "hooks";
-
-export function VaultSection() {
-  const vaults = useAllVaults();
-
-  return (
-    <PortfolioSection title="Vaults">
-      <Row gutter={12} align="bottom">
-        {vaults.map((vault) => (
-          <VVaultCard key={vault.id} address={vault.id} />
-        ))}
-      </Row>
-    </PortfolioSection>
-  );
-}
diff --git a/src/components/portfolio/index.ts b/src/components/portfolio/index.ts
deleted file mode 100644
index 2077de0f..00000000
--- a/src/components/portfolio/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file was generated via a script in `scripts/`.
-// Do not manually modify this (or any) index files.
-
-export * from './IndexCard';
-export * from './IndexSection';
-export * from './LiquiditySection';
-export * from './PortfolioCard';
-export * from './PortfolioSection';
-export * from './VaultCard';
-export * from './VaultSection';
\ No newline at end of file
diff --git a/src/components/routes/Portfolio.tsx b/src/components/routes/Portfolio.tsx
deleted file mode 100644
index 67dad383..00000000
--- a/src/components/routes/Portfolio.tsx
+++ /dev/null
@@ -1,256 +0,0 @@
-import { Card, Col, Empty, Row, Space, Typography } from "antd";
-import {
-  IndexSection,
-  LiquiditySection,
-  VaultSection,
-} from "components/portfolio";
-import {
-  Page,
-  PortfolioPieChart,
-  Token,
-  WalletConnector,
-} from "components/atomic";
-import { convert } from "helpers";
-import { selectors } from "features";
-import { useAllPortfolioData } from "hooks";
-import { useSelector } from "react-redux";
-
-export default function Portfolio() {
-  const data = useAllPortfolioData();
-  const isUserConnected = useSelector(selectors.selectUserConnected);
-
-  return (
-    <Page hasPageHeader={true} title="Portfolio">
-      {isUserConnected ? (
-        <>
-          <Row gutter={24} align="top" style={{ marginBottom: 48 }}>
-            <Col xs={24} md={12} lg={8}>
-              <Card
-                bordered={false}
-                title={
-                  <Typography.Title
-                    type="warning"
-                    level={3}
-                    style={{
-                      margin: 0,
-                      marginRight: 24,
-                      textTransform: "uppercase",
-                    }}
-                  >
-                    Total value
-                  </Typography.Title>
-                }
-              >
-                <Card title="In Wallet" type="inner" bordered={false}>
-                  <Typography.Title
-                    level={1}
-                    type="success"
-                    style={{ margin: 0, textTransform: "uppercase" }}
-                  >
-                    {convert.toCurrency(data.totalValue.inWallet)}
-                  </Typography.Title>
-                </Card>
-                <Card title="Accrued" type="inner" bordered={false}>
-                  <Typography.Title
-                    level={1}
-                    type="danger"
-                    style={{ margin: 0, textTransform: "uppercase" }}
-                  >
-                    {convert.toCurrency(data.totalValue.accrued)}
-                  </Typography.Title>
-                </Card>
-                <Card title="Staked" type="inner" bordered={false}>
-                  <Typography.Title
-                    level={1}
-                    type="secondary"
-                    style={{ margin: 0, textTransform: "uppercase" }}
-                  >
-                    {convert.toCurrency(data.totalValue.staking)}
-                  </Typography.Title>
-                </Card>
-              </Card>
-            </Col>
-            <Col xs={24} md={12} lg={8}>
-              <Card
-                bordered={false}
-                title={
-                  <Typography.Title
-                    type="warning"
-                    level={3}
-                    style={{
-                      margin: 0,
-                      marginRight: 24,
-                      textTransform: "uppercase",
-                    }}
-                  >
-                    Governance Token
-                  </Typography.Title>
-                }
-              >
-                <Card title="In Wallet" type="inner" bordered={false}>
-                  <Typography.Title
-                    level={1}
-                    style={{ margin: 0, textTransform: "uppercase" }}
-                  >
-                    <Space direction="vertical" size="large">
-                      <Token
-                        amount={data.governanceToken.inWallet.amount.toFixed(2)}
-                        symbol="NDX"
-                        name="NDX"
-                        size="large"
-                      />
-                      <Typography.Text
-                        type="success"
-                        style={{ textAlign: "right", margin: 0 }}
-                      >
-                        {convert.toCurrency(
-                          data.governanceToken.inWallet.value
-                        )}
-                      </Typography.Text>
-                    </Space>
-                  </Typography.Title>
-                </Card>
-                {/* // Wait for dNDX */}
-                {/* <Card title="Staked" type="inner" bordered={false}>
-                  <Typography.Title
-                    level={1}
-                    type="danger"
-                    style={{ margin: 0, textTransform: "uppercase" }}
-                  >
-                    <Typography.Title
-                      level={1}
-                      style={{ margin: 0, textTransform: "uppercase" }}
-                    >
-                      <Space direction="vertical" size="large">
-                        <Token
-                          amount={data.governanceToken.staking.amount.toFixed(
-                            2
-                          )}
-                          symbol="NDX"
-                          name="NDX"
-                          size="large"
-                        />
-                        <Typography.Text
-                          type="secondary"
-                          style={{ textAlign: "right", margin: 0 }}
-                        >
-                          {convert.toCurrency(
-                            data.governanceToken.staking.value
-                          )}
-                        </Typography.Text>
-                      </Space>
-                    </Typography.Title>
-                  </Typography.Title>
-                </Card> */}
-              </Card>
-              <Card
-                bordered={false}
-                title={
-                  <Typography.Title
-                    type="warning"
-                    level={3}
-                    style={{
-                      margin: 0,
-                      marginRight: 24,
-                      textTransform: "uppercase",
-                    }}
-                  >
-                    Earned Rewards
-                  </Typography.Title>
-                }
-              >
-                <Card bordered={true} style={{ borderBottom: "none" }}>
-                  <Typography.Title
-                    level={1}
-                    style={{ margin: 0, textTransform: "uppercase" }}
-                  >
-                    <Space direction="vertical" size="large">
-                      <Token
-                        amount={data.earnedRewards.NDX.amount.toFixed(2)}
-                        symbol="NDX"
-                        name="NDX"
-                        size="large"
-                      />
-                      <Typography.Text
-                        type="success"
-                        style={{ textAlign: "right", margin: 0 }}
-                      >
-                        {data.earnedRewards.NDX.value}
-                      </Typography.Text>
-                    </Space>
-                  </Typography.Title>
-                </Card>
-                <Card
-                  bordered={true}
-                  style={{ borderTopLeftRadius: 0, borderTopRightRadius: 0 }}
-                >
-                  <Typography.Title
-                    level={1}
-                    style={{ margin: 0, textTransform: "uppercase" }}
-                  >
-                    <Space direction="vertical" size="large">
-                      <Token
-                        amount={data.earnedRewards.SUSHI.amount.toFixed(2)}
-                        symbol="SUSHI"
-                        name="SUSHI"
-                        size="large"
-                      />
-                      <Typography.Text
-                        type="success"
-                        style={{ textAlign: "right", margin: 0 }}
-                      >
-                        {data.earnedRewards.SUSHI.value}
-                      </Typography.Text>
-                    </Space>
-                  </Typography.Title>
-                </Card>
-              </Card>
-            </Col>
-            <Col xs={24} lg={8}>
-              <Card
-                title={
-                  <Typography.Title
-                    type="warning"
-                    level={3}
-                    style={{
-                      margin: 0,
-                      marginRight: 24,
-                      textTransform: "uppercase",
-                    }}
-                  >
-                    Breakdown
-                  </Typography.Title>
-                }
-                bordered={false}
-              >
-                <PortfolioPieChart data={data.chart} />
-              </Card>
-            </Col>
-            {/* <Col xs={24} lg={8}>
-              <div
-                style={{
-                  position: "relative",
-                  width: 200,
-                  height: 200,
-                  transform: `scale(${isMobile ? "1.2" : "1.6"}) ${
-                    isMobile ? "translateX(80px) translateY(40px)" : ""
-                  }`,
-                }}
-              >
-                <PortfolioPieChart data={data.chart} />
-              </div>
-            </Col> */}
-          </Row>
-          <VaultSection />
-          <IndexSection />
-          <LiquiditySection />
-        </>
-      ) : (
-        <Space direction="vertical" align="center" style={{ width: "100%" }}>
-          <Empty description="No wallet detected." />
-          <WalletConnector />
-        </Space>
-      )}
-    </Page>
-  );
-}
diff --git a/src/components/routes/Splash.tsx b/src/components/routes/Splash.tsx
index 6677dda9..d9761429 100644
--- a/src/components/routes/Splash.tsx
+++ b/src/components/routes/Splash.tsx
@@ -4,10 +4,9 @@ import {
   Logo,
   Page,
   SplashSection,
-  VaultGroup,
 } from "components/atomic";
 import { selectors } from "features";
-import { useAllVaultsRegistrar, useBreakpoints, useVaultsCount } from "hooks";
+import { useBreakpoints } from "hooks";
 import { useHistory } from "react-router-dom";
 import { useSelector } from "react-redux";
 
@@ -18,8 +17,6 @@ export default function Splash() {
   );
   const history = useHistory();
   const { isMobile } = useBreakpoints();
-  const vaultsCount = useVaultsCount();
-  useAllVaultsRegistrar();
 
   return (
     <Page hasPageHeader={false}>
@@ -65,19 +62,73 @@ export default function Splash() {
           </Divider>
         </div>
       </div>
+
       <Alert
         style={{ textAlign: "center" }}
-        type="info"
+        type="warning"
         message={
-          <>
-            NEW: Enter a timelock with your NDX governance tokens and receive
-            dNDX for a proportional claim on protocol revenue.{" "}
-            <Button type="primary" onClick={() => history.push("/timelocks")}>
-              Try it
+          <div style={{ display: "flex", flexDirection: "column" }}>
+            <span>
+              Remaining assets left unaffected from the{" "}
+              <a
+                href="https://etherscan.io/token/0xfa6de2697d59e88ed7fc4dfe5a33dac43565ea41"
+                target="_blank"
+                rel="noreferrer"
+              >
+                DEFI5
+              </a>{", "}
+              and{" "}
+              <a
+                href="https://etherscan.io/token/0x17ac188e09a7890a1844e5e65471fe8b0ccfadf3"
+                target="_blank"
+                rel="noreferrer"
+              >
+                CC10
+              </a>{" and "}
+               <a
+                href="https://etherscan.io/token/0xabafa52d3d5a2c18a4c1ae24480d22b831fc0413"
+                target="_blank"
+                rel="noreferrer"
+              >
+                FFF
+              </a>{" "}
+              <a
+                href="https://ndxfi.medium.com/indexed-attack-post-mortem-b006094f0bdc"
+                style={{ color: "#FF160C" }}
+                target="_blank"
+                rel="noreferrer"
+              >
+                exploits
+              </a>{" "}
+              are available to redeem.
+            </span>
+            <br></br>
+            <span>
+              If you are an effected victim that held any of the above assets at the time of the exploit and still have the associated balances, they can be redeemed for
+              the remaining underlying assets.
+            </span>
+
+            <Button
+              type="primary"
+              danger
+              style={{
+                padding: "5px!important",
+                alignSelf: "center",
+                marginTop: "10px",
+              }}
+            >
+              <a
+                href="http://drain-reversal.indexed.finance/"
+                target="_blank"
+                rel="noreferrer"
+              >
+                Redemption
+              </a>
             </Button>
-          </>
+          </div>
         }
       />
+
       <Divider />
       <SplashSection
         banner={require("images/indexpools_banner.png").default}
@@ -94,43 +145,8 @@ export default function Splash() {
       >
         {poolsExist && <IndexPoolWidgetGroup />}
       </SplashSection>
-      {vaultsCount > 0
-        ? <>
-          <Divider />
-          <SplashSection
-            banner={require("images/vaults_banner.png").default}
-            title="VAULTS"
-            description="Lend out your assets via Indexed Earn and receive the guaranteed best interest rates across the major lending protocols in DeFi. Low-fee and no-maintenance: let our non-custodial vaults do the work of allocating your funds for maximum impact."
-            catchphrase="Earn interest on your assets"
-            actionText="Explore Vaults"
-            infoText="How it works"
-            onAction={() => history.push("/vaults")}
-            onInfo={() =>
-              (window.location.href =
-                "https://docs.indexed.finance/introduction/faq/nirn-faq")
-            }
-          >
-            <VaultGroup withTitle={true} />
-          </SplashSection>
-        </>
-        : <> </>
-      }
-      
+
       <Divider />
-      <SplashSection
-        banner={require("images/staking_banner.png").default}
-        title="STAKING"
-        description="Provide liquidity for our index products on major decentralised exchanges and earn our protocol governance token as a reward! Select index products are also eligible for rewards by staking them single-sided. No fees, no lock-up periods."
-        catchphrase="Supply liquidity and earn NDX"
-        actionText="Stake Now"
-        infoText="Read up"
-        onAction={() => history.push("/staking")}
-        onInfo={() =>
-          (window.location.href = "https://www.youtube.com/watch?v=gp7yh8Cr9iA")
-        }
-      >
-        {null}
-      </SplashSection>
     </Page>
   );
 }
diff --git a/src/components/routes/Stake.tsx b/src/components/routes/Stake.tsx
deleted file mode 100644
index eb578356..00000000
--- a/src/components/routes/Stake.tsx
+++ /dev/null
@@ -1,406 +0,0 @@
-import { Alert, Button, Col, Descriptions, Row, Space, Statistic } from "antd";
-import {
-  AppState,
-  FormattedPortfolioAsset,
-  NormalizedStakingPool,
-  selectors,
-} from "features";
-import { ExternalLink, Label, Page, TokenSelector } from "components/atomic";
-import { Formik, useFormikContext } from "formik";
-import { Link, useParams } from "react-router-dom";
-import { abbreviateAddress, convert, explorerAddressLink, uniswapInfoPairLink } from "helpers";
-import { format } from "date-fns";
-import { useMemo } from "react";
-import { usePortfolioData, useStakingTransactionCallbacks } from "hooks";
-import { useSelector } from "react-redux";
-import BigNumber from "bignumber.js";
-
-function StakingForm({
-  token,
-  stakingToken,
-  expired,
-}: {
-  token: FormattedPortfolioAsset;
-  stakingToken: NormalizedStakingPool;
-  expired: boolean;
-}) {
-  const { setFieldValue, values, errors } = useFormikContext<{
-    amount: {
-      displayed: string;
-      exact: BigNumber;
-    };
-    inputType: "stake" | "unstake";
-  }>();
-  const { stake, withdraw, exit, claim } = useStakingTransactionCallbacks(
-    stakingToken.id
-  );
-  const [staked, earned] = useMemo(() => {
-    const staked = stakingToken.userData?.userStakedBalance;
-    const earned = stakingToken.userData?.userRewardsEarned;
-
-    return [staked, earned];
-  }, [stakingToken]);
-  const [estimatedReward, weight] = useMemo<[string, BigNumber]>(() => {
-    const stakedAmount = convert.toBigNumber(staked ?? "0");
-    const addAmount =
-      values.inputType === "stake"
-        ? values.amount.exact
-        : values.amount.exact.negated();
-    const userNewStaked = stakedAmount.plus(addAmount);
-    if (userNewStaked.isLessThan(0) || expired) {
-      return ["0.00", convert.toBigNumber("0.00")];
-    }
-    const totalStaked = convert.toBigNumber(stakingToken.totalSupply);
-    const newTotalStaked = totalStaked.plus(addAmount);
-    const dailyRewardsTotal = convert.toBalanceNumber(
-      convert.toBigNumber(stakingToken.rewardRate).times(86400),
-      18
-    );
-    const weight = userNewStaked.dividedBy(newTotalStaked);
-    const result = weight.multipliedBy(dailyRewardsTotal);
-
-    return [convert.toComma(result.toNumber()), weight];
-  }, [
-    values.amount,
-    stakingToken.totalSupply,
-    stakingToken.rewardRate,
-    staked,
-    expired,
-    values.inputType,
-  ]);
-  const handleSubmit = () => {
-    (values.inputType === "stake" ? stake : withdraw)(
-      convert.toToken(values.amount.exact, token.decimals).toString()
-    );
-  };
-
-  if (expired) {
-    return (
-      <>
-        <Space direction="vertical" size="large" style={{ width: "100%" }}>
-          <Alert
-            style={{ textAlign: "center" }}
-            type="warning"
-            message="This staking pool has expired. New deposits can not be made,
-            and all staked tokens should be withdrawn."
-          />
-          {convert.toBigNumber(staked ?? "0.00").isGreaterThan(0) && (
-            <>
-              <Row
-                style={{ textAlign: "center", width: "100%" }}
-                justify="center"
-              >
-                <Col span={16}>
-                  <h2>
-                    Staked: {staked} {token.symbol}
-                  </h2>
-                </Col>
-              </Row>
-              <Row
-                style={{ textAlign: "center", width: "100%" }}
-                justify="center"
-              >
-                <Col span={16}>
-                  <h2>Rewards: {token.ndxEarned} NDX</h2>
-                </Col>
-              </Row>
-
-              <Row
-                style={{ textAlign: "center", width: "100%" }}
-                justify="center"
-              >
-                <Col span={12}>
-                  <Button
-                    type="primary"
-                    block={true}
-                    disabled={parseFloat(staked || "0") <= 0}
-                    danger
-                    title="Withdraw all staked tokens and rewards."
-                    onClick={exit}
-                  >
-                    Exit
-                  </Button>
-                </Col>
-              </Row>
-            </>
-          )}
-        </Space>
-      </>
-    );
-  }
-
-  return (
-    <>
-      <Space direction="vertical" size="large" style={{ width: "100%" }}>
-        <TokenSelector
-          assets={[]}
-          value={{
-            token: token.symbol,
-            amount: values.amount,
-          }}
-          balanceLabel={values.inputType === "unstake" ? "Staked" : undefined}
-          balanceOverride={
-            values.inputType === "unstake"
-              ? {
-                  displayed:
-                    convert.toBalance(
-                      convert.toBigNumber(staked ?? "0"),
-                      token.decimals
-                    ) ?? "0.00",
-                  exact: convert.toBigNumber(staked ?? "0"),
-                }
-              : undefined
-          }
-          isInput={true}
-          autoFocus={true}
-          selectable={false}
-          onChange={(value) => {
-            setFieldValue("amount", value.amount);
-          }}
-          balance={
-            values.inputType === "unstake"
-              ? {
-                  displayed: staked ?? "0.00",
-                  exact: convert.toBigNumber(staked ?? "0"),
-                }
-              : {
-                  displayed: token.balance ?? "0.00",
-                  exact: convert.toBigNumber(token.balance ?? "0"),
-                }
-          }
-          error={errors.amount?.displayed}
-        />
-        <Alert
-          type="warning"
-          message={
-            <Row style={{ textAlign: "center" }}>
-              <Col span={12}>
-                <Statistic
-                  title="Estimated Reward"
-                  value={`${estimatedReward} NDX / Day`}
-                />
-              </Col>
-              <Col span={12}>
-                <Statistic
-                  title="Pool Weight"
-                  value={convert.toPercent(weight.toNumber())}
-                />
-              </Col>
-            </Row>
-          }
-        />
-        <Button.Group style={{ width: "100%" }}>
-          <Button
-            type="primary"
-            danger={values.inputType === "unstake"}
-            block={true}
-            onClick={handleSubmit}
-            disabled={
-              values.inputType === "stake"
-                ? expired
-                : parseFloat(staked || "0") <= 0
-            }
-          >
-            {values.inputType === "stake" ? "Deposit" : "Withdraw"}
-          </Button>
-          <Button
-            type="primary"
-            danger={values.inputType === "stake"}
-            block={true}
-            onClick={() =>
-              setFieldValue(
-                "inputType",
-                values.inputType === "stake" ? "unstake" : "stake"
-              )
-            }
-          >
-            {values.inputType === "stake" ? "Withdraw" : "Deposit"}
-          </Button>
-        </Button.Group>
-        <Space direction="vertical" style={{ width: "100%" }}>
-          <Label>Actions</Label>
-          <Button
-            type="default"
-            block={true}
-            disabled={parseFloat(earned || "0") <= 0}
-            onClick={claim}
-            title="Claim NDX rewards"
-          >
-            Claim
-          </Button>
-          <Button
-            type="default"
-            block={true}
-            disabled={parseFloat(staked || "0") <= 0}
-            title="Withdraw all staked tokens and rewards."
-            onClick={exit}
-          >
-            Exit
-          </Button>
-        </Space>
-      </Space>
-    </>
-  );
-}
-
-function StakingStats({
-  symbol,
-  stakingToken,
-  expired,
-}: {
-  expired: boolean;
-  symbol: string;
-  stakingToken: NormalizedStakingPool;
-}) {
-  const slug = useSelector((state: AppState) =>
-    stakingToken.isWethPair
-      ? null
-      : selectors.selectFormattedIndexPool(state, stakingToken.indexPool)
-          ?.slug ?? ""
-  );
-
-  const [staked, earned] = useMemo(() => {
-    let staked = stakingToken.userData?.userStakedBalance;
-    let earned = stakingToken.userData?.userRewardsEarned;
-    staked = staked ? convert.toBalance(staked, 18) : "0";
-    earned = earned ? convert.toBalance(earned, 18) : "0";
-    return [staked, earned];
-  }, [stakingToken]);
-
-  return (
-    <Descriptions bordered={true} column={1}>
-      <Descriptions.Item label="Earned Rewards">
-        {parseFloat(earned) > 0 ? (
-          <Row style={{ textAlign: "center" }}>
-            <Col span={12}>{earned} NDX</Col>
-            <Col span={12}>
-              <Button type="primary" block={true}>
-                Claim
-              </Button>
-            </Col>
-          </Row>
-        ) : (
-          <>{earned} NDX</>
-        )}
-      </Descriptions.Item>
-
-      <Descriptions.Item label="Currently Staking">
-        {staked} {symbol}
-      </Descriptions.Item>
-
-      <Descriptions.Item
-        label="Reward Rate per Day"
-        contentStyle={{ color: expired ? "#333" : "inherit" }}
-      >
-        {expired
-          ? "Expired"
-          : `${convert.toBalance(
-              (parseFloat(stakingToken.rewardRate) * 86400).toString()
-            )} NDX`}
-      </Descriptions.Item>
-
-      <Descriptions.Item label="Rewards Pool">
-        <ExternalLink to={explorerAddressLink(stakingToken.id)}>
-          {abbreviateAddress(stakingToken.id)}
-        </ExternalLink>
-      </Descriptions.Item>
-
-      <Descriptions.Item
-        label={expired ? "Staking Ended" : "Staking Ends"}
-        contentStyle={{ color: expired ? "#333" : "inherit" }}
-      >
-        {format(stakingToken.periodFinish * 1000, "MMM c, yyyy HH:mm:ss")} UTC
-      </Descriptions.Item>
-      <Descriptions.Item label="Total Staked">
-        {convert.toBalance(stakingToken.totalSupply, 18, true)} {symbol}
-      </Descriptions.Item>
-      <Descriptions.Item label="Staking Token">
-        {stakingToken.isWethPair ? (
-          <ExternalLink
-            to={uniswapInfoPairLink(stakingToken.stakingToken)}
-          >
-            {symbol}
-          </ExternalLink>
-        ) : (
-          <Link to={slug ?? ""}>{symbol}</Link>
-        )}
-      </Descriptions.Item>
-    </Descriptions>
-  );
-}
-
-export default function Stake() {
-  const { id } = useParams<{ id: string }>();
-  const data = usePortfolioData({ onlyOwnedAssets: false });
-  const toStake = useSelector((state: AppState) =>
-    selectors.selectStakingPool(state, id)
-  );
-  const relevantPortfolioToken = useMemo(
-    () =>
-      toStake
-        ? data.tokens.find(
-            (token) =>
-              token.address.toLowerCase() === toStake.stakingToken.toLowerCase()
-          )
-        : null,
-    [data.tokens, toStake]
-  );
-
-  if (!(toStake && relevantPortfolioToken)) {
-    return <div>Derp</div>;
-  }
-
-  const isExpired = toStake.periodFinish < Date.now() / 1000;
-  const stakingToken = relevantPortfolioToken.symbol;
-
-  return (
-    <Page hasPageHeader={true} title={`Stake ${stakingToken}`}>
-      <Space direction="vertical" style={{ width: "100%" }} size="large">
-        <Row gutter={100}>
-          <Col span={10}>
-            <Formik
-              initialValues={{
-                asset: "",
-                amount: 0,
-                inputType: "stake",
-              }}
-              onSubmit={console.log}
-              validateOnChange={true}
-              validateOnBlur={true}
-              validate={(values) => {
-                const errors: Record<string, string> = {};
-                const maximum =
-                  values.inputType === "stake"
-                    ? parseFloat(
-                        convert.toBalance(relevantPortfolioToken.balance)
-                      )
-                    : parseFloat(
-                        convert.toBalance(
-                          toStake.userData?.userStakedBalance ?? "0"
-                        )
-                      );
-                if (values.amount > maximum) {
-                  errors.amount = "Insufficient balance.";
-                }
-                return errors;
-              }}
-            >
-              <StakingForm
-                token={relevantPortfolioToken}
-                stakingToken={toStake}
-                expired={isExpired}
-              />
-            </Formik>
-          </Col>
-          <Col span={14}>
-            <StakingStats
-              symbol={stakingToken}
-              stakingToken={toStake}
-              expired={isExpired}
-            />
-          </Col>
-        </Row>
-      </Space>
-    </Page>
-  );
-}
diff --git a/src/components/routes/Staking.tsx b/src/components/routes/Staking.tsx
deleted file mode 100644
index d2e4d577..00000000
--- a/src/components/routes/Staking.tsx
+++ /dev/null
@@ -1,252 +0,0 @@
-import { AiOutlineWarning } from "react-icons/ai";
-import { Alert, Card, Checkbox, Col, Empty, Row, Typography } from "antd";
-import {
-  ExpiredNewStakingCard,
-  ExpiredStakingCard,
-  Page,
-  SingleSidedStakingCard,
-  SushiswapStakingCard,
-  UniswapStakingCard,
-} from "components/atomic";
-import { Fade } from "components/animations";
-import { ReactNode, useCallback, useEffect, useState } from "react";
-import { selectors } from "features";
-import {
-  useBreakpoints,
-  useNewStakingRegistrar,
-  useStakingRegistrar,
-  useTranslator,
-} from "hooks";
-import { useMasterChefRegistrar } from "hooks/masterchef-hooks";
-import { useSelector } from "react-redux";
-
-export default function Stake() {
-  const tx = useTranslator();
-  const stakingDetail = useSelector(selectors.selectFormattedStaking);
-  const newStakingDetail = useSelector(selectors.selectNewFormattedStaking);
-  const masterChefDetail = useSelector(
-    selectors.selectMasterChefFormattedStaking
-  );
-  const { isMobile } = useBreakpoints();
-  const [showing, setShowing] = useState({
-    singleSided: true,
-    sushiswap: true,
-    uniswap: true,
-    expired: false,
-  });
-  const handleViewOptionsChange = useCallback(
-    (activeKeys: (string | number | boolean)[]) =>
-      setShowing({
-        singleSided: activeKeys.includes("single-sided"),
-        sushiswap: activeKeys.includes("sushiswap"),
-        uniswap: activeKeys.includes("uniswap"),
-        expired: activeKeys.includes("expired"),
-      }),
-    []
-  );
-
-  const showingNothing = !Object.values(showing).some(Boolean);
-  const [fadedCard, setFadedCard] = useState(-1);
-  const inner = (
-    <>
-      {showing.singleSided &&
-        newStakingDetail.indexTokens.map((stakingPool, index) => (
-          <Fade key={stakingPool.id} in={fadedCard >= index}>
-            <SingleSidedStakingCard {...stakingPool} />
-          </Fade>
-        ))}
-
-      {showing.sushiswap &&
-        masterChefDetail.map((stakingPool, index) => (
-          <Fade key={stakingPool.id} in={fadedCard >= index}>
-            <SushiswapStakingCard key={stakingPool.id} {...stakingPool} />
-          </Fade>
-        ))}
-
-      {showing.uniswap &&
-        newStakingDetail.liquidityTokens.map((stakingPool, index) => (
-          <Fade key={stakingPool.id} in={fadedCard >= index}>
-            <UniswapStakingCard key={stakingPool.id} {...stakingPool} />
-          </Fade>
-        ))}
-
-      {showing.expired && (
-        <ExpiredAlert>
-          {stakingDetail.indexTokens.map((stakingPool, index) => (
-            <Fade key={stakingPool.id} in={fadedCard >= index}>
-              <ExpiredStakingCard key={stakingPool.id} {...stakingPool} />
-            </Fade>
-          ))}
-          {stakingDetail.liquidityTokens.map((stakingPool, index) => (
-            <Fade key={stakingPool.id} in={fadedCard >= index}>
-              <ExpiredStakingCard key={stakingPool.id} {...stakingPool} />
-            </Fade>
-          ))}
-          {newStakingDetail.expired.map((stakingPool, index) => (
-            <Fade key={stakingPool.id} in={fadedCard >= index}>
-              <ExpiredNewStakingCard key={stakingPool.id} {...stakingPool} />
-            </Fade>
-          ))}
-        </ExpiredAlert>
-      )}
-      {showingNothing && <Empty />}
-    </>
-  );
-
-  useStakingRegistrar();
-  useNewStakingRegistrar();
-  useMasterChefRegistrar();
-
-  useEffect(() => {
-    if (fadedCard < 50) {
-      setTimeout(() => {
-        setFadedCard((prev) => prev + 1);
-      }, 200);
-    }
-  }, [fadedCard]);
-
-  return (
-    <Page
-      hasPageHeader={true}
-      title={
-        <>
-          <Typography.Title level={isMobile ? 5 : 2}>
-            {tx("LIQUIDITY_MINING")}
-          </Typography.Title>
-        </>
-      }
-    >
-      <StakingViewOptions onChange={handleViewOptionsChange} />
-
-      {isMobile ? (
-        inner
-      ) : (
-        <Card
-          bordered={true}
-          style={{ marginTop: 24 }}
-          title={
-            <Row gutter={24}>
-              <Col xs={24} sm={6}>
-                <Typography.Title level={2}>Asset</Typography.Title>
-              </Col>
-              <Col xs={24} sm={5}>
-                <Typography.Title level={2}>Rewards</Typography.Title>
-              </Col>
-              <Col xs={24} sm={6}>
-                <Typography.Title level={2}>Total Staked</Typography.Title>
-              </Col>
-              <Col xs={24} sm={4} style={{ textAlign: "right" }}>
-                <Typography.Title level={2}>APR</Typography.Title>
-              </Col>
-            </Row>
-          }
-        >
-          {inner}
-        </Card>
-      )}
-    </Page>
-  );
-}
-
-function StakingViewOptions({
-  onChange,
-}: {
-  onChange(activeKeys: (string | number | boolean)[]): void;
-}) {
-  const { lg } = useBreakpoints();
-
-  return (
-    <Checkbox.Group
-      style={{
-        width: "100%",
-        display: "flex",
-        alignItems: "center",
-        flexDirection: lg ? "row" : "column",
-      }}
-      defaultValue={["single-sided", "sushiswap", "uniswap"]}
-      onChange={onChange}
-    >
-      <StakingViewOption
-        name="single-sided"
-        image={require("images/indexed.png").default}
-      >
-        Show Single-Sided
-      </StakingViewOption>
-      <StakingViewOption
-        name="sushiswap"
-        image={require("images/sushi.png").default}
-      >
-        Show Sushiswap
-      </StakingViewOption>
-      <StakingViewOption
-        name="uniswap"
-        image={require("images/uni.png").default}
-      >
-        Show Uniswap
-      </StakingViewOption>
-      <StakingViewOption
-        name="expired"
-        icon={
-          <Typography.Text type="danger">
-            <AiOutlineWarning fontSize={54} />
-          </Typography.Text>
-        }
-      >
-        Show Expired
-      </StakingViewOption>
-    </Checkbox.Group>
-  );
-}
-
-function StakingViewOption({
-  name,
-  children,
-  image,
-  icon: Icon,
-}: {
-  name: string;
-  children: ReactNode;
-  image?: string;
-  icon?: any;
-}) {
-  return (
-    <div
-      style={{
-        flex: 1,
-        display: "flex",
-        flexDirection: "column",
-        alignItems: "center",
-        justifyContent: "center",
-      }}
-    >
-      {image && (
-        <img
-          alt={`Staking Option ${name}`}
-          src={image}
-          style={{ width: 48, height: 48, marginBottom: 12 }}
-        />
-      )}
-      {Icon}
-      <Checkbox name={name} value={name}>
-        {children}
-      </Checkbox>
-    </div>
-  );
-}
-
-function ExpiredAlert({ children }: { children?: ReactNode }) {
-  return (
-    <Alert
-      type="error"
-      style={{ marginTop: 24 }}
-      showIcon={true}
-      message="Expired"
-      description={
-        <>
-          These pools are no longer distributing rewards.
-          {children}
-        </>
-      }
-    />
-  );
-}
diff --git a/src/components/routes/SushiswapStakeForm.tsx b/src/components/routes/SushiswapStakeForm.tsx
deleted file mode 100644
index 161ff7fc..00000000
--- a/src/components/routes/SushiswapStakeForm.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { AppState, selectors } from "features";
-import { ExternalLink, StakeForm } from "components/atomic";
-import { MASTER_CHEF_ADDRESS } from "config";
-import {
-  abbreviateAddress,
-  explorerAddressLink,
-  sushiswapAddLiquidityLink,
-  sushiswapInfoPairLink,
-} from "helpers";
-import {
-  useBalanceAndApprovalRegistrar,
-  useMasterChefRegistrar,
-  useMasterChefRewardsPerDay,
-  useMasterChefTransactionCallbacks,
-  usePair,
-  usePortfolioData,
-} from "hooks";
-import { useMasterChefAddress } from "hooks/address-hooks";
-import { useMemo } from "react";
-import { useParams } from "react-router-dom";
-import { useSelector } from "react-redux";
-
-export default function SushiswapStakeForm() {
-  const masterChefAddress = useMasterChefAddress()
-  const { id } = useParams<{ id: string }>();
-  const { stake, withdraw, exit, claim } = useMasterChefTransactionCallbacks(
-    id
-  );
-  const rewardsPerDay = useMasterChefRewardsPerDay(id);
-  const stakingPool = useSelector((state: AppState) =>
-    selectors.selectMasterChefPool(state, id)
-  );
-  const pair = usePair(stakingPool?.token ?? "");
-  const data = usePortfolioData({ onlyOwnedAssets: false });
-  const url =
-    pair && pair.token0 && pair.token1
-      ? sushiswapAddLiquidityLink(pair.token0, pair.token1)
-      : sushiswapInfoPairLink(stakingPool?.token ?? "");
-  const portfolioToken = useMemo(
-    () =>
-      stakingPool
-        ? data.tokens.find(
-            (token) =>
-              token.address.toLowerCase() === stakingPool.token.toLowerCase()
-          )
-        : null,
-    [data.tokens, stakingPool]
-  );
-
-  useMasterChefRegistrar();
-  useBalanceAndApprovalRegistrar(
-    masterChefAddress,
-    stakingPool ? [stakingPool.token] : []
-  );
-
-  return stakingPool && portfolioToken ? (
-    <StakeForm
-      stakingPool={stakingPool}
-      portfolioToken={portfolioToken}
-      spender={masterChefAddress}
-      onStake={stake}
-      onWithdraw={withdraw}
-      onExit={exit}
-      onClaim={claim}
-      poolLink={
-        <ExternalLink
-          to={explorerAddressLink(masterChefAddress)}
-        >
-          {abbreviateAddress(masterChefAddress)}
-        </ExternalLink>
-      }
-      stakingTokenLink={
-        <ExternalLink to={url}>{portfolioToken.symbol}</ExternalLink>
-      }
-      rewardsPerDay={rewardsPerDay.toString()}
-      rewardsAsset="SUSHI"
-      decimals={18} // TODO
-      formatAssetText={(amount: string) => `${amount} SUSHI / Day`}
-    />
-  ) : null;
-}
diff --git a/src/components/routes/UniswapStakeForm.tsx b/src/components/routes/UniswapStakeForm.tsx
deleted file mode 100644
index 305406ec..00000000
--- a/src/components/routes/UniswapStakeForm.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { AppState, selectors } from "features";
-import { ExternalLink, StakeForm } from "components/atomic";
-import { Link, useParams } from "react-router-dom";
-import { MULTI_TOKEN_STAKING_ADDRESS } from "config";
-import { abbreviateAddress, explorerAddressLink } from "helpers";
-import {
-  useBalanceAndApprovalRegistrar,
-  useNewStakingRegistrar,
-  useNewStakingTransactionCallbacks,
-  usePortfolioData,
-} from "hooks";
-import { useMemo } from "react";
-import { useMultiTokenStakingAddress } from "hooks/address-hooks";
-import { useSelector } from "react-redux";
-import S from "string";
-
-export default function UniswapStakeForm() {
-  const { id } = useParams<{ id: string }>();
-  const stakingAddress = useMultiTokenStakingAddress()
-  const { stake, withdraw, exit, claim } = useNewStakingTransactionCallbacks(
-    id
-  );
-  const stakingPool = useSelector((state: AppState) =>
-    selectors.selectNewStakingPool(state, id)
-  );
-  const data = usePortfolioData({ onlyOwnedAssets: false });
-  const portfolioToken = useMemo(
-    () =>
-      stakingPool
-        ? data.tokens.find(
-            (token) =>
-              token.address.toLowerCase() === stakingPool.token.toLowerCase()
-          )
-        : null,
-    [data.tokens, stakingPool]
-  );
-
-  useNewStakingRegistrar();
-  useBalanceAndApprovalRegistrar(
-    stakingAddress,
-    stakingPool ? [stakingPool.token] : []
-  );
-
-  return stakingPool && portfolioToken ? (
-    <StakeForm
-      stakingPool={stakingPool}
-      portfolioToken={portfolioToken}
-      rewardsPerDay={stakingPool?.rewardsPerDay ?? "0.00"}
-      rewardsAsset="NDX"
-      spender={stakingAddress}
-      onStake={stake}
-      onWithdraw={withdraw}
-      onExit={exit}
-      onClaim={claim}
-      poolLink={
-        <ExternalLink
-          to={explorerAddressLink(stakingAddress)}
-        >
-          {abbreviateAddress(stakingAddress)}
-        </ExternalLink>
-      }
-      stakingTokenLink={
-        stakingPool.isWethPair ? (
-          <ExternalLink
-            to={`https://v2.info.uniswap.org/pair/${portfolioToken.address}`}
-          >
-            {portfolioToken.symbol}
-          </ExternalLink>
-        ) : (
-          <Link to={`/index-pools/${S(stakingPool.name).slugify().s}`}>
-            {stakingPool.symbol}
-          </Link>
-        )
-      }
-      decimals={stakingPool?.decimals ?? 18}
-      formatAssetText={(amount: string) => `${amount} NDX / Day`}
-    />
-  ) : null;
-}
diff --git a/src/components/routes/Vault.tsx b/src/components/routes/Vault.tsx
deleted file mode 100644
index 50c7d6ac..00000000
--- a/src/components/routes/Vault.tsx
+++ /dev/null
@@ -1,255 +0,0 @@
-import { AppState, selectors } from "features";
-import {
-  Card,
-  Col,
-  Progress,
-  Row,
-  Space,
-  Spin,
-  Tooltip,
-  Typography,
-} from "antd";
-import {
-  FormattedVault,
-  useBreakpoints,
-  useVault,
-  useVaultAPR,
-  useVaultAdapterAPRs,
-  useVaultInterestForUser,
-  useVaultRegistrar,
-  useVaultUserBalance,
-} from "hooks";
-import {
-  NirnProtocol,
-  Page,
-  Token,
-  VaultAdapterPieChart,
-  VaultForm,
-} from "components/atomic";
-import { ReactNode, useEffect, useRef } from "react";
-import { convert } from "helpers";
-import { createChart } from "lightweight-charts";
-import { useParams } from "react-router";
-import { useSelector } from "react-redux";
-
-export default function Vault() {
-  const { slug } = useParams<{ slug: string }>();
-  const vaultBySymbol = useSelector((state: AppState) =>
-    selectors.selectVaultBySymbol(state, slug)
-  );
-  const vault = useVault(vaultBySymbol?.id ?? "");
-
-  return vault ? <LoadedVault vault={vault} /> : null;
-}
-
-export function VaultHistoricalChart() {
-  const container = useRef<HTMLDivElement | null>(null);
-
-  useEffect(() => {
-    if (container.current) {
-      createChart(container.current);
-    }
-  }, []);
-
-  return <div ref={container}>Chart</div>;
-}
-
-// ===
-function CoreInformationSection({
-  children,
-  title,
-  tooltip,
-}: {
-  children: ReactNode;
-  title: string;
-  tooltip?: ReactNode;
-}) {
-  const inner = (
-    <Card
-      style={{ marginBottom: 24 }}
-      title={
-        <div
-          style={{
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "space-between",
-          }}
-        >
-          <Typography.Title level={2} type="warning">
-            {title}
-          </Typography.Title>
-        </div>
-      }
-    >
-      {children}
-    </Card>
-  );
-
-  return tooltip ? <Tooltip title={tooltip}>{inner}</Tooltip> : inner;
-}
-
-function toFixed(num: number, fixed: number) {
-  const re = new RegExp("^-?\\d+(?:.\\d{0," + (fixed || -1) + "})?");
-  const res = num.toString().match(re);
-  return res ? res[0] : "";
-}
-
-function LoadedVault({ vault }: { vault: FormattedVault }) {
-  const chartData = useVaultAdapterAPRs(vault.id).map((a, i) => ({
-    ...a,
-    value: vault.weights[i] * 100,
-    weight: vault.weights[i] * 100,
-    apr: +(a.apr * 100).toFixed(2),
-    baseAPR: +(a.baseAPR * 100).toFixed(2),
-  }));
-  const apr = useVaultAPR(vault.id);
-  const isLoadingApr = apr === 0;
-  const {
-    wrappedBalance: { displayed },
-  } = useVaultUserBalance(vault.id);
-  const { isMobile } = useBreakpoints();
-  const shortenAmount = (amount: string) => {
-    let shortenedAmount: string | number = +toFixed(parseFloat(amount), 3);
-    if (shortenedAmount !== parseFloat(amount)) {
-      shortenedAmount = `${shortenedAmount}…`;
-    }
-    return shortenedAmount;
-  };
-  const earnedInterest = useVaultInterestForUser(vault.id);
-
-  useVaultRegistrar(vault.id);
-
-  return (
-    <Page
-      hasPageHeader={true}
-      title={
-        <Space>
-          <Token
-            name={vault.underlying.symbol}
-            symbol={vault.underlying.symbol}
-            size="large"
-          />
-          <span>Nirn Vault</span>
-        </Space>
-      }
-      extra={
-        <Space direction="vertical">
-          <Typography.Title
-            level={3}
-            style={{ margin: 0, marginRight: "1rem" }}
-          >
-            Your Balance:{" "}
-            {!isMobile && (
-              <Typography.Text type="success">
-                <Tooltip title={`${displayed} ${vault.symbol}`}>
-                  {shortenAmount(displayed)}
-                </Tooltip>{" "}
-                {vault.symbol}
-              </Typography.Text>
-            )}
-          </Typography.Title>
-          {isMobile && (
-            <Typography.Title type="success" level={3}>
-              <Tooltip title={`${displayed} ${vault.symbol}`}>
-                {shortenAmount(displayed)}
-              </Tooltip>{" "}
-              {vault.symbol}
-            </Typography.Title>
-          )}
-
-          <Typography.Title
-            level={3}
-            style={{ margin: 0, marginRight: "1rem" }}
-          >
-            Earned Interest:{" "}
-            {!isMobile && (
-              <Typography.Text type="success">
-                <Tooltip
-                  title={`${earnedInterest.toString()} ${
-                    vault.underlying.symbol
-                  }`}
-                >
-                  {shortenAmount(earnedInterest.toString())}
-                </Tooltip>{" "}
-                {vault.underlying.symbol}
-              </Typography.Text>
-            )}
-          </Typography.Title>
-          {isMobile && (
-            <Typography.Title type="success" level={3}>
-              <Tooltip
-                title={`${earnedInterest.toString()} ${
-                  vault.underlying.symbol
-                }`}
-              >
-                {shortenAmount(earnedInterest.toString())}
-              </Tooltip>{" "}
-              {vault.underlying.symbol}
-            </Typography.Title>
-          )}
-        </Space>
-      }
-    >
-      <Row gutter={24}>
-        {/* Core Stats */}
-        <Col xs={24} md={6}>
-          {/* Protocols */}
-          <CoreInformationSection title="Protocols">
-            {vault.adapters.map((adapter, i) => (
-              <Space
-                style={{
-                  marginBottom: 12,
-                  justifyContent: "space-between",
-                  width: "100%",
-                }}
-              >
-                <Progress
-                  percent={chartData[i].weight}
-                  type="circle"
-                  size="small"
-                  width={48}
-                />
-                <NirnProtocol
-                  key={adapter.id}
-                  name={adapter.protocol.name}
-                  showName={true}
-                />
-              </Space>
-            ))}
-          </CoreInformationSection>
-          {/* TVL */}
-          <CoreInformationSection title="TVL" tooltip="Total Value Locked">
-            <Typography.Title level={1}>${vault.usdValue}</Typography.Title>
-          </CoreInformationSection>
-          {/* APR */}
-          <CoreInformationSection title="APR" tooltip="Annual Percentage Rate">
-            <Typography.Title level={1} type="success">
-              {isLoadingApr ? <Spin /> : convert.toPercent(apr / 100)}
-            </Typography.Title>
-          </CoreInformationSection>
-        </Col>
-        {/* Chart */}
-        <Col xs={24} md={10}>
-          <CoreInformationSection title="Breakdown">
-            <div
-              style={{
-                position: "relative",
-                width: 400,
-                height: 400,
-                marginBottom: 80,
-                transform: isMobile ? "scale(1.0)" : "scale(1.7)",
-                transformOrigin: 0,
-              }}
-            >
-              <VaultAdapterPieChart data={chartData} />
-            </div>
-          </CoreInformationSection>
-        </Col>
-        {/* Form */}
-        <Col xs={24} md={8}>
-          <VaultForm vault={vault} />
-        </Col>
-      </Row>
-    </Page>
-  );
-}
diff --git a/src/components/routes/Vaults.tsx b/src/components/routes/Vaults.tsx
deleted file mode 100644
index ef2dcab3..00000000
--- a/src/components/routes/Vaults.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Col, Row, Typography } from "antd";
-import { Page, VaultGroup } from "components/atomic";
-import { useAllVaultsRegistrar, useBreakpoints } from "hooks";
-
-export default function Vaults() {
-  const { isMobile } = useBreakpoints();
-
-  useAllVaultsRegistrar();
-
-  return (
-    <Page hasPageHeader={true} title="Vaults">
-      {!isMobile && (
-        <Row>
-          <Col xs={24} md={6} offset={6} style={{ textAlign: "center" }}>
-            <Typography.Title level={2}>TVL</Typography.Title>
-          </Col>
-          <Col xs={24} md={6} style={{ textAlign: "center" }}>
-            <Typography.Title level={2}>APR</Typography.Title>
-          </Col>
-          <Col xs={24} md={6} style={{ textAlign: "center" }}>
-            <Typography.Title level={2}>Protocols</Typography.Title>
-          </Col>
-        </Row>
-      )}
-      <VaultGroup />
-    </Page>
-  );
-}
diff --git a/src/components/routes/index.ts b/src/components/routes/index.ts
index 5da955de..a837fc93 100644
--- a/src/components/routes/index.ts
+++ b/src/components/routes/index.ts
@@ -1,18 +1,11 @@
 // This file was generated via a script in `scripts/`.
 // Do not manually modify this (or any) index files.
 
-export * from './CreateTimelock';
-export * from './IndexPool';
-export * from './IndexPools';
-export * from './Learn';
-export * from './LearnArticle';
-export * from './Portfolio';
-export * from './Splash';
-export * from './Stake';
-export * from './Staking';
-export * from './SushiswapStakeForm';
-export * from './TimelockWithdrawal';
-export * from './Timelocks';
-export * from './UniswapStakeForm';
-export * from './Vault';
-export * from './Vaults';
\ No newline at end of file
+export * from "./CreateTimelock";
+export * from "./IndexPool";
+export * from "./IndexPools";
+export * from "./Learn";
+export * from "./LearnArticle";
+export * from "./Splash";
+export * from "./TimelockWithdrawal";
+export * from "./Timelocks";
diff --git a/src/ethereum/abi/interfaces.ts b/src/ethereum/abi/interfaces.ts
index 48d9c289..36aa991d 100644
--- a/src/ethereum/abi/interfaces.ts
+++ b/src/ethereum/abi/interfaces.ts
@@ -1,26 +1,25 @@
 import { Interface } from "ethers/lib/utils";
 
 import type {
-	AdapterRegistry,
-	ERC20DividendsOwned,
-	Erc20Adapter,
-	IERC20,
-	IIndexedUniswapV2Oracle,
-	IPool,
-	IPoolInitializer,
-	IndexedNarwhalRouter,
-	IndexedUniswapRouterBurner,
-	IndexedUniswapRouterMinter,
-	MasterChef,
-	MultiCall2,
-	MultiTokenStaking,
-	NirnVault,
-	Pair,
-	RewardsSchedule,
-	SharesTimeLock,
-	StakingRewards,
-	StakingRewardsFactory,
-	UniswapV2Router,
+  AdapterRegistry,
+  ERC20DividendsOwned,
+  Erc20Adapter,
+  IERC20,
+  IIndexedUniswapV2Oracle,
+  IPool,
+  IPoolInitializer,
+  IndexedNarwhalRouter,
+  IndexedUniswapRouterBurner,
+  IndexedUniswapRouterMinter,
+  MasterChef,
+  MultiCall2,
+  MultiTokenStaking,
+  Pair,
+  RewardsSchedule,
+  SharesTimeLock,
+  StakingRewards,
+  StakingRewardsFactory,
+  UniswapV2Router,
 } from "./types";
 
 import AdapterRegistry_ABI from "./AdapterRegistry.json";
@@ -44,71 +43,101 @@ import StakingRewardsFactory_ABI from "./StakingRewardsFactory.json";
 import StakingRewards_ABI from "./StakingRewards.json";
 import UniswapV2Router_ABI from "./UniswapV2Router.json";
 
-export const AdapterRegistryInterface = new Interface(AdapterRegistry_ABI) as AdapterRegistry["interface"];
-export const Erc20AdapterInterface = new Interface(Erc20Adapter_ABI) as Erc20Adapter["interface"];
-export const ERC20DividendsOwnedInterface = new Interface(ERC20DividendsOwned_ABI) as ERC20DividendsOwned["interface"];
+export const AdapterRegistryInterface = new Interface(
+  AdapterRegistry_ABI
+) as AdapterRegistry["interface"];
+export const Erc20AdapterInterface = new Interface(
+  Erc20Adapter_ABI
+) as Erc20Adapter["interface"];
+export const ERC20DividendsOwnedInterface = new Interface(
+  ERC20DividendsOwned_ABI
+) as ERC20DividendsOwned["interface"];
 export const IERC20Interface = new Interface(IERC20_ABI) as IERC20["interface"];
-export const IIndexedUniswapV2OracleInterface = new Interface(IIndexedUniswapV2Oracle_ABI) as IIndexedUniswapV2Oracle["interface"];
-export const IndexedNarwhalRouterInterface = new Interface(IndexedNarwhalRouter_ABI) as IndexedNarwhalRouter["interface"];
-export const IndexedUniswapRouterBurnerInterface = new Interface(IndexedUniswapRouterBurner_ABI) as IndexedUniswapRouterBurner["interface"];
-export const IndexedUniswapRouterMinterInterface = new Interface(IndexedUniswapRouterMinter_ABI) as IndexedUniswapRouterMinter["interface"];
+export const IIndexedUniswapV2OracleInterface = new Interface(
+  IIndexedUniswapV2Oracle_ABI
+) as IIndexedUniswapV2Oracle["interface"];
+export const IndexedNarwhalRouterInterface = new Interface(
+  IndexedNarwhalRouter_ABI
+) as IndexedNarwhalRouter["interface"];
+export const IndexedUniswapRouterBurnerInterface = new Interface(
+  IndexedUniswapRouterBurner_ABI
+) as IndexedUniswapRouterBurner["interface"];
+export const IndexedUniswapRouterMinterInterface = new Interface(
+  IndexedUniswapRouterMinter_ABI
+) as IndexedUniswapRouterMinter["interface"];
 export const IPoolInterface = new Interface(IPool_ABI) as IPool["interface"];
-export const IPoolInitializerInterface = new Interface(IPoolInitializer_ABI) as IPoolInitializer["interface"];
-export const MasterChefInterface = new Interface(MasterChef_ABI) as MasterChef["interface"];
-export const MultiCall2Interface = new Interface(MultiCall2_ABI) as MultiCall2["interface"];
-export const MultiTokenStakingInterface = new Interface(MultiTokenStaking_ABI) as MultiTokenStaking["interface"];
-export const NirnVaultInterface = new Interface(NirnVault_ABI) as NirnVault["interface"];
+export const IPoolInitializerInterface = new Interface(
+  IPoolInitializer_ABI
+) as IPoolInitializer["interface"];
+export const MasterChefInterface = new Interface(
+  MasterChef_ABI
+) as MasterChef["interface"];
+export const MultiCall2Interface = new Interface(
+  MultiCall2_ABI
+) as MultiCall2["interface"];
+export const MultiTokenStakingInterface = new Interface(
+  MultiTokenStaking_ABI
+) as MultiTokenStaking["interface"];
 export const PairInterface = new Interface(Pair_ABI) as Pair["interface"];
-export const RewardsScheduleInterface = new Interface(RewardsSchedule_ABI) as RewardsSchedule["interface"];
-export const SharesTimeLockInterface = new Interface(SharesTimeLock_ABI) as SharesTimeLock["interface"];
-export const StakingRewardsInterface = new Interface(StakingRewards_ABI) as StakingRewards["interface"];
-export const StakingRewardsFactoryInterface = new Interface(StakingRewardsFactory_ABI) as StakingRewardsFactory["interface"];
-export const UniswapV2RouterInterface = new Interface(UniswapV2Router_ABI) as UniswapV2Router["interface"];
+export const RewardsScheduleInterface = new Interface(
+  RewardsSchedule_ABI
+) as RewardsSchedule["interface"];
+export const SharesTimeLockInterface = new Interface(
+  SharesTimeLock_ABI
+) as SharesTimeLock["interface"];
+export const StakingRewardsInterface = new Interface(
+  StakingRewards_ABI
+) as StakingRewards["interface"];
+export const StakingRewardsFactoryInterface = new Interface(
+  StakingRewardsFactory_ABI
+) as StakingRewardsFactory["interface"];
+export const UniswapV2RouterInterface = new Interface(
+  UniswapV2Router_ABI
+) as UniswapV2Router["interface"];
 
 export {
-	AdapterRegistry_ABI,
-	Erc20Adapter_ABI,
-	ERC20DividendsOwned_ABI,
-	IERC20_ABI,
-	IIndexedUniswapV2Oracle_ABI,
-	IndexedNarwhalRouter_ABI,
-	IndexedUniswapRouterBurner_ABI,
-	IndexedUniswapRouterMinter_ABI,
-	IPool_ABI,
-	IPoolInitializer_ABI,
-	MasterChef_ABI,
-	MultiCall2_ABI,
-	MultiTokenStaking_ABI,
-	NirnVault_ABI,
-	Pair_ABI,
-	RewardsSchedule_ABI,
-	SharesTimeLock_ABI,
-	StakingRewards_ABI,
-	StakingRewardsFactory_ABI,
-	UniswapV2Router_ABI,
-}
+  AdapterRegistry_ABI,
+  Erc20Adapter_ABI,
+  ERC20DividendsOwned_ABI,
+  IERC20_ABI,
+  IIndexedUniswapV2Oracle_ABI,
+  IndexedNarwhalRouter_ABI,
+  IndexedUniswapRouterBurner_ABI,
+  IndexedUniswapRouterMinter_ABI,
+  IPool_ABI,
+  IPoolInitializer_ABI,
+  MasterChef_ABI,
+  MultiCall2_ABI,
+  MultiTokenStaking_ABI,
+  NirnVault_ABI,
+  Pair_ABI,
+  RewardsSchedule_ABI,
+  SharesTimeLock_ABI,
+  StakingRewards_ABI,
+  StakingRewardsFactory_ABI,
+  UniswapV2Router_ABI,
+};
 
 export const interfaceLookup = {
-	AdapterRegistry: AdapterRegistryInterface,
-	Erc20Adapter: Erc20AdapterInterface,
-	ERC20DividendsOwned: ERC20DividendsOwnedInterface,
-	IERC20: IERC20Interface,
-	IIndexedUniswapV2Oracle: IIndexedUniswapV2OracleInterface,
-	IndexedNarwhalRouter: IndexedNarwhalRouterInterface,
-	IndexedUniswapRouterBurner: IndexedUniswapRouterBurnerInterface,
-	IndexedUniswapRouterMinter: IndexedUniswapRouterMinterInterface,
-	IPool: IPoolInterface,
-	IPoolInitializer: IPoolInitializerInterface,
-	MasterChef: MasterChefInterface,
-	MultiCall2: MultiCall2Interface,
-	MultiTokenStaking: MultiTokenStakingInterface,
-	NirnVault: NirnVaultInterface,
-	Pair: PairInterface,
-	RewardsSchedule: RewardsScheduleInterface,
-	SharesTimeLock: SharesTimeLockInterface,
-	StakingRewards: StakingRewardsInterface,
-	StakingRewardsFactory: StakingRewardsFactoryInterface,
-	UniswapV2Router: UniswapV2RouterInterface,
-}
+  AdapterRegistry: AdapterRegistryInterface,
+  Erc20Adapter: Erc20AdapterInterface,
+  ERC20DividendsOwned: ERC20DividendsOwnedInterface,
+  IERC20: IERC20Interface,
+  IIndexedUniswapV2Oracle: IIndexedUniswapV2OracleInterface,
+  IndexedNarwhalRouter: IndexedNarwhalRouterInterface,
+  IndexedUniswapRouterBurner: IndexedUniswapRouterBurnerInterface,
+  IndexedUniswapRouterMinter: IndexedUniswapRouterMinterInterface,
+  IPool: IPoolInterface,
+  IPoolInitializer: IPoolInitializerInterface,
+  MasterChef: MasterChefInterface,
+  MultiCall2: MultiCall2Interface,
+  MultiTokenStaking: MultiTokenStakingInterface,
+  Pair: PairInterface,
+  RewardsSchedule: RewardsScheduleInterface,
+  SharesTimeLock: SharesTimeLockInterface,
+  StakingRewards: StakingRewardsInterface,
+  StakingRewardsFactory: StakingRewardsFactoryInterface,
+  UniswapV2Router: UniswapV2RouterInterface,
+};
 
-export type InterfaceKind = keyof typeof interfaceLookup;
\ No newline at end of file
+export type InterfaceKind = keyof typeof interfaceLookup;
diff --git a/src/features/batcher/slice.ts b/src/features/batcher/slice.ts
index 935ca9f1..c8d4a5c0 100644
--- a/src/features/batcher/slice.ts
+++ b/src/features/batcher/slice.ts
@@ -75,7 +75,8 @@ const slice = createSlice({
       const values = [action.payload].flat();
 
       for (const callRegistration of values) {
-        const { caller, onChainCalls, offChainCalls, chainId } = callRegistration;
+        const { caller, onChainCalls, offChainCalls, chainId } =
+          callRegistration;
         debugConsole.log(
           `REGISTER :: ${caller} : Registering ${onChainCalls.length} on-chain and ${offChainCalls.length} off-chain calls for ${caller}`
         );
@@ -87,7 +88,7 @@ const slice = createSlice({
         };
 
         for (const _call of onChainCalls) {
-          const call = { ..._call }
+          const call = { ..._call };
           if (!call.chainId) call.chainId = chainId;
           const callId = serializeOnChainCall(call);
 
@@ -102,7 +103,7 @@ const slice = createSlice({
         }
 
         for (const _call of offChainCalls) {
-          const call = { ..._call }
+          const call = { ..._call };
           if (!call.chainId) call.chainId = chainId;
           const callId = serializeOffChainCall(call);
 
@@ -131,7 +132,7 @@ const slice = createSlice({
       const { onChainCalls, offChainCalls, chainId } = action.payload;
 
       for (const _call of onChainCalls) {
-        const call = { ..._call }
+        const call = { ..._call };
         if (!call.chainId) call.chainId = chainId;
         const callId = serializeOnChainCall(call);
 
@@ -139,7 +140,7 @@ const slice = createSlice({
       }
 
       for (const _call of offChainCalls) {
-        const call = { ..._call }
+        const call = { ..._call };
         if (!call.chainId) call.chainId = chainId;
         const callId = serializeOffChainCall(call);
 
@@ -193,27 +194,21 @@ const slice = createSlice({
         (action) =>
           [
             // Put these in manually to avoid a circular dependency.
-            "staking/fetch/fulfilled",
             "indexPools/fetch/fulfilled",
             "indexPools/fetchUpdates/fulfilled",
             "indexPools/fetchTransactions/fulfilled",
             "batcher/multicall/fulfilled",
             "tokens/fetchPriceData/fulfilled",
-            "newStaking/fetch/fulfilled",
-            "vaults/fetch/fulfilled"
           ].includes(action.type),
         (state, action) => {
           if (action.payload) {
             const potentialArgs = Object.keys(action.payload).join("_");
             const callLookup = {
-              "staking/fetch/fulfilled": "fetchStakingData",
               "indexPools/fetch/fulfilled": `fetchIndexPools/${potentialArgs}`,
               "indexPools/fetchUpdates/fulfilled": `fetchIndexPoolUpdates/${potentialArgs}`,
               "indexPools/fetchTransactions/fulfilled": `fetchIndexPoolTransactions/${potentialArgs}`,
               "batcher/multicall/fulfilled": "fetchMulticallData",
               "tokens/fetchPriceData/fulfilled": `getTokenPriceData/${potentialArgs}`,
-              "newStaking/fetch/fulfilled": "fetchNewStakingData",
-              "vaults/fetch/fulfilled": "fetchVaultsData"
             };
             const call = callLookup[action.type as keyof typeof callLookup];
 
@@ -263,7 +258,7 @@ export const batcherSelectors = {
         .filter((k) => listenerCounts[k] > 0)
         .reduce(
           (prev, next) => {
-            const [chainId, call, args, canBeMerged] = next.split("/");
+            const [ , call, args, canBeMerged] = next.split("/");
             if (canBeMerged) {
               if (!prev.toMerge[call]) {
                 prev.toMerge[call] = [];
@@ -285,12 +280,21 @@ export const batcherSelectors = {
 
       return [...toKeep, ...merged];
     }
-    const keysForThisChain = onChainCalls.filter(c => +(c.split('/')[0]) === stateChainId).length;
-    console.log(`# OnChain Calls: ${onChainCalls.length} | # For Chain: ${keysForThisChain}`)
+    const keysForThisChain = onChainCalls.filter(
+      (c) => +c.split("/")[0] === stateChainId
+    ).length;
+    console.log(
+      `# OnChain Calls: ${onChainCalls.length} | # For Chain: ${keysForThisChain}`
+    );
     const activeAndOutdated = (k: string) => {
-      const [chainId] = k.split('/');
+      const [chainId] = k.split("/");
       const outdated = !cache[k] || cache[k].fromBlockNumber < blockNumber;
-      return listenerCounts[k] > 0 && outdated && !fetching[k] && stateChainId === +chainId;
+      return (
+        listenerCounts[k] > 0 &&
+        outdated &&
+        !fetching[k] &&
+        stateChainId === +chainId
+      );
     };
     return {
       callers,
diff --git a/src/features/categories/index.ts b/src/features/categories/index.ts
index 847b587e..29d32028 100644
--- a/src/features/categories/index.ts
+++ b/src/features/categories/index.ts
@@ -1,6 +1,6 @@
 // This file was generated via a script in `scripts/`.
 // Do not manually modify this (or any) index files.
 
+export * from './selectors';
 export * from './slice';
-export * from './types';
-export * from './selectors'
\ No newline at end of file
+export * from './types';
\ No newline at end of file
diff --git a/src/features/categories/slice.ts b/src/features/categories/slice.ts
index 6462a933..113320c7 100644
--- a/src/features/categories/slice.ts
+++ b/src/features/categories/slice.ts
@@ -1,9 +1,8 @@
 import { categoriesAdapter, categoriesSelectors as selectors } from "./selectors";
-import { createEntityAdapter, createSlice } from "@reduxjs/toolkit";
+import { createSlice } from "@reduxjs/toolkit";
 import { fetchInitialData } from "../requests";
 import { mirroredServerState, restartedDueToError } from "../actions";
 import type { AppState } from "../store";
-import type { NormalizedCategory } from "./types";
 
 const initialState = categoriesAdapter.getInitialState();
 const categoriesInitialState = categoriesAdapter.addMany(initialState, [
@@ -124,4 +123,3 @@ const slice = createSlice({
 });
 
 export const { actions: categoriesActions, reducer: categoriesReducer } = slice;
-
diff --git a/src/features/dailySnapshots/requests.ts b/src/features/dailySnapshots/requests.ts
index 0ea67581..5f10fcbc 100644
--- a/src/features/dailySnapshots/requests.ts
+++ b/src/features/dailySnapshots/requests.ts
@@ -1,30 +1,31 @@
-import { IndexedCoreSubgraphClient } from "@indexed-finance/subgraph-clients";
-import { NETWORKS_BY_ID } from "../../config";
-import { Timeframe } from "./selectors";
-import { createAsyncThunk } from "@reduxjs/toolkit";
+import { IndexedCoreSubgraphClient } from '@indexed-finance/subgraph-clients';
+import { NETWORKS_BY_ID } from '../../config';
+import { Timeframe } from './selectors';
+import { createAsyncThunk } from '@reduxjs/toolkit';
 
 const ONE_DAY = 24;
 const TIMEFRAME_TO_HOURS: Record<Timeframe, number> = {
-  "1D": ONE_DAY,
-  "1W": ONE_DAY * 7,
-  "2W": ONE_DAY * 14,
-  "1M": ONE_DAY * 30,
-  "3M": ONE_DAY * 90,
-  "6M": ONE_DAY * 180,
-  "1Y": ONE_DAY * 365,
+  '1D': ONE_DAY,
+  '1W': ONE_DAY * 7,
+  '2W': ONE_DAY * 14,
+  '1M': ONE_DAY * 30,
+  '3M': ONE_DAY * 90,
+  '6M': ONE_DAY * 180,
+  '1Y': ONE_DAY * 365,
 };
 
 export const fetchSnapshotsData = createAsyncThunk(
-  "dailySnapshots/fetch",
-  async ({ poolId, timeframe }: { poolId: string; timeframe: Timeframe }, { getState }) => {
+  'dailySnapshots/fetch',
+  async ({ poolId }: { poolId: string }, { getState }) => {
     const state = getState();
-    const chainId = (state as any).settings.network
+    const chainId = (state as any).settings.network;
     const network = NETWORKS_BY_ID[chainId].name;
     const client = IndexedCoreSubgraphClient.forNetwork(network);
-    const hours = TIMEFRAME_TO_HOURS[timeframe];
+    const threeMonths = TIMEFRAME_TO_HOURS['3M'];
+    // Requesting for 3 months to be able to get enough historical data when there is no data for the selected timeframe
 
     try {
-      const snapshots = await client.getPoolSnapshots(poolId, hours);
+      const snapshots = await client.getPoolSnapshots(poolId, threeMonths);
 
       return snapshots;
     } catch (error) {
diff --git a/src/features/dailySnapshots/selectors.ts b/src/features/dailySnapshots/selectors.ts
index 3b9ba7ba..fda5abf1 100644
--- a/src/features/dailySnapshots/selectors.ts
+++ b/src/features/dailySnapshots/selectors.ts
@@ -1,7 +1,7 @@
-import { DailyPoolSnapshot } from "indexed-types";
-import { createEntityAdapter } from "@reduxjs/toolkit";
-import type { AppState } from "features/store";
-import type { NormalizedDailySnapshot } from "./types";
+import { DailyPoolSnapshot } from 'indexed-types';
+import { createEntityAdapter } from '@reduxjs/toolkit';
+import type { AppState } from 'features/store';
+import type { NormalizedDailySnapshot } from './types';
 
 export const dailySnapshotsAdapter =
   createEntityAdapter<NormalizedDailySnapshot>({
@@ -19,14 +19,14 @@ export const dailySnapshotsSelectors = {
   selectSortedSnapshotsOfPool: (
     state: AppState,
     poolId: string,
-    direction: "asc" | "desc" = "asc"
+    direction: 'asc' | 'desc' = 'asc'
   ) => {
     const snapshots = selectors
       .selectAll(state)
       .filter((dailySnapshot) => dailySnapshot.id.includes(poolId));
 
     return [...snapshots].sort((left, right) =>
-      direction === "asc" ? left.date - right.date : right.date - left.date
+      direction === 'asc' ? left.date - right.date : right.date - left.date
     );
   },
   selectSortedSnapshotsOfPoolInTimeframe: (
@@ -37,7 +37,7 @@ export const dailySnapshotsSelectors = {
     const snapshots = dailySnapshotsSelectors.selectSortedSnapshotsOfPool(
       state,
       poolId,
-      "asc"
+      'asc'
     );
     const unixNow = Date.now() / 1000;
 
@@ -50,25 +50,42 @@ export const dailySnapshotsSelectors = {
     poolId: string,
     timeframe: Timeframe,
     key: K
-  ): { time: number; value: DailyPoolSnapshot[K]}[] => {
+  ): { time: number; value: DailyPoolSnapshot[K] }[] => {
     const oneDay = 86400;
     const maxAgeLookup: Record<Timeframe, number> = {
-      "1D": oneDay,
-      "1W": oneDay * 7,
-      "2W": oneDay * 14,
-      "1M": oneDay * 30,
-      "3M": oneDay * 90,
-      "6M": oneDay * 180,
-      "1Y": oneDay * 365,
+      '1D': oneDay,
+      '1W': oneDay * 7,
+      '2W': oneDay * 14,
+      '1M': oneDay * 30,
+      '3M': oneDay * 90,
+      '6M': oneDay * 180,
+      '1Y': oneDay * 365,
     };
     const maxAgeInSeconds = maxAgeLookup[timeframe];
-    const snapshots =
-      dailySnapshotsSelectors.selectSortedSnapshotsOfPoolInTimeframe(
-        state,
-        poolId,
-        maxAgeInSeconds
-      );
-    const timeSeriesData = snapshots.map((snapshot) => ({
+
+    const nonEmptySnapshotData = () => {
+      let timeframe = maxAgeInSeconds;
+      let snapshots =
+        dailySnapshotsSelectors.selectSortedSnapshotsOfPoolInTimeframe(
+          state,
+          poolId,
+          timeframe
+        );
+
+      while (snapshots.length < 3) {
+        timeframe += oneDay;
+        snapshots =
+          dailySnapshotsSelectors.selectSortedSnapshotsOfPoolInTimeframe(
+            state,
+            poolId,
+            timeframe
+          );
+      }
+
+      return snapshots;
+    };
+
+    const timeSeriesData = nonEmptySnapshotData().map((snapshot) => ({
       time: snapshot.date,
       value: snapshot[key],
     }));
@@ -79,7 +96,7 @@ export const dailySnapshotsSelectors = {
     const snapshots = dailySnapshotsSelectors.selectSortedSnapshotsOfPool(
       state,
       poolId,
-      "desc"
+      'desc'
     );
     const mostRecent = snapshots[0];
     return mostRecent;
@@ -178,4 +195,4 @@ export const dailySnapshotsSelectors = {
   },
 };
 
-export type Timeframe = "1D" | "1W" | "2W" | "1M" | "3M" | "6M" | "1Y";
+export type Timeframe = '1D' | '1W' | '2W' | '1M' | '3M' | '6M' | '1Y';
diff --git a/src/features/dailySnapshots/slice.ts b/src/features/dailySnapshots/slice.ts
index 38b015b0..7145a5f2 100644
--- a/src/features/dailySnapshots/slice.ts
+++ b/src/features/dailySnapshots/slice.ts
@@ -27,7 +27,8 @@ const slice = createSlice({
         const dailySnapshots = Object.values(action.payload)
           .filter((each) => Boolean(each))
           .reduce(
-            (prev, { snapshot }) => [...prev, snapshot as any], /** @todo replace state types with types from subgraph client package */
+            (prev, { snapshot }) => [...prev, snapshot as any],
+            /** replace state types with types from subgraph client package */
             [] as DailyPoolSnapshot[]
           );
         dailySnapshotsAdapter.addMany(state, dailySnapshots);
diff --git a/src/features/index.ts b/src/features/index.ts
index e8ab85d9..088b49f3 100644
--- a/src/features/index.ts
+++ b/src/features/index.ts
@@ -1,24 +1,20 @@
 // This file was generated via a script in `scripts/`.
 // Do not manually modify this (or any) index files.
 
-export * from './actions';
-export * from './batcher';
-export * from './categories';
-export * from './dailySnapshots';
-export * from './indexPools';
-export * from './masterChef';
-export * from './middleware';
-export * from './newStaking';
-export * from './pairs';
-export * from './reducer';
-export * from './requests';
-export * from './selectors';
-export * from './settings';
-export * from './staking';
-export * from './store';
-export * from './thunks';
-export * from './timelocks';
-export * from './tokens';
-export * from './transactions';
-export * from './user';
-export * from './vaults';
\ No newline at end of file
+export * from "./actions";
+export * from "./batcher";
+export * from "./categories";
+export * from "./dailySnapshots";
+export * from "./indexPools";
+export * from "./middleware";
+export * from "./pairs";
+export * from "./reducer";
+export * from "./requests";
+export * from "./selectors";
+export * from "./settings";
+export * from "./store";
+export * from "./thunks";
+export * from "./timelocks";
+export * from "./tokens";
+export * from "./transactions";
+export * from "./user";
diff --git a/src/features/indexPools/types.ts b/src/features/indexPools/types.ts
index f6b19681..53879432 100644
--- a/src/features/indexPools/types.ts
+++ b/src/features/indexPools/types.ts
@@ -1,5 +1,5 @@
-import { PoolSwapData as Swap } from '@indexed-finance/subgraph-clients/dist/core/types'
-import { PairSwapData as Trade } from '@indexed-finance/subgraph-clients/dist/uniswap/types'
+import { PoolSwapData as Swap } from "@indexed-finance/subgraph-clients/dist/core/types";
+import { PairSwapData as Trade } from "@indexed-finance/subgraph-clients/dist/uniswap/types";
 import type { IndexPool, PoolUnderlyingToken } from "indexed-types";
 
 export interface NormalizedIndexPool
@@ -23,7 +23,8 @@ export interface NormalizedIndexPool
   swapFee: string;
 }
 
-export type NormalizedIndexPoolTransactions = NormalizedIndexPool["transactions"];
+export type NormalizedIndexPoolTransactions =
+  NormalizedIndexPool["transactions"];
 
 export type NormalizedIndexPoolTokenUpdate = {
   address: string;
@@ -47,7 +48,6 @@ export type NormalizedPoolUpdate = {
 export interface FormattedIndexPool {
   chainId: number;
   category: string;
-  canStake: boolean;
   id: string;
   symbol: string;
   priceUsd: string;
diff --git a/src/features/masterChef/index.ts b/src/features/masterChef/index.ts
deleted file mode 100644
index cd5e0aa1..00000000
--- a/src/features/masterChef/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was generated via a script in `scripts/`.
-// Do not manually modify this (or any) index files.
-
-export * from './requests';
-export * from './slice';
-export * from './types';
\ No newline at end of file
diff --git a/src/features/masterChef/requests.ts b/src/features/masterChef/requests.ts
deleted file mode 100644
index e9bfcc06..00000000
--- a/src/features/masterChef/requests.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { MasterChefSubgraphClient } from "@indexed-finance/subgraph-clients";
-import { createAsyncThunk } from "@reduxjs/toolkit";
-import { ethers } from "ethers";
-
-export const fetchMasterChefData = createAsyncThunk(
-  "masterChef/fetch",
-  async ({
-    provider,
-  }: {
-    provider:
-      | ethers.providers.Web3Provider
-      | ethers.providers.JsonRpcProvider
-      | ethers.providers.InfuraProvider;
-  }) => {
-    const { chainId } = provider.network;
-
-    const name = chainId === 1 ? "mainnet" : "rinkeby";
-    const client = MasterChefSubgraphClient.forNetwork(name);
-    if (!client) return null;
-    try {
-      const data = await client.getStakingInfo();
-      const { pools, ...meta } = data;
-
-      return {
-        meta,
-        pools: pools.map(({ balance, ...pool }) => ({
-          ...pool,
-          totalStaked: balance,
-        })),
-      };
-    } catch (error) {
-      return null;
-    }
-  }
-);
diff --git a/src/features/masterChef/slice.ts b/src/features/masterChef/slice.ts
deleted file mode 100644
index 8a023c22..00000000
--- a/src/features/masterChef/slice.ts
+++ /dev/null
@@ -1,215 +0,0 @@
-import { MasterChefMeta, MasterChefPool, MasterChefUpdate } from "./types"; // Circular dependency.
-import { convert, createMulticallDataParser } from "helpers";
-import { createEntityAdapter, createSlice } from "@reduxjs/toolkit";
-import { fetchMasterChefData } from "./requests";
-import { fetchMulticallData } from "../batcher/requests";
-import { mirroredServerState, restartedDueToError } from "../actions";
-import type { AppState } from "../store";
-import type { CallWithResult } from "helpers";
-
-export const masterChefCaller = "MasterChef";
-
-const BLOCKS_PER_DAY = 86400 / 13.5;
-
-export const totalSushiPerDay = convert
-  .toToken("100", 18)
-  .times(BLOCKS_PER_DAY);
-
-const adapter = createEntityAdapter<MasterChefPool>({
-  selectId: (entry) => entry.id.toLowerCase(),
-});
-
-const initialState = {
-  metadata: {
-    totalAllocPoint: 0,
-    poolCount: 0,
-  } as MasterChefMeta,
-};
-
-const slice = createSlice({
-  name: "masterChef",
-  initialState: adapter.getInitialState(initialState),
-  reducers: {},
-  extraReducers: (builder) =>
-    builder
-      .addCase(fetchMasterChefData.fulfilled, (state, action) => {
-        if (action.payload) {
-          adapter.addMany(state, action.payload.pools);
-          state.metadata = {
-            ...state.metadata,
-            ...action.payload.meta,
-          };
-        }
-      })
-      .addCase(fetchMulticallData.fulfilled, (state, action) => {
-        const relevantMulticallData = masterChefMulticallDataParser(
-          action.payload
-        );
-        if (relevantMulticallData) {
-          const {
-            allocPointsByPool,
-            totalStakedByToken,
-            userDataByPool,
-            totalAllocPoint,
-          } = relevantMulticallData;
-          if (totalAllocPoint) {
-            state.metadata.totalAllocPoint = totalAllocPoint;
-          }
-          Object.entries(totalStakedByToken).forEach(([token, staked]) => {
-            const entry = Object.values(state.entities).find(
-              (e) => e?.token.toLowerCase() === token.toLowerCase()
-            );
-            if (entry) {
-              entry.totalStaked = staked;
-            }
-          });
-          Object.entries(userDataByPool).forEach(([pid, userData]) => {
-            const entry = state.entities[pid];
-            if (!entry) return;
-            entry.userEarnedRewards = userData.userEarnedRewards;
-            entry.userStakedBalance = userData.userStakedBalance;
-          });
-          Object.entries(allocPointsByPool).forEach(([pid, allocPoint]) => {
-            const entry = state.entities[pid];
-            if (!entry) return;
-            entry.allocPoint = allocPoint;
-          });
-        }
-
-        return state;
-      })
-      .addCase(mirroredServerState, (state, action) => {
-        if (!action.payload.masterChef) return;
-        for (const id of action.payload.masterChef.ids) {
-          const pool = action.payload.masterChef.entities[id];
-          const entry = state.entities[id.toLowerCase()];
-          if (entry) {
-            if (pool.allocPoint) {
-              entry.allocPoint = pool.allocPoint;
-            }
-          } else {
-            adapter.addOne(state, pool);
-          }
-        }
-      })
-      .addCase(restartedDueToError, () =>
-        adapter.getInitialState(initialState)
-      ),
-});
-
-export const { actions: masterChefActions, reducer: masterChefReducer } = slice;
-
-const selectors = adapter.getSelectors((state: AppState) => state.masterChef);
-
-export const masterChefSelectors = {
-  selectAllMasterChefPools(state: AppState) {
-    return selectors.selectAll(state);
-  },
-  selectMasterChefMeta(state: AppState) {
-    return state.masterChef.metadata;
-  },
-  selectMasterChefPool(state: AppState, id: string) {
-    return selectors.selectById(state, id);
-  },
-  selectMasterChefPoolByStakingToken(state: AppState, id: string) {
-    return masterChefSelectors
-      .selectAllMasterChefPools(state)
-      .find(({ token }) => token.toLowerCase() === id.toLowerCase());
-  },
-  selectMasterChefPoolsByStakingTokens(
-    state: AppState,
-    ids: string[]
-  ): Array<MasterChefPool | undefined> {
-    const allPools = masterChefSelectors.selectAllMasterChefPools(state);
-    return ids.map((id) =>
-      allPools.find((p) => p.token.toLowerCase() === id.toLowerCase())
-    );
-  },
-  selectMasterChefUserStakedBalance(state: AppState, id: string) {
-    return masterChefSelectors.selectMasterChefPool(state, id)
-      ?.userStakedBalance;
-  },
-  selectMasterChefInfoLookup(state: AppState, ids: string[]) {
-    return ids.reduce((prev, next) => {
-      const pool = masterChefSelectors.selectMasterChefPoolByStakingToken(
-        state,
-        next
-      );
-
-      if (pool) {
-        const { userStakedBalance = "0", userEarnedRewards = "0" } = pool;
-
-        prev[pool.token] = {
-          balance: convert.toBalanceNumber(userStakedBalance.toString(), 18, 6),
-          rewards: convert.toBalanceNumber(userEarnedRewards.toString(), 18, 6),
-        };
-      }
-
-      return prev;
-    }, {} as Record<string, { balance: number; rewards: number }>);
-  },
-};
-
-export const masterChefMulticallDataParser = createMulticallDataParser(
-  masterChefCaller,
-  (calls) => {
-    const update: MasterChefUpdate = {
-      totalStakedByToken: {},
-      userDataByPool: {},
-      allocPointsByPool: {},
-      totalAllocPoint: 0,
-    };
-    const handleCall = ([fn, results]: [string, CallWithResult[]]) => {
-      const formattedResults = results.map((item: CallWithResult) => ({
-        target: item.target,
-        args: item.args ?? [],
-        values: item.result ?? [],
-      }));
-      for (const { args, values, target } of formattedResults) {
-        const [result] = values;
-        const handlers: Record<string, () => void> = {
-          userInfo() {
-            const id = args[0];
-            if (!update.userDataByPool[id]) {
-              update.userDataByPool[id] = {
-                userStakedBalance: "",
-                userEarnedRewards: "",
-              };
-            }
-            update.userDataByPool[id].userStakedBalance = result.toString();
-          },
-          poolInfo() {
-            const id = args[0];
-            const [, allocPoint] = values;
-            update.allocPointsByPool[id] = +allocPoint.toString();
-          },
-          pendingSushi() {
-            const id = args[0];
-            if (!update.userDataByPool[id]) {
-              update.userDataByPool[id] = {
-                userStakedBalance: "",
-                userEarnedRewards: "",
-              };
-            }
-            update.userDataByPool[id].userEarnedRewards = result.toString();
-          },
-          totalAllocPoint() {
-            update.totalAllocPoint = +result.toString();
-          },
-          balanceOf() {
-            update.totalStakedByToken[target] = result.toString();
-          },
-        };
-        if (result) {
-          handlers[fn]();
-        }
-      }
-    };
-
-    calls.forEach(([, functions]) =>
-      Object.entries(functions).forEach(handleCall)
-    );
-
-    return update;
-  }
-);
diff --git a/src/features/masterChef/types.ts b/src/features/masterChef/types.ts
deleted file mode 100644
index 5642255b..00000000
--- a/src/features/masterChef/types.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-export type MasterChefPool = {
-  id: string;
-  token: string;
-  totalStaked: string;
-  allocPoint: number;
-  lastRewardBlock: number;
-  userCount: number;
-  updatedAt: number;
-  userStakedBalance?: string;
-  userEarnedRewards?: string;
-};
-
-export type MasterChefPoolUpdate = {
-  id: string;
-  totalStaked: string;
-  userStakedBalance?: string;
-  userEarnedRewards?: string;
-};
-
-export type MasterChefPoolUserUpdate = {
-  userStakedBalance?: string;
-  userEarnedRewards?: string;
-};
-
-export type MasterChefUpdate = {
-  totalStakedByToken: Record<string, string>;
-  userDataByPool: Record<string, MasterChefPoolUserUpdate>;
-  allocPointsByPool: Record<string, number>;
-  totalAllocPoint: number;
-};
-
-export type MasterChefMeta = {
-  totalAllocPoint: number;
-  poolCount: number;
-};
-
-export interface FormattedMasterChefData {
-  id: string;
-  slug?: string;
-  name: string;
-  symbol: string;
-  staked: string;
-  stakingToken: string;
-  earned: string;
-  rewardsPerDay: string;
-  isWethPair: boolean;
-  indexPool: string;
-  totalStaked: string;
-}
-
-export interface FormattedMasterChefStakingDetail {
-  indexTokens: FormattedMasterChefData[];
-  liquidityTokens: FormattedMasterChefData[];
-}
diff --git a/src/features/middleware.ts b/src/features/middleware.ts
index c601a595..1644b249 100644
--- a/src/features/middleware.ts
+++ b/src/features/middleware.ts
@@ -6,7 +6,7 @@ import {
   fetchIndexPoolTransactions,
   fetchIndexPoolUpdates,
 } from "./indexPools";
-import { fetchInitialData, fetchVaultsData } from "./requests";
+import { fetchInitialData } from "./requests";
 import { fetchMulticallData } from "./batcher";
 import { fetchTokenPriceData } from "./tokens";
 import { selectors } from "./selectors";
@@ -81,8 +81,11 @@ if (!process.env.IS_SERVER) {
 // #region Bad Network
 export function badNetworkMiddleware({ dispatch, getState }: any) {
   return (next: any) => (action: any) => {
-    const { settings: { network } } = getState();
-    const badNetwork = network === undefined || !SUPPORTED_NETWORKS.includes(network)
+    const {
+      settings: { network },
+    } = getState();
+    const badNetwork =
+      network === undefined || !SUPPORTED_NETWORKS.includes(network);
 
     if (
       action.type !== actions.userDisconnected.type &&
@@ -120,8 +123,10 @@ function handleBlockNumberChange(newBlockNumber: number) {
       if (provider) {
         const chainId = provider.network.chainId;
         provider.getGasPrice().then((gasPrice) => {
-          dispatch(actions.setGasPrice({ chainId, gasPrice: gasPrice.toNumber() }))
-        })
+          dispatch(
+            actions.setGasPrice({ chainId, gasPrice: gasPrice.toNumber() })
+          );
+        });
       }
     }
   }
@@ -218,7 +223,6 @@ export function handleBatchUpdate() {
             fetchIndexPoolTransactions,
             fetchIndexPoolUpdates,
             fetchTokenPriceData,
-            fetchVaultsData,
           }[fn] as any;
 
           if (request) {
diff --git a/src/features/newStaking/index.ts b/src/features/newStaking/index.ts
deleted file mode 100644
index cd5e0aa1..00000000
--- a/src/features/newStaking/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was generated via a script in `scripts/`.
-// Do not manually modify this (or any) index files.
-
-export * from './requests';
-export * from './slice';
-export * from './types';
\ No newline at end of file
diff --git a/src/features/newStaking/requests.ts b/src/features/newStaking/requests.ts
deleted file mode 100644
index 229062aa..00000000
--- a/src/features/newStaking/requests.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { IndexedStakingSubgraphClient } from "@indexed-finance/subgraph-clients";
-import { createAsyncThunk } from "@reduxjs/toolkit";
-import { ethers } from "ethers";
-import { pairsActions } from "../pairs";
-
-export const fetchNewStakingData = createAsyncThunk(
-  "newStaking/fetch",
-  async (
-    {
-      provider,
-    }: {
-      provider:
-        | ethers.providers.Web3Provider
-        | ethers.providers.JsonRpcProvider
-        | ethers.providers.InfuraProvider;
-    },
-    { dispatch }
-  ) => {
-    const { chainId } = provider.network;
-    const name = chainId === 1 ? "mainnet" : "rinkeby";
-    const client = IndexedStakingSubgraphClient.forNetwork(name);
-    if (!client) return null;
-    try {
-      const data = await client.getStakingInfo();
-      const { pools, ...meta } = data;
-      const pairTokens = pools
-        .filter((p) => p.isPairToken)
-        .map(({ token: id, token0, token1 }) => ({
-          id: id.toLowerCase(),
-          token0: token0?.toLowerCase(),
-          token1: token1?.toLowerCase(),
-          exists: true,
-        }));
-      dispatch(pairsActions.uniswapPairsRegistered({ pairs: pairTokens, chainId }));
-
-      return {
-        meta,
-        pools: pools.map(({ balance, isPairToken, ...pool }) => ({
-          ...pool,
-          totalStaked: balance,
-          isWethPair: isPairToken,
-          rewardsPerDay: "0",
-        })),
-      };
-    } catch (error) {
-      return null;
-    }
-  }
-);
diff --git a/src/features/newStaking/slice.ts b/src/features/newStaking/slice.ts
deleted file mode 100644
index 289044d0..00000000
--- a/src/features/newStaking/slice.ts
+++ /dev/null
@@ -1,213 +0,0 @@
-import { MULTI_TOKEN_STAKING_ADDRESS, REWARDS_SCHEDULE_ADDDRESS } from "config";
-import { NewStakingMeta, NewStakingPool, NewStakingUpdate } from "./types"; // Circular dependency.
-import { convert, createMulticallDataParser } from "helpers";
-import { createEntityAdapter, createSlice } from "@reduxjs/toolkit";
-import { fetchMulticallData } from "../batcher/requests";
-import { fetchNewStakingData } from "./requests";
-import { mirroredServerState, restartedDueToError } from "../actions";
-import type { AppState } from "../store";
-import type { CallWithResult } from "helpers";
-
-export const newStakingCaller = "NewStaking";
-
-const adapter = createEntityAdapter<NewStakingPool>({
-  selectId: (entry) => entry.id.toLowerCase(),
-});
-
-const initialState = {
-  metadata: {
-    id: MULTI_TOKEN_STAKING_ADDRESS[1],
-    owner: "",
-    rewardsSchedule: REWARDS_SCHEDULE_ADDDRESS[1],
-    startBlock: 12454000,
-    endBlock: 17232181,
-    rewardsToken: "0x86772b1409b61c639eaac9ba0acfbb6e238e5f83",
-    totalAllocPoint: 0,
-    poolCount: 0,
-  } as NewStakingMeta,
-};
-
-const slice = createSlice({
-  name: "newStaking",
-  initialState: adapter.getInitialState(initialState),
-  reducers: {},
-  extraReducers: (builder) =>
-    builder
-      .addCase(fetchNewStakingData.fulfilled, (state, action) => {
-        if (action.payload) {
-          adapter.addMany(state, action.payload.pools);
-          state.metadata = {
-            ...state.metadata,
-            ...action.payload.meta,
-          };
-        }
-      })
-      .addCase(fetchMulticallData.fulfilled, (state, action) => {
-        const relevantMulticallData = newStakingMulticallDataParser(
-          action.payload
-        );
-        if (relevantMulticallData) {
-          // console.log(`Got New Staking MultiCall Data`);
-          // console.log(relevantMulticallData)
-          const { totalRewardsPerDay, totalStakedByToken, userDataByPool } =
-            relevantMulticallData;
-          Object.entries(totalStakedByToken).forEach(([token, staked]) => {
-            const entry = Object.values(state.entities).find(
-              (e) => e?.token.toLowerCase() === token.toLowerCase()
-            );
-            if (entry) entry.totalStaked = staked;
-          });
-          Object.entries(userDataByPool).forEach(([pid, userData]) => {
-            const entry = state.entities[pid];
-            if (!entry) return;
-            entry.userEarnedRewards = userData.userEarnedRewards;
-            entry.userStakedBalance = userData.userStakedBalance;
-          });
-          if (totalRewardsPerDay) {
-            state.metadata.totalRewardsPerDay = totalRewardsPerDay;
-            const totalRewards = convert.toBigNumber(totalRewardsPerDay);
-            for (const id of state.ids) {
-              const entry = state.entities[id];
-              if (entry) {
-                entry.rewardsPerDay = totalRewards
-                  .times(entry.allocPoint)
-                  .div(state.metadata.totalAllocPoint)
-                  .toString();
-              }
-            }
-          }
-        }
-
-        return state;
-      })
-      .addCase(mirroredServerState, (_, action) => action.payload.newStaking)
-      .addCase(restartedDueToError, () =>
-        adapter.getInitialState(initialState)
-      ),
-});
-
-export const { actions: newStakingActions, reducer: newStakingReducer } = slice;
-
-const selectors = adapter.getSelectors((state: AppState) => state.newStaking);
-
-export const newStakingSelectors = {
-  selectAllNewStakingPools(state: AppState) {
-    return selectors.selectAll(state);
-  },
-  selectNewStakingMeta(state: AppState) {
-    return state.newStaking.metadata;
-  },
-  selectNewStakingPool(state: AppState, id: string) {
-    return selectors.selectById(state, id);
-  },
-  selectNewStakingPoolByStakingToken(state: AppState, id: string) {
-    return newStakingSelectors
-      .selectAllNewStakingPools(state)
-      .find(({ token }) => token.toLowerCase() === id.toLowerCase());
-  },
-  selectNewUserStakedBalance(state: AppState, id: string) {
-    return newStakingSelectors.selectNewStakingPool(state, id)
-      ?.userStakedBalance;
-  },
-  selectNewStakingPoolsByStakingTokens(
-    state: AppState,
-    ids: string[]
-  ): Array<NewStakingPool | undefined> {
-    const allPools = newStakingSelectors.selectAllNewStakingPools(state);
-
-    return ids.map((id) =>
-      allPools.find(
-        (p) =>
-          p.token.toLowerCase() === id.toLowerCase() ||
-          // Sometimes the address of the index pool is used instead of the staking pool.
-          p.token0?.toLowerCase() === id.toLowerCase() ||
-          p.token1?.toLowerCase() === id.toLowerCase()
-      )
-    );
-  },
-  selectNewStakingInfoLookup(state: AppState, ids: string[]) {
-    return ids.reduce((prev, next) => {
-      const pool = newStakingSelectors.selectNewStakingPoolByStakingToken(
-        state,
-        next
-      );
-
-      if (pool) {
-        const { userStakedBalance = "0", userEarnedRewards = "0" } = pool;
-
-        prev[pool.token.toLowerCase()] = {
-          balance: convert.toBalanceNumber(
-            userStakedBalance.toString(),
-            pool.decimals,
-            6
-          ),
-          rewards: convert.toBalanceNumber(
-            userEarnedRewards.toString(),
-            pool.decimals,
-            6
-          ),
-        };
-      }
-
-      return prev;
-    }, {} as Record<string, { balance: number; rewards: number }>);
-  },
-};
-
-export const newStakingMulticallDataParser = createMulticallDataParser(
-  newStakingCaller,
-  (calls) => {
-    const update: NewStakingUpdate = {
-      totalStakedByToken: {},
-      userDataByPool: {},
-      totalRewardsPerDay: "",
-    };
-    const handleCall = ([fn, results]: [string, CallWithResult[]]) => {
-      const formattedResults = results.map((item: CallWithResult) => ({
-        target: item.target,
-        args: item.args ?? [],
-        values: item.result ?? [],
-      }));
-      for (const { args, values, target } of formattedResults) {
-        const [result] = values;
-        const handlers: Record<string, () => void> = {
-          userInfo() {
-            const id = args[0];
-            if (!update.userDataByPool[id]) {
-              update.userDataByPool[id] = {
-                userStakedBalance: "",
-                userEarnedRewards: "",
-              };
-            }
-            update.userDataByPool[id].userStakedBalance = result.toString();
-          },
-          pendingRewards() {
-            const id = args[0];
-            if (!update.userDataByPool[id]) {
-              update.userDataByPool[id] = {
-                userStakedBalance: "",
-                userEarnedRewards: "",
-              };
-            }
-            update.userDataByPool[id].userEarnedRewards = result.toString();
-          },
-          balanceOf() {
-            update.totalStakedByToken[target] = result.toString();
-          },
-          getRewardsForBlockRange() {
-            update.totalRewardsPerDay = result.toString();
-          },
-        };
-        if (result) {
-          handlers[fn]();
-        }
-      }
-    };
-
-    calls.forEach(([, functions]) =>
-      Object.entries(functions).forEach(handleCall)
-    );
-
-    return update;
-  }
-);
diff --git a/src/features/newStaking/types.ts b/src/features/newStaking/types.ts
deleted file mode 100644
index a7ca8ce6..00000000
--- a/src/features/newStaking/types.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-export type NewStakingPool = {
-  id: string;
-  token: string;
-  symbol: string;
-  name: string;
-  decimals: number;
-  totalStaked: string;
-  isWethPair: boolean;
-  token0?: string;
-  token1?: string;
-  allocPoint: number;
-  lastRewardBlock: number;
-  userCount: number;
-  updatedAt: number;
-  rewardsPerDay: string;
-  userStakedBalance?: string;
-  userEarnedRewards?: string;
-};
-
-export type NewStakingPoolUpdate = {
-  id: string;
-  totalStaked: string;
-  userStakedBalance?: string;
-  userEarnedRewards?: string;
-};
-
-export type NewStakingPoolUserUpdate = {
-  userStakedBalance?: string;
-  userEarnedRewards?: string;
-};
-
-export type NewStakingUpdate = {
-  totalStakedByToken: Record<string, string>;
-  userDataByPool: Record<string, NewStakingPoolUserUpdate>;
-  totalRewardsPerDay: string;
-};
-
-export type NewStakingMeta = {
-  id: string;
-  owner: string;
-  rewardsSchedule: string;
-  startBlock: number;
-  endBlock: number;
-  rewardsToken: string;
-  totalAllocPoint: number;
-  poolCount: number;
-  totalRewardsPerDay?: string;
-};
-
-export interface FormattedNewStakingData {
-  id: string;
-  slug?: string;
-  name: string;
-  symbol: string;
-  staked: string;
-  stakingToken: string;
-  earned: string;
-  rewardsPerDay: string;
-  isWethPair: boolean;
-  indexPool: string;
-  totalStaked: string;
-  liquidityProvider?: string;
-}
-
-export interface FormattedNewStakingDetail {
-  indexTokens: FormattedNewStakingData[];
-  liquidityTokens: FormattedNewStakingData[];
-  expired: FormattedNewStakingData[];
-}
diff --git a/src/features/reducer.ts b/src/features/reducer.ts
index d0636095..9a7493aa 100644
--- a/src/features/reducer.ts
+++ b/src/features/reducer.ts
@@ -3,16 +3,12 @@ import { categoriesReducer } from "./categories";
 import { combineReducers } from "@reduxjs/toolkit";
 import { dailySnapshotsReducer } from "./dailySnapshots";
 import { indexPoolsReducer } from "./indexPools";
-import { masterChefReducer } from "./masterChef";
-import { newStakingReducer } from "./newStaking";
 import { pairsReducer } from "./pairs";
 import { settingsReducer } from "./settings";
-import { stakingReducer } from "./staking";
 import { timelocksReducer } from "./timelocks";
 import { tokensReducer } from "./tokens";
 import { transactionsReducer } from "./transactions";
 import { userReducer } from "./user";
-import { vaultsReducer } from "./vaults";
 
 export const rootReducer = combineReducers({
   batcher: batcherReducer,
@@ -21,12 +17,8 @@ export const rootReducer = combineReducers({
   indexPools: indexPoolsReducer,
   pairs: pairsReducer,
   settings: settingsReducer,
-  staking: stakingReducer,
-  newStaking: newStakingReducer,
   timelocks: timelocksReducer,
   tokens: tokensReducer,
   transactions: transactionsReducer,
   user: userReducer,
-  masterChef: masterChefReducer,
-  vaults: vaultsReducer,
 });
diff --git a/src/features/requests.ts b/src/features/requests.ts
index 3f6cfcad..ad33b860 100644
--- a/src/features/requests.ts
+++ b/src/features/requests.ts
@@ -2,14 +2,10 @@ import * as balancerMath from "ethereum/utils/balancer-math";
 import * as batcherRequests from "./batcher/requests";
 import * as dailySnapshotRequests from "./dailySnapshots/requests";
 import * as indexPoolsRequests from "./indexPools/requests";
-import * as newStakingRequests from "./newStaking/requests";
-import * as stakingRequests from "./staking/requests";
 import * as timelocksRequests from "./timelocks/requests";
 import * as tokensRequests from "./tokens/requests";
-import { COMMON_BASE_TOKENS, NDX_ADDRESS, NETWORKS_BY_ID } from "../config";
+import { COMMON_BASE_TOKENS, NDX_ADDRESS } from "../config";
 import { MIN_WEIGHT } from "ethereum";
-import { NirnSubgraphClient } from "@indexed-finance/subgraph-clients";
-import { VaultData } from "@indexed-finance/subgraph-clients/dist/nirn/types";
 import { convert, dedupe } from "helpers";
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import { ethers } from "ethers";
@@ -129,22 +125,28 @@ export async function queryInitialData(url: string): Promise<Category[]> {
 }
 
 export function normalizeInitialData(categories: Category[], chainId: number) {
-  const baseTokens = COMMON_BASE_TOKENS[chainId].map(t => ({ ...t, id: t.id.toLowerCase() }));
+  const baseTokens = COMMON_BASE_TOKENS[chainId].map((t) => ({
+    ...t,
+    id: t.id.toLowerCase(),
+  }));
   const ndxAddress = NDX_ADDRESS[chainId];
-  if (ndxAddress && !baseTokens.find(t => t.id === ndxAddress)) {
+  if (ndxAddress && !baseTokens.find((t) => t.id === ndxAddress)) {
     baseTokens.push({
       id: ndxAddress.toLowerCase(),
       chainId: 1,
       name: "Indexed",
       symbol: "NDX",
       decimals: 18,
-    })
+    });
   }
-  const baseTokenIds = baseTokens.map(t => t.id);
-  const baseTokenEntities = baseTokens.reduce((prev, next) => ({
-    [next.id]: next,
-    ...prev
-  }), {})
+  const baseTokenIds = baseTokens.map((t) => t.id);
+  const baseTokenEntities = baseTokens.reduce(
+    (prev, next) => ({
+      [next.id]: next,
+      ...prev,
+    }),
+    {}
+  );
   return categories.reduce(
     (prev, next) => {
       const category = next;
@@ -221,23 +223,22 @@ export function normalizeInitialData(categories: Category[], chainId: number) {
             ? {
                 usedBalance: token.balance,
                 usedDenorm: token.denorm,
-
               }
             : {
                 usedBalance: token.minimumBalance,
                 usedDenorm: MIN_WEIGHT,
               };
           const usedWeight = balancerMath
-              .bdiv(
-                convert.toBigNumber(extras.usedDenorm),
-                convert.toBigNumber(totalWeight)
-              )
-              .toString();
+            .bdiv(
+              convert.toBigNumber(extras.usedDenorm),
+              convert.toBigNumber(totalWeight)
+            )
+            .toString();
           tokenEntities[tokenId] = {
-            ...(tokenEntities[tokenId] ?? {address: tokenId}),
+            ...(tokenEntities[tokenId] ?? { address: tokenId }),
             ...token,
             ...extras,
-            usedWeight
+            usedWeight,
           };
         }
 
@@ -256,7 +257,7 @@ export function normalizeInitialData(categories: Category[], chainId: number) {
           totalDenorm: totalWeight,
           totalSupply,
           swapFee: convert.toToken("0.025", 18).toString(10),
-          chainId
+          chainId,
         };
 
         if (indexPool.initialized) {
@@ -295,7 +296,7 @@ export function normalizeInitialData(categories: Category[], chainId: number) {
         entities: {},
       },
       tokens: {
-        ids: baseTokenIds,//[WETH_ADDRESS.toLowerCase(), NDX_ADDRESS.toLowerCase()],
+        ids: baseTokenIds, //[WETH_ADDRESS.toLowerCase(), NDX_ADDRESS.toLowerCase()],
         entities: baseTokenEntities,
       },
       chainId,
@@ -319,36 +320,11 @@ export const fetchInitialData = createAsyncThunk(
   }
 );
 
-export const fetchVaultsData = createAsyncThunk(
-  "vaults/fetch",
-  async (_: any, { getState }) => {
-    const state = getState();
-    const chainId = (state as any).settings.network as number | undefined
-    if (chainId !== undefined) {
-      const network = NETWORKS_BY_ID[chainId].name
-      const address = (state as any).user.address;
-      const client = NirnSubgraphClient.forNetwork(network);
-      if (!client) return null;
-      try {
-        const vaults: Array<VaultData & { chainId: number }> = (await client.getAllVaults(address)).map((v) => ({ ...v, chainId }));
-        return {vaults, chainId};
-      } catch (error) {
-        console.error({ error });
-  
-        return null;
-      }
-    }
-  }
-);
-
 export const requests = {
   ...batcherRequests,
   ...dailySnapshotRequests,
   ...indexPoolsRequests,
-  ...stakingRequests,
-  ...newStakingRequests,
   ...timelocksRequests,
   ...tokensRequests,
   fetchInitialData,
-  fetchVaultsData,
 };
diff --git a/src/features/selectors.ts b/src/features/selectors.ts
index b78e78d9..66ce4ef9 100644
--- a/src/features/selectors.ts
+++ b/src/features/selectors.ts
@@ -5,37 +5,17 @@ import {
   formatPoolAsset,
   indexPoolsSelectors,
 } from "./indexPools";
-import {
-  FormattedMasterChefData,
-  MasterChefPool,
-  masterChefSelectors,
-  totalSushiPerDay,
-} from "./masterChef";
-import {
-  FormattedNewStakingData,
-  FormattedNewStakingDetail,
-} from "./newStaking/types";
 import { FormattedPair, pairsSelectors } from "./pairs";
-import { FormattedPortfolioData, userSelectors } from "./user";
-import {
-  FormattedStakingData,
-  FormattedStakingDetail,
-  stakingSelectors,
-} from "./staking";
-import { NDX_ADDRESS, WETH_ADDRESS } from "config";
 import { NormalizedToken, tokensSelectors } from "./tokens";
 import { NormalizedTransaction, transactionsSelectors } from "./transactions";
-import { Pair } from "uniswap-types";
 import { batcherSelectors } from "./batcher";
-import { computeSushiswapPairAddress, convert } from "helpers";
+import { convert } from "helpers";
 import { createSelector } from "reselect";
 import { dailySnapshotsSelectors } from "./dailySnapshots";
 import { formatDistance } from "date-fns";
-import { newStakingSelectors } from "./newStaking";
 import { settingsSelectors } from "./settings";
-import { sortTokens } from "@indexed-finance/indexed.js/dist/utils/address";
 import { timelocksSelectors } from "./timelocks";
-import { vaultsSelectors } from "./vaults";
+import { userSelectors } from "./user";
 import S from "string";
 import type { AppState } from "./store";
 
@@ -47,15 +27,11 @@ export const selectors = {
   ...dailySnapshotsSelectors,
   ...indexPoolsSelectors,
   ...settingsSelectors,
-  ...stakingSelectors,
-  ...newStakingSelectors,
   ...timelocksSelectors,
   ...tokensSelectors,
   ...userSelectors,
   ...pairsSelectors,
   ...transactionsSelectors,
-  ...vaultsSelectors,
-  ...masterChefSelectors,
   // Categories
   selectFormattedCategory: (
     state: AppState,
@@ -120,6 +96,7 @@ export const selectors = {
     ],
     (pool, tokens, stats) => {
       const tokenIds = pool?.tokens.ids ?? [];
+
       const totalValueLocked =
         pool?.tokensList.reduce((total, tokenId) => {
           if (total === undefined) return undefined;
@@ -145,7 +122,6 @@ export const selectors = {
         ? ({
             chainId: pool.chainId,
             category: pool.category.id,
-            canStake: false,
             id: pool.id,
             symbol: pool.symbol,
             priceUsd: stats ? convert.toCurrency(stats.price) : "",
@@ -205,9 +181,7 @@ export const selectors = {
                   : [token1, token0];
                 return {
                   when: formatDistance(
-                    new Date(
-                      trade.timestamp * MILLISECONDS_PER_SECOND
-                    ),
+                    new Date(trade.timestamp * MILLISECONDS_PER_SECOND),
                     new Date(),
                     {
                       addSuffix: true,
@@ -251,357 +225,6 @@ export const selectors = {
         return parseFloat(bValue) - parseFloat(aValue);
       });
   },
-  // Staking
-  selectFormattedStaking(state: AppState): FormattedStakingDetail {
-    const indexPools = selectors.selectAllStakingPools(state);
-    const formattedStaking = indexPools
-      .map((stakingPool) => {
-        const indexPool = selectors.selectPool(state, stakingPool.indexPool);
-
-        if (!indexPool) {
-          return null;
-        }
-
-        const { name, symbol } = indexPool;
-        const userData = stakingPool.userData ?? {
-          userStakedBalance: "0",
-          userRewardsEarned: "0",
-        };
-        const expiredFromTime = stakingPool.periodFinish < Date.now() / 1000;
-        const forcedToExpire = ["DEFI5", "CC10", "FFF"].some((item) =>
-          indexPool.symbol.toLowerCase().includes(item.toLowerCase())
-        );
-        const expired = expiredFromTime || forcedToExpire;
-        const totalStaked = convert.toBalance(
-          stakingPool.totalSupply ?? "0",
-          18,
-          true,
-          2
-        );
-        const staked = convert.toBalance(userData.userStakedBalance, 18);
-        const earned = convert.toBalance(userData.userRewardsEarned, 18);
-        const rate =
-          stakingPool.periodFinish > Date.now() / 1000
-            ? convert.toBalance(
-                convert.toBigNumber(stakingPool.rewardRate).times(86400),
-                18,
-                false,
-                2
-              )
-            : "0";
-
-        return {
-          id: stakingPool.id,
-          isWethPair: stakingPool.isWethPair,
-          slug: `/index-pools/${S(indexPool.name).slugify().s}`,
-          name,
-          symbol,
-          totalStaked,
-          staked,
-          periodFinish: stakingPool.periodFinish,
-          stakingToken: stakingPool.stakingToken,
-          earned: `${earned} NDX`,
-          rate,
-          expired,
-        };
-      })
-      .filter((each): each is FormattedStakingData => Boolean(each))
-      .sort((a, b) => parseFloat(b.rate) - parseFloat(a.rate))
-      .map((each) => ({
-        ...each,
-        staked: convert.toComma(+each.staked),
-        rate: `${convert.toComma(+each.rate)} NDX/Day`,
-      }));
-
-    return formattedStaking.reduce(
-      (prev, next) => {
-        const collection = next.isWethPair
-          ? prev.liquidityTokens
-          : prev.indexTokens;
-
-        collection.push(next);
-
-        return prev;
-      },
-      {
-        indexTokens: [],
-        liquidityTokens: [],
-      } as FormattedStakingDetail
-    );
-  },
-  selectPossibleMasterChefPairs(state: AppState) {
-    const indexPoolIds = selectors.selectAllPoolIds(state);
-    const chainId = selectors.selectNetwork(state);
-    const ndxAddress = NDX_ADDRESS[chainId];
-    const wethAddress = WETH_ADDRESS[chainId];
-    if (!ndxAddress || !wethAddress) {
-      return [];
-    }
-    return [...indexPoolIds, ndxAddress].map((token) => {
-      const [token0, token1] = sortTokens(token, wethAddress);
-      return {
-        id: computeSushiswapPairAddress(token0, token1, chainId).toLowerCase(),
-        token0: token0.toLowerCase(),
-        token1: token1.toLowerCase(),
-        sushiswap: true,
-        exists: undefined,
-      };
-    });
-  },
-  selectMasterChefPoolsWithRecognizedPairs(state: AppState): MasterChefPool[] {
-    const pairIds = selectors
-      .selectPossibleMasterChefPairs(state)
-      .map((p) => p.id);
-    const pools = selectors.selectMasterChefPoolsByStakingTokens(
-      state,
-      pairIds
-    );
-    return pools.filter((_) => Boolean(_)) as MasterChefPool[];
-  },
-  // selectNewFormattedStakingToken
-  selectMasterChefFormattedStaking(state: AppState): FormattedMasterChefData[] {
-    const chainId = selectors.selectNetwork(state);
-    if (chainId !== 1) {
-      return [];
-    }
-    const meta = selectors.selectMasterChefMeta(state);
-    const stakingPools =
-      selectors.selectMasterChefPoolsWithRecognizedPairs(state);
-    const formattedStaking = stakingPools
-      .map((stakingPool) => {
-        const pair = selectors.selectPairById(
-          state,
-          stakingPool.token.toLowerCase()
-        );
-
-        if (!pair || !pair.token0 || !pair.token1) {
-          return null;
-        }
-        const pairToken = selectors.selectTokenById(state, pair.id);
-        if (!pairToken) return null;
-        const { name, symbol } = pairToken;
-        const totalStaked = convert.toBalance(
-          stakingPool.totalStaked ?? "0",
-          18,
-          true,
-          2
-        );
-        const staked = convert.toBalance(
-          stakingPool.userStakedBalance ?? "0",
-          18
-        );
-        const earned = convert.toBalance(
-          stakingPool.userEarnedRewards ?? "0",
-          18
-        );
-
-        const rewardsPerDay = convert.toBalance(
-          totalSushiPerDay
-            .times(stakingPool.allocPoint)
-            .div(meta.totalAllocPoint),
-          18
-        );
-        return {
-          id: stakingPool.id,
-          // indexPool: indexPool.id,
-          isWethPair: true,
-          // slug: `/index-pools/${S(indexPool.name).slugify().s}`,
-          name,
-          symbol,
-          totalStaked,
-          staked,
-          stakingToken: stakingPool.token,
-          earned: `${earned} SUSHI`,
-          rewardsPerDay,
-        };
-      })
-      .filter((each): each is FormattedNewStakingData => Boolean(each))
-      .sort((a, b) => +b.rewardsPerDay - +a.rewardsPerDay)
-      .map((each) => ({
-        ...each,
-        staked: convert.toComma(+each.staked),
-        rewardsPerDay: `${convert.toComma(+each.rewardsPerDay)} SUSHI/Day`,
-      }));
-
-    return formattedStaking;
-  },
-  // selectNewFormattedStakingToken
-  selectNewFormattedStaking(state: AppState): FormattedNewStakingDetail {
-    const chainId = selectors.selectNetwork(state);
-    if (chainId !== 1) {
-      return {
-        indexTokens: [],
-        liquidityTokens: [],
-        expired: []
-      }
-    }
-    const stakingPools = selectors.selectAllNewStakingPools(state);
-    const expiredPools: any[] = [];
-    const wethAddress = WETH_ADDRESS[chainId]
-    const formattedStaking = stakingPools
-      .map((stakingPool) => {
-        let indexPoolAddress: string;
-        if (stakingPool.isWethPair) {
-          if (
-            stakingPool.token0?.toLowerCase() ===
-            wethAddress.toLowerCase()
-          ) {
-            indexPoolAddress = stakingPool.token1 as string;
-          } else {
-            indexPoolAddress = stakingPool.token0 as string;
-          }
-        } else {
-          indexPoolAddress = stakingPool.token;
-        }
-        const indexPool = selectors.selectPool(state, indexPoolAddress);
-
-        if (!indexPool) {
-          return null;
-        }
-
-        const { name, symbol } = stakingPool;
-        const totalStaked = convert.toBalance(
-          stakingPool.totalStaked ?? "0",
-          18,
-          true,
-          2
-        );
-        const staked = convert.toBalance(
-          stakingPool.userStakedBalance ?? "0",
-          18
-        );
-        const earned = convert.toBalance(
-          stakingPool.userEarnedRewards ?? "0",
-          18
-        );
-
-        const rewardsPerDay = convert.toBalance(stakingPool.rewardsPerDay, 18);
-        const formatted = {
-          id: stakingPool.id,
-          indexPool: indexPool.id,
-          isWethPair: stakingPool.isWethPair,
-          slug: `/index-pools/${S(indexPool.name).slugify().s}`,
-          name,
-          symbol,
-          totalStaked,
-          staked,
-          stakingToken: stakingPool.token,
-          earned: `${earned} NDX`,
-          rewardsPerDay,
-        } as FormattedNewStakingData;
-
-        const forcedToExpire = ["DEFI5", "CC10", "FFF", "ERROR"].some((item) =>
-          stakingPool.symbol.toLowerCase().includes(item.toLowerCase())
-        );
-
-        if (forcedToExpire) {
-          expiredPools.push(formatted);
-
-          return null;
-        } else {
-          return formatted;
-        }
-      })
-      .filter((each): each is FormattedNewStakingData => Boolean(each))
-      .sort((a, b) => +b.rewardsPerDay - +a.rewardsPerDay)
-      .map((each) => ({
-        ...each,
-        staked: convert.toComma(+each.staked),
-        rewardsPerDay: `${convert.toComma(+each.rewardsPerDay)} NDX/Day`,
-      }));
-
-    return formattedStaking.reduce(
-      (prev, next) => {
-        const collection = next.isWethPair
-          ? prev.liquidityTokens
-          : prev.indexTokens;
-
-        collection.push(next);
-
-        return prev;
-      },
-      {
-        indexTokens: [],
-        liquidityTokens: [],
-        expired: expiredPools,
-      } as FormattedNewStakingDetail
-    );
-  },
-  // User
-  selectFormattedPortfolio(
-    state: AppState,
-    ethPrice: number
-  ): FormattedPortfolioData {
-    const theme = selectors.selectTheme(state);
-    const chainId = selectors.selectNetwork(state);
-    const poolLookup = selectors.selectPoolLookup(state);
-    const tokenLookup = selectors.selectTokenLookup(state);
-    const tokenBalanceLookup = selectors.selectTokenSymbolsToBalances(state);
-    const { staking } = selectors.selectUser(state);
-    const ndxBalance = selectors.selectNdxBalance(state);
-    const ndxEarned = Object.values(staking).reduce((prev, next) => {
-      const { earned } = next;
-      const parsed = convert.toBigNumber(earned).toNumber();
-
-      return prev + parsed;
-    }, 0);
-    const ndxPrice = selectors.selectNdxPrice(state, ethPrice);
-    const ndxValue = ndxBalance * ndxPrice;
-
-    let accumulatedValue = ndxValue;
-    const accumulatedTokenValues: number[] = [];
-    const processedTokens = selectors.selectAllPoolIds(state).map((poolId) => {
-      const pool = poolLookup[poolId]!;
-
-      const balanceAsNumber = convert.toBigNumber(
-        tokenBalanceLookup[pool.symbol.toLowerCase()]
-      );
-      const displayedBalance = convert.toBalance(balanceAsNumber);
-      const poolToken = tokenLookup[pool.id];
-      const poolTokenPrice = poolToken?.priceData?.price ?? 0;
-      const value = balanceAsNumber.times(poolTokenPrice).toNumber();
-      const displayedValue = convert.toCurrency(value);
-
-      accumulatedTokenValues.push(value);
-      accumulatedValue += value;
-
-      return {
-        address: pool.id,
-        link: `/index-pools/${S(pool.name).slugify().s}`,
-        symbol: pool.symbol,
-        name: pool.name,
-        balance: displayedBalance,
-        staking: staking[pool.id]?.balance ?? "",
-        value: displayedValue,
-        weight: "0.00%", // Calculate weight after.
-      };
-    });
-    const tokens = processedTokens.map((token, index) => ({
-      ...token,
-      weight: convert.toPercent(
-        accumulatedTokenValues[index] / accumulatedValue
-      ),
-    }));
-    const formattedPortfolio: FormattedPortfolioData = {
-      tokens,
-      totalValue: convert.toCurrency(accumulatedValue),
-    };
-    const ndxAddress = NDX_ADDRESS[chainId]
-    if (ndxAddress) {
-      formattedPortfolio.ndx = {
-        address: ndxAddress,
-        image: `indexed-${theme}`,
-        symbol: "NDX",
-        name: "Indexed",
-        balance: `${ndxBalance.toFixed(2)}`,
-        value: convert.toCurrency(ndxValue),
-        earned: ndxEarned.toFixed(2),
-        weight: convert.toPercent(ndxValue / accumulatedValue),
-      }
-    }
-
-    return formattedPortfolio;
-  },
   // Pairs
   selectFormattedPairsById: (
     state: AppState,
@@ -634,91 +257,6 @@ export const selectors = {
 
     return formattedPairs;
   },
-  // Vaults
-  // selectFormattedVault(state: AppState, id: string): FormattedVault | null {
-  //   const vault = selectors.selectVault(state, id);
-
-  //   if (vault) {
-  //     const { adapters, weights } = vault;
-
-  //     return {
-  //       id: vault.id,
-  //       symbol: vault.symbol,
-  //       name: vault.name,
-  //       totalValueLocked: vault.totalValueLocked,
-  //       annualPercentageRate: convert.toPercent(vault.netAPR),
-  //       percentageOfVaultAssets: "100.0%",
-  //       amountOfTokensInProtocol: "42,069",
-  //       adapters: adapters.map((adapter, i) => {
-  //         const percentAsFraction = weights[i];
-  //         const percentAsNumber = convert
-  //           .toBigNumber(percentAsFraction)
-  //           .dividedBy(convert.toBigNumber("1e18"))
-  //           .times(100)
-  //           .toNumber();
-
-  //         return {
-  //           id: adapter.id,
-  //           wrapper: adapter.token,
-  //           underlying: adapter.underlying,
-  //           protocol: adapter.protocolID,
-  //           annualPercentageRate: convert.toPercent(adapter.apr),
-  //           percentage: percentAsNumber,
-  //         };
-  //       }),
-  //     };
-  //   } else {
-  //     return null;
-  //   }
-  // },
-  // selectAllFormattedVaults(state: AppState): FormattedVault[] {
-  //   return selectors
-  //     .selectAllVaults(state)
-  //     .map((vault) => selectors.selectFormattedVault(state, vault.id))
-  //     .filter((each): each is FormattedVault => Boolean(each));
-  // },
-  // Misc
-  selectStakingTokenPrices(state: AppState, pairs: Pair[]) {
-    const indexPools = selectors.selectAllStakingPools(state);
-    const lookup = pairs.reduce((prev, next) => {
-      prev[(next as any).liquidityToken.address.toLowerCase()] = next;
-      return prev;
-    }, {} as Record<string, Pair>);
-
-    return indexPools.reduce((prev, next) => {
-      const { indexPool: poolAddress } = next;
-      const mostRecentSnapshot = selectors.selectMostRecentSnapshotOfPool(
-        state,
-        poolAddress
-      );
-      const mostRecentValue = mostRecentSnapshot?.value ?? 0;
-
-      if (next.isWethPair) {
-        const entry = lookup[next.stakingToken.toLowerCase()];
-
-        if (entry?.token0?.id && entry?.token1?.id) {
-          const indexPoolSideReserve =
-            entry.token0.id.toLowerCase() === poolAddress.toLowerCase()
-              ? entry.reserve0
-              : entry.reserve1;
-          const price = convert
-            .toBigNumber(indexPoolSideReserve)
-            .multipliedBy(2)
-            .dividedBy(convert.toBigNumber(entry.totalSupply))
-            .multipliedBy(mostRecentValue)
-            .toString();
-
-          prev[next.stakingToken] = price;
-        } else {
-          prev[next.stakingToken] = "0";
-        }
-      } else {
-        prev[next.stakingToken] = mostRecentValue;
-      }
-
-      return prev;
-    }, {} as Record<string, string>);
-  },
   selectUserTransactions: (state: AppState): NormalizedTransaction[] => {
     const user = selectors.selectUserAddress(state);
     if (!user) return [];
diff --git a/src/features/staking/index.ts b/src/features/staking/index.ts
deleted file mode 100644
index cd5e0aa1..00000000
--- a/src/features/staking/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was generated via a script in `scripts/`.
-// Do not manually modify this (or any) index files.
-
-export * from './requests';
-export * from './slice';
-export * from './types';
\ No newline at end of file
diff --git a/src/features/staking/requests.ts b/src/features/staking/requests.ts
deleted file mode 100644
index 0ed7e39e..00000000
--- a/src/features/staking/requests.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { createAsyncThunk } from "@reduxjs/toolkit";
-import { ethers } from "ethers";
-import { getIndexedUrl, getOldStakeURL, sendQuery } from "helpers";
-import type { NdxStakingPool } from "indexed-types";
-import type { NormalizedStakingPool } from "../staking";
-
-export async function queryStaking(url: string): Promise<NdxStakingPool[]> {
-  const { ndxStakingPools: staking } = await sendQuery(
-    url,
-    `
-      {
-        ndxStakingPools(first: 20) {
-          id
-          indexPool
-          stakingToken
-          isWethPair
-          startsAt
-          periodFinish
-          totalSupply
-          lastUpdateTime
-          totalRewards
-          claimedRewards
-          rewardRate
-          rewardPerTokenStored
-        }
-      }
-      `
-  );
-  return staking;
-}
-
-export function normalizeStakingData(
-  data: NdxStakingPool[]
-): NormalizedStakingPool[] {
-  return data.map((pool) => {
-    return {
-      id: pool.id,
-      rewardsDuration: 0,
-      periodFinish: pool.periodFinish,
-      rewardRate: pool.rewardRate,
-      rewardPerTokenStored: pool.rewardPerTokenStored,
-      totalSupply: pool.totalSupply,
-      stakingToken: pool.stakingToken,
-      indexPool: pool.indexPool,
-      isWethPair: pool.isWethPair,
-      startsAt: pool.startsAt,
-      totalRewards: pool.totalRewards,
-    };
-  });
-}
-
-export const fetchStakingData = createAsyncThunk(
-  "staking/fetch",
-  async ({
-    provider,
-  }: {
-    provider:
-      | ethers.providers.Web3Provider
-      | ethers.providers.JsonRpcProvider
-      | ethers.providers.InfuraProvider;
-  }) => {
-    const { chainId } = provider.network;
-    const url = getOldStakeURL(chainId);
-
-    try {
-      const staking = await queryStaking(url);
-      const formattedStakingData = normalizeStakingData(staking);
-
-      return formattedStakingData;
-    } catch (error) {
-      return [];
-    }
-  }
-);
diff --git a/src/features/staking/slice.ts b/src/features/staking/slice.ts
deleted file mode 100644
index 0eb2bcda..00000000
--- a/src/features/staking/slice.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-import { convert, createMulticallDataParser } from "helpers";
-import { createEntityAdapter, createSlice } from "@reduxjs/toolkit";
-import { fetchMulticallData } from "../batcher/requests"; // Circular dependency.
-import { fetchStakingData } from "./requests";
-import { mirroredServerState, restartedDueToError } from "../actions";
-import type { AppState } from "../store";
-import type { CallWithResult } from "helpers";
-import type { NormalizedStakingPool, StakingPoolUpdate } from "./types";
-
-export const stakingCaller = "Staking";
-
-const adapter = createEntityAdapter<NormalizedStakingPool>({
-  selectId: (entry) => entry.id.toLowerCase(),
-});
-
-const slice = createSlice({
-  name: "staking",
-  initialState: adapter.getInitialState(),
-  reducers: {},
-  extraReducers: (builder) =>
-    builder
-      .addCase(fetchStakingData.fulfilled, (state, action) => {
-        if (action.payload) adapter.addMany(state, action.payload);
-      })
-      .addCase(fetchMulticallData.fulfilled, (state, action) => {
-        const relevantMulticallData = stakingMulticallDataParser(
-          action.payload
-        );
-
-        if (relevantMulticallData) {
-          for (const [stakingPoolAddress, update] of Object.entries(
-            relevantMulticallData
-          )) {
-            const entry = state.entities[stakingPoolAddress];
-
-            if (entry) {
-              if (update.rewardsDuration)
-                entry.rewardsDuration = update.rewardsDuration;
-              if (update.periodFinish) entry.periodFinish = update.periodFinish;
-              if (update.rewardRate) entry.rewardRate = update.rewardRate;
-              if (update.rewardPerTokenStored)
-                entry.rewardPerTokenStored = update.rewardPerTokenStored;
-              if (update.totalSupply) entry.totalSupply = update.totalSupply;
-
-              if (update.userData) {
-                entry.userData = update.userData;
-              }
-            }
-          }
-        }
-
-        return state;
-      })
-      .addCase(mirroredServerState, (_, action) => action.payload.staking)
-      .addCase(restartedDueToError, () => adapter.getInitialState()),
-});
-
-export const { actions: stakingActions, reducer: stakingReducer } = slice;
-
-const selectors = adapter.getSelectors((state: AppState) => state.staking);
-
-export const stakingSelectors = {
-  selectAllStakingPoolIds(state: AppState) {
-    return selectors.selectAll(state).map(({ indexPool }) => indexPool);
-  },
-  selectAllStakingPools(state: AppState) {
-    return selectors.selectAll(state);
-  },
-  selectStakingPool(state: AppState, id: string) {
-    return selectors.selectById(state, id);
-  },
-  selectStakingPoolByStakingToken(state: AppState, id: string) {
-    return stakingSelectors
-      .selectAllStakingPools(state)
-      .find(
-        ({ stakingToken }) => stakingToken.toLowerCase() === id.toLowerCase()
-      );
-  },
-  selectStakingPoolsByStakingTokens(
-    state: AppState,
-    ids: string[]
-  ): Array<NormalizedStakingPool | undefined> {
-    const allPools = stakingSelectors.selectAllStakingPools(state);
-
-    return ids.map((id) =>
-      allPools.find((p) => p.stakingToken.toLowerCase() === id.toLowerCase())
-    );
-  },
-  selectStakingPoolByIndexPool(state: AppState, indexPoolAddress: string) {
-    const allPools = stakingSelectors.selectAllStakingPools(state);
-
-    return allPools.find((pool) => pool.indexPool === indexPoolAddress) ?? null;
-  },
-};
-
-// #region Helpers
-export const stakingMulticallDataParser = createMulticallDataParser(
-  stakingCaller,
-  (calls) => {
-    const formattingStakingData = calls.reduce((prev, next) => {
-      const [stakingPoolAddress, functions] = next;
-      const formattedStakingPoolUpdate = Object.entries(functions).reduce(
-        (prev, next) => {
-          const stakingPoolEntry = prev;
-          const [fn, results] = next;
-          const [{ args, values }] = results.map((item: CallWithResult) => ({
-            args: item.args ?? [],
-            values: (item.result ?? []).map(convert.toBigNumber),
-          }));
-          const [result] = values;
-
-          if (result) {
-            const handlers: Record<string, () => void> = {
-              rewardsDuration() {
-                stakingPoolEntry.rewardsDuration = result.toNumber();
-              },
-              periodFinish() {
-                stakingPoolEntry.periodFinish = result.toNumber();
-              },
-              rewardRate() {
-                stakingPoolEntry.rewardRate = result.toString();
-              },
-              rewardPerToken() {
-                stakingPoolEntry.rewardPerTokenStored = result.toString();
-              },
-              totalSupply() {
-                stakingPoolEntry.totalSupply = result.toString();
-              },
-              balanceOf() {
-                const [userAddress] = args;
-
-                if (!stakingPoolEntry.userData) {
-                  stakingPoolEntry.userData = {
-                    userAddress,
-                    userRewardsEarned: "",
-                    userStakedBalance: "",
-                  };
-                }
-
-                stakingPoolEntry.userData = {
-                  ...stakingPoolEntry.userData,
-                  userAddress,
-                  userStakedBalance: result.toString(),
-                };
-              },
-              earned() {
-                const [userAddress] = args;
-
-                if (!stakingPoolEntry.userData) {
-                  stakingPoolEntry.userData = {
-                    userAddress,
-                    userRewardsEarned: "",
-                    userStakedBalance: "",
-                  };
-                }
-
-                stakingPoolEntry.userData = {
-                  ...stakingPoolEntry.userData,
-                  userAddress,
-                  userRewardsEarned: result.toString(),
-                };
-              },
-            };
-            const handler = handlers[fn];
-
-            handler();
-          }
-
-          return stakingPoolEntry;
-        },
-        {
-          rewardsDuration: 0,
-          periodFinish: 0,
-          rewardRate: "",
-          rewardPerTokenStored: "",
-          totalSupply: "",
-        } as StakingPoolUpdate
-      );
-
-      formattedStakingPoolUpdate.id = stakingPoolAddress;
-
-      prev[stakingPoolAddress] = formattedStakingPoolUpdate;
-
-      return prev;
-    }, {} as Record<string, StakingPoolUpdate>);
-
-    return formattingStakingData;
-  }
-);
-// #endregion
diff --git a/src/features/staking/types.ts b/src/features/staking/types.ts
deleted file mode 100644
index adab0955..00000000
--- a/src/features/staking/types.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-export interface StakingPoolUpdate {
-  id: string; // Staking pool address
-  rewardsDuration: number;
-  periodFinish: number;
-  rewardRate: string;
-  rewardPerTokenStored: string;
-  totalSupply: string; // Total amount of tokens staked
-  userData?: {
-    userAddress: string;
-    userStakedBalance: string;
-    userRewardsEarned: string;
-  };
-}
-
-export interface NormalizedStakingPool extends StakingPoolUpdate {
-  stakingToken: string; // Address of token being staked
-  indexPool: string; // Address of related index pool
-  isWethPair: boolean; // Whether the pool is for a UNI LP pair
-  /** Unix timestamp for when staking pool begins */
-  startsAt: number;
-  totalRewards: string;
-}
-
-export interface FormattedStakingData {
-  id: string;
-  slug: string;
-  name: string;
-  symbol: string;
-  staked: string;
-  stakingToken: string;
-  periodFinish: number;
-  earned: string;
-  rate: string;
-  isWethPair: boolean;
-  expired: boolean;
-  totalStaked: string;
-  liquidityProvider?: string;
-}
-
-export interface FormattedStakingDetail {
-  indexTokens: FormattedStakingData[];
-  liquidityTokens: FormattedStakingData[];
-}
diff --git a/src/features/thunks.ts b/src/features/thunks.ts
index b948e6f5..8eaf4833 100644
--- a/src/features/thunks.ts
+++ b/src/features/thunks.ts
@@ -5,10 +5,7 @@ import { TransactionExtra, transactionsActions } from "./transactions";
 import { TransactionResponse } from "@ethersproject/abstract-provider";
 import { batcherActions } from "./batcher";
 import { categoriesActions } from "./categories";
-import { fetchInitialData, fetchVaultsData } from "./requests";
-import { fetchMasterChefData, masterChefActions } from "./masterChef";
-import { fetchNewStakingData } from "./newStaking";
-import { fetchStakingData, stakingActions } from "./staking";
+import { fetchInitialData } from "./requests";
 import { indexPoolsActions } from "./indexPools";
 import { notification } from "antd";
 import { pairsActions } from "./pairs";
@@ -17,7 +14,6 @@ import { settingsActions } from "./settings";
 import { timelocksActions } from "./timelocks";
 import { tokensActions } from "./tokens";
 import { userActions } from "./user";
-import { vaultsActions } from "./vaults";
 import type { AppThunk } from "./store";
 
 // #region Provider
@@ -74,7 +70,7 @@ const getSigner = (options: InitialzeOptions) => {
     }
   }
   return selectedAddress;
-}
+};
 
 export const thunks = {
   /**
@@ -89,44 +85,33 @@ export const thunks = {
           provider,
         })
       );
-      dispatch(
-        fetchStakingData({
-          provider,
-        })
-      );
-      dispatch(
-        fetchNewStakingData({
-          provider,
-        })
-      );
-      dispatch(fetchMasterChefData({ provider }));
-      dispatch(fetchVaultsData({ provider }));
     },
-  setNetwork: (options: InitialzeOptions): AppThunk =>
-  async (dispatch, getState) => {
-    const state = getState();
-    provider = options.provider;
-    await provider.ready;
-
-    const {chainId} = await provider.getNetwork()
-    const lastInit = state.settings.initializedNetworks[chainId] || 0;
-    const timeSince = (+new Date() - lastInit) / 1000;
-    if (provider.blockNumber !== -1) {
-      dispatch(actions.blockNumberChanged(provider.blockNumber));
-    }
-    dispatch(actions.changedNetwork(chainId))
-    if (timeSince > 60) {
-      dispatch(actions.initialize(options))
-    }
-
-    const selectedAddress = getSigner(options)
-    if (selectedAddress) {
-      dispatch(actions.userAddressSelected(selectedAddress));
-      dispatch(timelocksRequests.fetchUserTimelocks(selectedAddress));
-    }
-
-    dispatch(actions.walletConnected());
-  },
+  setNetwork:
+    (options: InitialzeOptions): AppThunk =>
+    async (dispatch, getState) => {
+      const state = getState();
+      provider = options.provider;
+      await provider.ready;
+
+      const { chainId } = await provider.getNetwork();
+      const lastInit = state.settings.initializedNetworks[chainId] || 0;
+      const timeSince = (+new Date() - lastInit) / 1000;
+      if (provider.blockNumber !== -1) {
+        dispatch(actions.blockNumberChanged(provider.blockNumber));
+      }
+      dispatch(actions.changedNetwork(chainId));
+      if (timeSince > 60) {
+        dispatch(actions.initialize(options));
+      }
+
+      const selectedAddress = getSigner(options);
+      if (selectedAddress) {
+        dispatch(actions.userAddressSelected(selectedAddress));
+        dispatch(timelocksRequests.fetchUserTimelocks(selectedAddress));
+      }
+
+      dispatch(actions.walletConnected());
+    },
   addTransaction:
     (
       _tx: TransactionResponse | Promise<TransactionResponse>,
@@ -155,14 +140,11 @@ export const actions = {
   ...indexPoolsActions,
   ...pairsActions,
   ...settingsActions,
-  ...stakingActions,
   ...tokensActions,
   ...timelocksActions,
   ...transactionsActions,
   ...userActions,
-  ...vaultsActions,
   ...topLevelActions,
-  ...masterChefActions,
   ...thunks,
 };
 
diff --git a/src/features/timelocks/index.ts b/src/features/timelocks/index.ts
index 728bd00d..cd5e0aa1 100644
--- a/src/features/timelocks/index.ts
+++ b/src/features/timelocks/index.ts
@@ -3,4 +3,4 @@
 
 export * from './requests';
 export * from './slice';
-export * from './types'
\ No newline at end of file
+export * from './types';
\ No newline at end of file
diff --git a/src/features/tokens/slice.ts b/src/features/tokens/slice.ts
index 06f4f995..e7bb2761 100644
--- a/src/features/tokens/slice.ts
+++ b/src/features/tokens/slice.ts
@@ -4,10 +4,14 @@ import {
   createEntityAdapter,
   createSlice,
 } from "@reduxjs/toolkit";
-import { changedNetwork, mirroredServerState, restartedDueToError } from "../actions";
+import {
+  changedNetwork,
+  mirroredServerState,
+  restartedDueToError,
+} from "../actions";
 import { constants } from "ethers"; // Circular dependency.
 import { createMulticallDataParser } from "helpers";
-import { fetchInitialData, fetchVaultsData } from "../requests";
+import { fetchInitialData } from "../requests";
 import { fetchMulticallData } from "../batcher/requests";
 import { fetchTokenPriceData } from "./requests";
 import { pairsActions } from "../pairs";
@@ -17,13 +21,6 @@ export const tokensAdapter = createEntityAdapter<NormalizedToken>({
   selectId: (entry) => entry.id.toLowerCase(),
 });
 
-type TokenLike = {
-  id: string;
-  symbol: string;
-  name: string;
-  decimals: number;
-};
-
 const slice = createSlice({
   name: "tokens",
   initialState: tokensAdapter.getInitialState(),
@@ -69,16 +66,16 @@ const slice = createSlice({
           decimals: 18,
           priceData: undefined,
           chainId: action.payload,
-          ...nativeToken
-        }
-        tokensAdapter.upsertOne(state, fullNativeToken)
+          ...nativeToken,
+        };
+        tokensAdapter.upsertOne(state, fullNativeToken);
       })
       .addCase(fetchInitialData.fulfilled, (state, action) => {
         if (action.payload) {
           const { tokens } = action.payload;
           const fullTokens = tokens.ids.map((id) => tokens.entities[id]);
           for (const token of fullTokens) {
-            if (typeof token.decimals === 'string') {
+            if (typeof token.decimals === "string") {
               token.decimals = +token.decimals;
             }
           }
@@ -86,26 +83,6 @@ const slice = createSlice({
           tokensAdapter.upsertMany(state, fullTokens);
         }
       })
-      .addCase(fetchVaultsData.fulfilled, (state, action) => {
-        const newTokens: NormalizedToken[] = [];
-        if (action.payload) {
-          const {vaults, chainId} = action.payload;
-          const tokenLike: TokenLike[] = [
-            ...vaults.map(v => ({ ...v, chainId })),
-            ...(vaults.reduce((arr, v) => ([
-              ...arr,
-              ...v.adapters.map(a => a.underlying),
-              ...v.adapters.map(a => a.wrapper),
-            ]), [] as TokenLike[]))
-          ].map(({ id, name, symbol, decimals }) => ({ id, name, symbol, decimals }));
-          for (const token of tokenLike) {
-            if (!state.entities[token.id.toLowerCase()]) {
-              newTokens.push({ ...token, chainId })
-            }
-          }
-          tokensAdapter.upsertMany(state, newTokens)
-        }
-      })
       .addCase(fetchTokenPriceData.fulfilled, (state, action) => {
         if (action.payload) {
           for (const [address, value] of Object.entries(action.payload)) {
@@ -127,7 +104,7 @@ const slice = createSlice({
         }
       })
       .addCase(pairsActions.uniswapPairsRegistered, (state, action) => {
-        const { pairs, chainId } = action.payload
+        const { pairs, chainId } = action.payload;
         for (const pair of pairs) {
           if (!state.entities[pair.id.toLowerCase()]) {
             let t0 = pair.token0
@@ -158,7 +135,7 @@ const slice = createSlice({
               symbol,
               name,
               decimals: 18,
-              chainId
+              chainId,
             };
           }
         }
diff --git a/src/features/transactions/actions.ts b/src/features/transactions/actions.ts
index 3088eda3..98bcd6f4 100644
--- a/src/features/transactions/actions.ts
+++ b/src/features/transactions/actions.ts
@@ -14,10 +14,6 @@ export type TransactionExtra = {
       /** @param approval - Uses to display loading icon for pending approval */
       approval: { tokenAddress: string; spender: string; amount: string };
     }
-  | {
-      type: "StakingRewards.claim";
-      claim: { recipient: string };
-    }
   | {
       /** @param type - Type identifier for icon selection */
       type?: undefined;
@@ -32,4 +28,4 @@ export const transactionStarted = createAction<{
 export const transactionFinalized = createAction<{
   receipt: TransactionReceipt;
   extra?: TransactionExtra;
-}>("transactions/finalized");
\ No newline at end of file
+}>("transactions/finalized");
diff --git a/src/features/user/slice.ts b/src/features/user/slice.ts
index 9dace0b2..2a874b0c 100644
--- a/src/features/user/slice.ts
+++ b/src/features/user/slice.ts
@@ -4,7 +4,6 @@ import { changedNetwork } from "features/actions"; // Circular dependency.
 import { constants } from "ethers";
 import { convert, createMulticallDataParser } from "helpers";
 import { fetchMulticallData } from "../batcher/requests";
-import { stakingMulticallDataParser } from "../staking";
 import { tokensSelectors } from "../tokens";
 import { transactionFinalized } from "../transactions/actions";
 import type { AppState } from "../store";
@@ -16,7 +15,6 @@ const initialState: NormalizedUser & { connected: boolean } = {
   address: "",
   allowances: {},
   balances: {},
-  staking: {},
   ndx: null,
   connected: false,
 };
@@ -39,7 +37,6 @@ const slice = createSlice({
     builder
       .addCase(fetchMulticallData.fulfilled, (state, action) => {
         const userData = userMulticallDataParser(action.payload);
-        const stakingData = stakingMulticallDataParser(action.payload);
 
         if (userData) {
           const { allowances, balances, ndx } = userData;
@@ -52,19 +49,6 @@ const slice = createSlice({
           state.ndx = ndx;
         }
 
-        if (stakingData) {
-          for (const [stakingPoolAddress, update] of Object.entries(
-            stakingData
-          )) {
-            if (update.userData) {
-              state.staking[stakingPoolAddress] = {
-                balance: update.userData.userStakedBalance,
-                earned: update.userData.userRewardsEarned,
-              };
-            }
-          }
-        }
-
         return state;
       })
       .addCase(transactionFinalized, (state, action) => {
@@ -76,7 +60,7 @@ const slice = createSlice({
         }
       })
       .addCase(changedNetwork, (state, action) => {
-        delete state.balances[constants.AddressZero]
+        delete state.balances[constants.AddressZero];
       }),
 });
 
@@ -101,16 +85,6 @@ export const userSelectors = {
   selectTokenBalances(state: AppState, tokenIds: string[]) {
     return tokenIds.map((id) => state.user.balances[id.toLowerCase()] ?? "0");
   },
-  selectStakingInfoLookup(state: AppState) {
-    const stakingPoolIds = Object.keys(state.user.staking);
-    return stakingPoolIds.reduce(
-      (prev, next) => ({
-        ...prev,
-        [next as string]: state.user.staking[next],
-      }),
-      {} as Record<string, { balance: string; earned: string }>
-    );
-  },
   selectApprovalStatus(
     state: AppState,
     spender: string,
diff --git a/src/features/user/types.ts b/src/features/user/types.ts
index 99709d14..05bcf238 100644
--- a/src/features/user/types.ts
+++ b/src/features/user/types.ts
@@ -1,8 +1,3 @@
-export interface NormalizedUserStakingData {
-  balance: string;
-  earned: string;
-}
-
 export interface NormalizedUser {
   address: string;
   allowances: Record<
@@ -10,44 +5,5 @@ export interface NormalizedUser {
     string /* Token Balance */
   >;
   balances: Record<string /* <tokenId> */, string /* Token Balance */>;
-  staking: Record<string /* <stakingPoolId> */, NormalizedUserStakingData>;
   ndx: null | string;
 }
-
-export type FormattedPortfolioDatum = {
-  address: string;
-  symbol: string;
-  name: string;
-  balance: string;
-  value: string;
-  weight: string;
-  link?: string;
-  staking?: string;
-  earned?: string;
-  image?: string;
-};
-
-export interface FormattedPortfolioData {
-  tokens: FormattedPortfolioDatum[];
-  ndx?: FormattedPortfolioDatum;
-  totalValue: string;
-}
-
-export interface FormattedPortfolioAsset {
-  address: string;
-  decimals: number;
-  name: string;
-  image: string;
-  symbol: string;
-  isUniswapPair: boolean;
-  isSushiswapPair: boolean;
-  hasStakingPool: boolean;
-  balance: string;
-  staking: string;
-  ndxEarned: string;
-  sushiEarned: string;
-  price: string;
-  value: string;
-  weight: string;
-  link: string;
-}
diff --git a/src/features/vaults/index.ts b/src/features/vaults/index.ts
deleted file mode 100644
index a214dcdf..00000000
--- a/src/features/vaults/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated via a script in `scripts/`.
-// Do not manually modify this (or any) index files.
-
-export * from './slice';
\ No newline at end of file
diff --git a/src/features/vaults/slice.ts b/src/features/vaults/slice.ts
deleted file mode 100644
index ed511c64..00000000
--- a/src/features/vaults/slice.ts
+++ /dev/null
@@ -1,340 +0,0 @@
-import {
-  TokenAdapter,
-  TokenData,
-  VaultSnapshot,
-} from "@indexed-finance/subgraph-clients/dist/nirn/types";
-import { convert, createMulticallDataParser } from "helpers";
-import { createEntityAdapter, createSlice } from "@reduxjs/toolkit";
-import { fetchMulticallData } from "../batcher/requests"; // Circular dependency.
-import { fetchVaultsData } from "../requests";
-import { mirroredServerState, restartedDueToError } from "../actions";
-import type { AppState } from "../store";
-
-export type NormalizedTokenAdapter = TokenAdapter & {
-  revenueTokens?: string[];
-  revenueAPRs?: string[];
-};
-
-export interface NormalizedVault {
-  id: string;
-  chainId: number;
-  symbol: string;
-  name: string;
-  decimals: number;
-  totalValue?: string;
-  totalSupply?: string;
-  price?: string;
-  netAPR?: string;
-  totalFeesClaimed: string;
-  underlying: TokenData;
-  feeRecipient: string;
-  rewardsSeller: string;
-  performanceFee: number;
-  reserveRatio: number;
-  adapters: NormalizedTokenAdapter[];
-  weights: number[];
-  snapshots: VaultSnapshot[];
-
-  balances?: string[];
-  reserveBalance?: string;
-  averagePricePerShare?: number;
-}
-
-export const VAULTS_CALLER = "Vaults";
-
-const adapter = createEntityAdapter<NormalizedVault>({
-  selectId: (entry) => entry.id.toLowerCase(),
-});
-
-const slice = createSlice({
-  name: "vaults",
-  initialState: adapter.getInitialState(),
-  reducers: {},
-  extraReducers: (builder) =>
-    builder
-      .addCase(fetchMulticallData.fulfilled, (state, action) => {
-        const relevantMulticallData = vaultsMulticallDataParser(action.payload);
-
-        if (relevantMulticallData) {
-          const { revenueBreakdowns, vaultUpdates } = relevantMulticallData;
-
-          for (const [vault, update] of Object.entries(vaultUpdates)) {
-            const entry = state.entities[vault];
-            if (entry) {
-              if (update.totalSupply) entry.totalSupply = update.totalSupply;
-              if (update.netAPR) entry.netAPR = update.netAPR;
-              if (update.price) entry.price = update.price;
-              if (update.totalValue) entry.totalValue = update.totalValue;
-              if (update.balances) entry.balances = update.balances;
-              if (update.reserveBalance)
-                entry.reserveBalance = update.reserveBalance;
-            }
-          }
-          for (const [adapter, breakdown] of Object.entries(
-            revenueBreakdowns
-          )) {
-            const vaultID = Object.values(state.entities).find((entity) =>
-              entity?.adapters.find((a) => a.id === adapter)
-            )?.id;
-            if (!vaultID) continue;
-            const vault = state.entities[vaultID];
-            if (vault) {
-              const entry = vault.adapters.find(
-                (a) => a.id === adapter
-              ) as NormalizedTokenAdapter;
-              entry.revenueTokens = breakdown.tokens;
-              entry.revenueAPRs = breakdown.aprs;
-            }
-          }
-        }
-      })
-      .addCase(mirroredServerState, (_, action) => action.payload.vaults)
-      .addCase(restartedDueToError, () => adapter.getInitialState())
-      .addCase(fetchVaultsData.fulfilled, (state, action) => {
-        const {vaults, chainId} = action.payload ?? {};
-        if (vaults && chainId !== undefined) {
-          for (const { price, ...vault } of vaults) {
-            const entry = state.entities[vault.id.toLowerCase()];
-            if (!entry) {
-              adapter.upsertOne(state, vault);
-            } else {
-              entry.feeRecipient = vault.feeRecipient;
-              entry.rewardsSeller = vault.rewardsSeller;
-              entry.performanceFee = vault.performanceFee;
-              entry.reserveRatio = vault.reserveRatio;
-              entry.snapshots = vault.snapshots;
-              entry.averagePricePerShare = vault.averagePricePerShare;
-              if (
-                vault.adapters.some(
-                  (a, i) =>
-                    entry.adapters[i]?.id !== a.id ||
-                    entry.weights[i] !== vault.weights[i]
-                )
-              ) {
-                entry.weights = vault.weights;
-                for (const {
-                  ...adapter
-                } of vault.adapters as NormalizedTokenAdapter[]) {
-                  const existingAdapter = entry.adapters.find(
-                    (a) => a.id === adapter.id
-                  );
-                  if (existingAdapter) {
-                    adapter.revenueAPRs = existingAdapter.revenueAPRs;
-                    adapter.revenueTokens = existingAdapter.revenueTokens;
-                  }
-                }
-                entry.adapters = vault.adapters;
-              }
-            }
-          }
-        }
-      }),
-});
-
-export const { actions: vaultsActions, reducer: vaultsReducer } = slice;
-
-const selectors = adapter.getSelectors((state: AppState) => state.vaults);
-
-export const vaultsSelectors = {
-  selectAllVaults(state: AppState) {
-    const chainId = state.settings.network;
-    return selectors.selectAll(state).filter((v) => v.chainId === chainId);
-  },
-  selectVaultLookup(state: AppState) {
-    return selectors.selectEntities(state);
-  },
-  selectVault(state: AppState, id: string) {
-    const vault = selectors.selectById(state, id);
-
-    return vault ?? null;
-  },
-  selectVaultAPR(state: AppState, id: string) {
-    const vault = selectors.selectById(state, id);
-    if (!vault) return 0;
-    let netAPR = 0;
-    for (let i = 0; i < vault.adapters.length; i++) {
-      const adapter = vault.adapters[i];
-      const revenueAPR =
-        adapter.revenueAPRs?.reduce(
-          (t, n) => t + convert.toBalanceNumber(n),
-          0
-        ) ?? 0;
-      netAPR += revenueAPR * vault.weights[i];
-    }
-    netAPR *= 1 - vault.reserveRatio;
-    return +(netAPR * 100).toFixed(2);
-  },
-  selectVaultTargetReserveBalance(state: AppState, id: string) {
-    const vault = selectors.selectById(state, id);
-
-    if (vault?.totalValue) {
-      return convert.toBigNumber(vault.totalValue).times(vault.reserveRatio);
-    } else {
-      return 0;
-    }
-  },
-  selectProtocolTargetBalances(state: AppState, id: string) {
-    const vault = selectors.selectById(state, id);
-
-    if (vault) {
-      const { balances = [], weights, reserveRatio } = vault;
-
-      return weights.map((weight, i) => {
-        const balance = balances[i] ?? "0";
-
-        return convert
-          .toBigNumber(balance)
-          .times(1 - reserveRatio)
-          .times(weight);
-      });
-    } else {
-      return [];
-    }
-  },
-  selectNeedsToRebalance(state: AppState, id: string) {
-    const vault = selectors.selectById(state, id);
-
-    if (vault?.totalValue && vault?.reserveBalance) {
-      const vaultBalance = convert
-        .toBigNumber(vault.totalValue)
-        .times(vault.reserveRatio);
-      const needsToAtTopLevel = vaultBalance
-        .minus(vault.reserveBalance)
-        .abs()
-        .dividedBy(vaultBalance)
-        .isGreaterThanOrEqualTo(0.1);
-
-      if (needsToAtTopLevel) {
-        return true;
-      } else {
-        if (vault.balances) {
-          for (let i = 0; i < vault.adapters.length; i++) {
-            const balance = vault.balances[i];
-            const weight = vault.weights[i];
-            const value = convert
-              .toBigNumber(vault.totalValue)
-              .times(1 - vault.reserveRatio)
-              .times(weight);
-            const difference = value
-              .abs()
-              .dividedBy(convert.toBigNumber(balance));
-
-            if (difference.isGreaterThanOrEqualTo(0.1)) {
-              return true;
-            }
-          }
-        }
-      }
-    }
-
-    return false;
-  },
-  selectVaultBySymbol(state: AppState, symbol: string) {
-    return (
-      vaultsSelectors
-        .selectAllVaults(state)
-        .find(
-          (element) =>
-            element.underlying.symbol.toLowerCase() === symbol.toLowerCase()
-        ) ?? null
-    );
-  },
-  selectVaultToAprLookup(state: AppState) {
-    const vaults = vaultsSelectors.selectAllVaults(state);
-    const lookup: Record<string, number> = {};
-
-    for (const vault of vaults) {
-      const apr = vaultsSelectors.selectVaultAPR(state, vault.id);
-
-      lookup[vault.id] = apr;
-    }
-
-    return lookup;
-  },
-  selectAprSortedVaults(state: AppState) {
-    const vaults = vaultsSelectors.selectAllVaults(state);
-    const lookup = vaultsSelectors.selectVaultToAprLookup(state);
-
-    return vaults.sort((a, b) => {
-      const aValue = lookup[a.id];
-      const bValue = lookup[b.id];
-
-      return bValue - aValue;
-    });
-  },
-  // Snapshots
-};
-
-type RevenueBreakdown = {
-  tokens: string[];
-  aprs: string[];
-};
-
-type VaultUpdate = {
-  netAPR?: string;
-  price?: string;
-  totalValue?: string;
-  totalSupply?: string;
-  balances?: string[];
-  reserveBalance?: string;
-};
-
-type NormalizedVaultsUpdate = {
-  vaultUpdates: Record<string, VaultUpdate>;
-  revenueBreakdowns: Record<string, RevenueBreakdown>;
-};
-
-// #region Helpers
-const vaultsMulticallDataParser = createMulticallDataParser(
-  VAULTS_CALLER,
-  (calls): NormalizedVaultsUpdate => {
-    const vaultUpdates: Record<string, VaultUpdate> = {};
-    const revenueBreakdowns: Record<string, RevenueBreakdown> = {};
-
-    calls.forEach(([target, resultsByFunction]) => {
-      target = target.toLowerCase();
-      const functionsCalled = Object.keys(resultsByFunction);
-      functionsCalled.forEach((functionCalled) => {
-        const result = resultsByFunction[functionCalled][0].result;
-        if (!result) return;
-        switch (functionCalled) {
-          case "getPricePerFullShareWithFee":
-            vaultUpdates[target] = {
-              ...(vaultUpdates[target] || {}),
-              price: result[0],
-            };
-            break;
-          case "balance":
-            vaultUpdates[target] = {
-              ...(vaultUpdates[target] || {}),
-              totalValue: result[0],
-            };
-            break;
-          case "totalSupply":
-            vaultUpdates[target] = {
-              ...(vaultUpdates[target] || {}),
-              totalSupply: result[0],
-            };
-            break;
-          case "getBalances":
-            vaultUpdates[target].balances = result;
-
-            break;
-          case "reserveBalance":
-            vaultUpdates[target].reserveBalance = result[0];
-
-            break;
-          case "getRevenueBreakdown":
-            const tokens = result[0].split(",");
-            const aprs = result[1].split(",");
-            revenueBreakdowns[target] = {
-              tokens,
-              aprs,
-            };
-            break;
-        }
-      });
-    });
-    return { vaultUpdates, revenueBreakdowns };
-  }
-);
diff --git a/src/helpers/subgraph.ts b/src/helpers/subgraph.ts
index cf670515..2b3c1a3b 100644
--- a/src/helpers/subgraph.ts
+++ b/src/helpers/subgraph.ts
@@ -1,19 +1,15 @@
-import { NETWORKS_BY_ID, OLD_STAKING_SUBGRAPH_URL } from "../config";
-import { SUBGRAPH_URLS } from "@indexed-finance/subgraph-clients/dist/constants"
+import { NETWORKS_BY_ID } from "../config";
+import { SUBGRAPH_URLS } from "@indexed-finance/subgraph-clients/dist/constants";
 import axios from "axios";
 
 export function getIndexedUrl(chainId: number) {
   const networkName = NETWORKS_BY_ID[chainId].name;
-  return SUBGRAPH_URLS[networkName].indexedCore
-}
-
-export function getOldStakeURL(chainId: number) {
-  return OLD_STAKING_SUBGRAPH_URL;
+  return SUBGRAPH_URLS[networkName].indexedCore;
 }
 
 export function getUniswapUrl(chainId: number) {
   const networkName = NETWORKS_BY_ID[chainId].name;
-  return SUBGRAPH_URLS[networkName].uniswap
+  return SUBGRAPH_URLS[networkName].uniswap;
 }
 
 export async function sendQuery(url: string, query: string) {
diff --git a/src/hooks/address-hooks.ts b/src/hooks/address-hooks.ts
index b97d5d74..5c6f330b 100644
--- a/src/hooks/address-hooks.ts
+++ b/src/hooks/address-hooks.ts
@@ -1,82 +1,70 @@
 import {
-	ADAPTER_REGISTRY_ADDRESS,
-	DAI_ADDRESS,
-	DNDX_ADDRESS,
-	DNDX_TIMELOCK_ADDRESS,
-	MASTER_CHEF_ADDRESS,
-	MULTICALL2_ADDRESS,
-	MULTI_TOKEN_STAKING_ADDRESS,
-	NARWHAL_ROUTER_ADDRESS,
-	NDX_ADDRESS,
-	SUSHI_ADDRESS,
-	UNISWAP_ROUTER_ADDRESS,
-	USDC_ADDRESS,
-	WETH_ADDRESS,
+  ADAPTER_REGISTRY_ADDRESS,
+  DAI_ADDRESS,
+  DNDX_ADDRESS,
+  DNDX_TIMELOCK_ADDRESS,
+  MULTICALL2_ADDRESS,
+  NARWHAL_ROUTER_ADDRESS,
+  NDX_ADDRESS,
+  SUSHI_ADDRESS,
+  UNISWAP_ROUTER_ADDRESS,
+  USDC_ADDRESS,
+  WETH_ADDRESS,
 } from "config";
 
 import { useChainId } from "./settings-hooks";
 
 export function useAdapterRegistryAddress() {
-	const chainId = useChainId();
-	return ADAPTER_REGISTRY_ADDRESS[chainId];
+  const chainId = useChainId();
+  return ADAPTER_REGISTRY_ADDRESS[chainId];
 }
 
 export function useDaiAddress() {
-	const chainId = useChainId();
-	return DAI_ADDRESS[chainId];
+  const chainId = useChainId();
+  return DAI_ADDRESS[chainId];
 }
 
 export function useERC20DividendsOwnedAddress() {
-	const chainId = useChainId();
-	return DNDX_ADDRESS[chainId];
+  const chainId = useChainId();
+  return DNDX_ADDRESS[chainId];
 }
 
 export function useSharesTimeLockAddress() {
-	const chainId = useChainId();
-	return DNDX_TIMELOCK_ADDRESS[chainId];
-}
-
-export function useMasterChefAddress() {
-	const chainId = useChainId();
-	return MASTER_CHEF_ADDRESS[chainId];
+  const chainId = useChainId();
+  return DNDX_TIMELOCK_ADDRESS[chainId];
 }
 
 export function useMultiCall2Address() {
-	const chainId = useChainId();
-	return MULTICALL2_ADDRESS[chainId];
-}
-
-export function useMultiTokenStakingAddress() {
-	const chainId = useChainId();
-	return MULTI_TOKEN_STAKING_ADDRESS[chainId];
+  const chainId = useChainId();
+  return MULTICALL2_ADDRESS[chainId];
 }
 
 export function useIndexedNarwhalRouterAddress() {
-	const chainId = useChainId();
-	return NARWHAL_ROUTER_ADDRESS[chainId];
+  const chainId = useChainId();
+  return NARWHAL_ROUTER_ADDRESS[chainId];
 }
 
 export function useNdxAddress() {
-	const chainId = useChainId();
-	return NDX_ADDRESS[chainId];
+  const chainId = useChainId();
+  return NDX_ADDRESS[chainId];
 }
 
 export function useSushiAddress() {
-	const chainId = useChainId();
-	return SUSHI_ADDRESS[chainId];
+  const chainId = useChainId();
+  return SUSHI_ADDRESS[chainId];
 }
 
 export function useUniswapV2RouterAddress() {
-	const chainId = useChainId();
-	return UNISWAP_ROUTER_ADDRESS[chainId];
+  const chainId = useChainId();
+  return UNISWAP_ROUTER_ADDRESS[chainId];
 }
 
 export function useUsdcAddress() {
-	const chainId = useChainId();
-	return USDC_ADDRESS[chainId];
+  const chainId = useChainId();
+  return USDC_ADDRESS[chainId];
 }
 
 export function useWethAddress() {
-	const chainId = useChainId();
-	return WETH_ADDRESS[chainId];
-}
\ No newline at end of file
+  const chainId = useChainId();
+  return WETH_ADDRESS[chainId];
+}
diff --git a/src/hooks/burn-hooks.ts b/src/hooks/burn-hooks.ts
index ec09b329..c48ef031 100644
--- a/src/hooks/burn-hooks.ts
+++ b/src/hooks/burn-hooks.ts
@@ -167,12 +167,15 @@ export function useMultiTokenBurnCallbacks(poolId: string) {
   return { calculateAmountsOut, executeBurn };
 }
 
+const conflictTokenAddress = '0x8762db106b2c2a0bccb3a80d1ed41273552616e8';
+
 // #region Routing
 export function useBurnRouterCallbacks(poolId: string) {
   const baseTokens = useCommonBaseTokens()
   const poolTokens = usePoolUnderlyingTokens(poolId);
   const poolTokenIds = usePoolTokenAddresses(poolId);
   const tokenLookupBySymbol = useTokenLookupBySymbol();
+
   const tokenIds = useMemo(
     () => [...poolTokenIds, ...baseTokens.map(({ id }) => id)],
     [poolTokenIds, baseTokens]
@@ -187,8 +190,9 @@ export function useBurnRouterCallbacks(poolId: string) {
     (tokenOutSymbol: string, amountOut: BigNumber) => {
       const normalizedOutput =
         tokenLookupBySymbol[tokenOutSymbol.toLowerCase()];
-      const allResults = poolTokens
-        .map((token) => {
+      const allResults =  poolTokens.filter(e =>
+          e.address !== conflictTokenAddress
+        ).map((token) => {
           if (!token.ready) return null;
           const normalizedPoolTokenOut =
             tokenLookupBySymbol[token.token.symbol.toLowerCase()];
@@ -246,8 +250,9 @@ export function useBurnRouterCallbacks(poolId: string) {
       const normalizedOutput =
         tokenLookupBySymbol[tokenOutSymbol.toLowerCase()];
 
-      const allResults = poolTokens
-        .map((token) => {
+      const allResults = poolTokens.filter(e =>
+          e.address !== conflictTokenAddress
+        ).map((token) => {
           if (!token.ready) return null;
           const normalizedPoolTokenOut =
             tokenLookupBySymbol[token.token.symbol.toLowerCase()];
diff --git a/src/hooks/contract-hooks.ts b/src/hooks/contract-hooks.ts
index 69029937..0f727709 100644
--- a/src/hooks/contract-hooks.ts
+++ b/src/hooks/contract-hooks.ts
@@ -1,12 +1,10 @@
 import {
-	ADAPTER_REGISTRY_ADDRESS,
-	DNDX_ADDRESS,
-	DNDX_TIMELOCK_ADDRESS,
-	MASTER_CHEF_ADDRESS,
-	MULTICALL2_ADDRESS,
-	MULTI_TOKEN_STAKING_ADDRESS,
-	NARWHAL_ROUTER_ADDRESS,
-	UNISWAP_ROUTER_ADDRESS,
+  ADAPTER_REGISTRY_ADDRESS,
+  DNDX_ADDRESS,
+  DNDX_TIMELOCK_ADDRESS,
+  MULTICALL2_ADDRESS,
+  NARWHAL_ROUTER_ADDRESS,
+  UNISWAP_ROUTER_ADDRESS,
 } from "config";
 
 import { ContractTypeLookup, InterfaceKind, getContract } from "ethereum";
@@ -15,7 +13,10 @@ import { useChainId } from "./settings-hooks";
 
 import { useSigner } from "features";
 
-export function useContractWithSigner<T extends InterfaceKind>(address: string | undefined, name: T): ContractTypeLookup[T] | undefined {
+export function useContractWithSigner<T extends InterfaceKind>(
+  address: string | undefined,
+  name: T
+): ContractTypeLookup[T] | undefined {
   const signer = useSigner();
   if (signer && address) {
     return getContract(address, name, signer);
@@ -23,96 +24,72 @@ export function useContractWithSigner<T extends InterfaceKind>(address: string |
 }
 
 export function useAdapterRegistryContract() {
-	const chainId = useChainId();
-	const address = ADAPTER_REGISTRY_ADDRESS[chainId];
-	return useContractWithSigner(address, "AdapterRegistry");
+  const chainId = useChainId();
+  const address = ADAPTER_REGISTRY_ADDRESS[chainId];
+  return useContractWithSigner(address, "AdapterRegistry");
 }
 
 export function useErc20AdapterContract(address: string) {
-	return useContractWithSigner(address, "Erc20Adapter");
+  return useContractWithSigner(address, "Erc20Adapter");
 }
 
 export function useDNDXContract() {
-	const chainId = useChainId();
-	const address = DNDX_ADDRESS[chainId];
-	return useContractWithSigner(address, "ERC20DividendsOwned");
+  const chainId = useChainId();
+  const address = DNDX_ADDRESS[chainId];
+  return useContractWithSigner(address, "ERC20DividendsOwned");
 }
 
 export function useTokenContract(address: string) {
-	return useContractWithSigner(address, "IERC20");
+  return useContractWithSigner(address, "IERC20");
 }
 
 export function useIIndexedUniswapV2OracleContract(address: string) {
-	return useContractWithSigner(address, "IIndexedUniswapV2Oracle");
+  return useContractWithSigner(address, "IIndexedUniswapV2Oracle");
 }
 
 export function useIndexedNarwhalRouterContract() {
-	const chainId = useChainId();
-	const address = NARWHAL_ROUTER_ADDRESS[chainId];
-	return useContractWithSigner(address, "IndexedNarwhalRouter");
+  const chainId = useChainId();
+  const address = NARWHAL_ROUTER_ADDRESS[chainId];
+  return useContractWithSigner(address, "IndexedNarwhalRouter");
 }
 
 export function useIndexedUniswapRouterBurnerContract(address: string) {
-	return useContractWithSigner(address, "IndexedUniswapRouterBurner");
+  return useContractWithSigner(address, "IndexedUniswapRouterBurner");
 }
 
 export function useIndexedUniswapRouterMinterContract(address: string) {
-	return useContractWithSigner(address, "IndexedUniswapRouterMinter");
+  return useContractWithSigner(address, "IndexedUniswapRouterMinter");
 }
 
 export function useIndexPoolContract(address: string) {
-	return useContractWithSigner(address, "IPool");
+  return useContractWithSigner(address, "IPool");
 }
 
 export function useIPoolInitializerContract(address: string) {
-	return useContractWithSigner(address, "IPoolInitializer");
-}
-
-export function useMasterChefContract() {
-	const chainId = useChainId();
-	const address = MASTER_CHEF_ADDRESS[chainId];
-	return useContractWithSigner(address, "MasterChef");
+  return useContractWithSigner(address, "IPoolInitializer");
 }
 
 export function useMultiCall2Contract() {
-	const address = MULTICALL2_ADDRESS;
-	return useContractWithSigner(address, "MultiCall2");
-}
-
-export function useMultiTokenStakingContract() {
-	const chainId = useChainId();
-	const address = MULTI_TOKEN_STAKING_ADDRESS[chainId];
-	return useContractWithSigner(address, "MultiTokenStaking");
-}
-
-export function useNirnVaultContract(address: string) {
-	return useContractWithSigner(address, "NirnVault");
+  const address = MULTICALL2_ADDRESS;
+  return useContractWithSigner(address, "MultiCall2");
 }
 
 export function usePairContract(address: string) {
-	return useContractWithSigner(address, "Pair");
+  return useContractWithSigner(address, "Pair");
 }
 
 export function useRewardsScheduleContract(address: string) {
-	return useContractWithSigner(address, "RewardsSchedule");
+  return useContractWithSigner(address, "RewardsSchedule");
 }
 
 export function useTimelockContract() {
-	const chainId = useChainId();
-	const address = DNDX_TIMELOCK_ADDRESS[chainId];
-	return useContractWithSigner(address, "SharesTimeLock");
-}
-
-export function useStakingRewardsContract(address: string) {
-	return useContractWithSigner(address, "StakingRewards");
-}
-
-export function useStakingRewardsFactoryContract(address: string) {
-	return useContractWithSigner(address, "StakingRewardsFactory");
+  const chainId = useChainId();
+  const address = DNDX_TIMELOCK_ADDRESS[chainId];
+  return useContractWithSigner(address, "SharesTimeLock");
 }
 
 export function useUniswapRouterContract() {
-	const chainId = useChainId();
-	const address = UNISWAP_ROUTER_ADDRESS[chainId];
-	return useContractWithSigner(address, "UniswapV2Router");
-}
\ No newline at end of file
+  const chainId = useChainId();
+  const address = UNISWAP_ROUTER_ADDRESS[chainId];
+  return useContractWithSigner(address, "UniswapV2Router");
+}
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index 2e3fa702..10751f22 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -1,30 +1,26 @@
 // This file was generated via a script in `scripts/`.
 // Do not manually modify this (or any) index files.
 
-export * from './burn-hooks';
-export * from './contract-hooks';
-export * from './masterchef-hooks';
-export * from './mint-hooks';
-export * from './new-staking-hooks';
-export * from './notification-hooks';
-export * from './pair-hooks';
-export * from './pool-hooks';
-export * from './portfolio-hooks';
-export * from './staking-hooks';
-export * from './swap-hooks';
-export * from './timelock-hooks';
-export * from './token-hooks';
-export * from './transaction-hooks';
-export * from './use-breakpoints';
-export * from './use-call-registrar';
-export * from './use-debounce';
-export * from './use-history-change-callback';
-export * from './use-markdown-data';
-export * from './use-previous';
-export * from './use-query';
-export * from './use-scroll-prevention';
-export * from './use-storage-entry';
-export * from './use-wallet-connection';
-export * from './settings-hooks';
-export * from './user-hooks';
-export * from './vault-hooks';
\ No newline at end of file
+export * from "./address-hooks";
+export * from "./burn-hooks";
+export * from "./contract-hooks";
+export * from "./mint-hooks";
+export * from "./notification-hooks";
+export * from "./pair-hooks";
+export * from "./pool-hooks";
+export * from "./settings-hooks";
+export * from "./swap-hooks";
+export * from "./timelock-hooks";
+export * from "./token-hooks";
+export * from "./transaction-hooks";
+export * from "./use-breakpoints";
+export * from "./use-call-registrar";
+export * from "./use-debounce";
+export * from "./use-history-change-callback";
+export * from "./use-markdown-data";
+export * from "./use-previous";
+export * from "./use-query";
+export * from "./use-scroll-prevention";
+export * from "./use-storage-entry";
+export * from "./use-wallet-connection";
+export * from "./user-hooks";
diff --git a/src/hooks/masterchef-hooks.ts b/src/hooks/masterchef-hooks.ts
deleted file mode 100644
index 253d18df..00000000
--- a/src/hooks/masterchef-hooks.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import { AppState, selectors } from "features";
-import { MASTER_CHEF_ADDRESS } from "config";
-import {
-  MasterChefPool,
-  masterChefCaller,
-  totalSushiPerDay,
-} from "features/masterChef";
-import { RegisteredCall, convert } from "helpers";
-import {
-  StakingTransactionCallbacks,
-  useAddTransactionCallback,
-} from "./transaction-hooks";
-import { useCachedValue } from "./use-debounce";
-import { useCallRegistrar } from "./use-call-registrar";
-import { useCallback, useMemo } from "react";
-import { useChainId } from "./settings-hooks";
-import { useMasterChefAddress, useSushiAddress } from "./address-hooks";
-import { useMasterChefContract } from "./contract-hooks";
-import { usePairTokenPrice, useTokenPrice } from "./token-hooks";
-import { useSelector } from "react-redux";
-import { useUniswapPairs } from "./pair-hooks";
-import { useUserAddress } from "./user-hooks";
-
-export const useMasterChefStakedBalance = (id: string) =>
-  useSelector((state: AppState) =>
-    selectors.selectMasterChefUserStakedBalance(state, id)
-  );
-
-export const useMasterChefPoolForToken = (stakingToken: string) =>
-  useSelector((state: AppState) =>
-    selectors.selectMasterChefPoolByStakingToken(state, stakingToken)
-  );
-
-export const useMasterChefPoolsForTokens = (stakingTokens: string[]) =>
-  useSelector((state: AppState) =>
-    selectors.selectMasterChefPoolsByStakingTokens(state, stakingTokens)
-  );
-
-export const useMasterChefMeta = () =>
-  useSelector(selectors.selectMasterChefMeta);
-
-export const useMasterChefPool = (id: string) =>
-  useSelector((state: AppState) => selectors.selectMasterChefPool(state, id));
-
-export const useMasterChefRewardsPerDay = (id: string) => {
-  const meta = useMasterChefMeta();
-  const pool = useMasterChefPool(id);
-  if (!pool) return convert.toBigNumber("0.00");
-  return totalSushiPerDay.times(pool.allocPoint).div(meta.totalAllocPoint);
-};
-
-export const useMasterChefInfoLookup = (ids: string[]) =>
-  useSelector((state: AppState) =>
-    selectors.selectMasterChefInfoLookup(state, ids)
-  );
-
-export function useMasterChefApy(pid: string) {
-  const sushiAddress = useSushiAddress()
-  const meta = useSelector((state: AppState) =>
-    selectors.selectMasterChefMeta(state)
-  );
-  const stakingPool = useMasterChefPool(pid);
-  const [sushiPrice] = useTokenPrice(sushiAddress);
-  const tokenPrice = usePairTokenPrice(stakingPool?.token ?? "");
-
-  return useMemo(() => {
-    const hasLoaded = sushiPrice && tokenPrice;
-
-    if (hasLoaded && stakingPool) {
-      const sushiMinedPerDay = totalSushiPerDay
-        .times(stakingPool.allocPoint)
-        .div(meta.totalAllocPoint);
-      const valueSushiPerYear = parseFloat(
-        convert.toBalance(
-          sushiMinedPerDay.times(365).times(sushiPrice ?? 0),
-          18,
-          false
-        )
-      );
-      const stakedAmount = parseFloat(
-        convert.toBalance(stakingPool?.totalStaked ?? "0", 18)
-      );
-      const totalStakedValue = stakedAmount * (tokenPrice ?? 0);
-      return convert.toPercent(valueSushiPerYear / totalStakedValue);
-    } else {
-      return null;
-    }
-  }, [tokenPrice, sushiPrice, stakingPool, meta.totalAllocPoint]);
-}
-
-export function createMasterChefCalls(
-  chainId: number,
-  pid: string,
-  stakingToken: string,
-  userAddress?: string
-): RegisteredCall[] {
-  const masterChefAddress = MASTER_CHEF_ADDRESS[chainId]
-  const onChainCalls: RegisteredCall[] = masterChefAddress ? [
-    {
-      interfaceKind: "IERC20",
-      target: stakingToken,
-      function: "balanceOf",
-      args: [MASTER_CHEF_ADDRESS[chainId]],
-    },
-    {
-      interfaceKind: "MasterChef",
-      target: MASTER_CHEF_ADDRESS[chainId],
-      function: "poolInfo",
-      args: [pid],
-    },
-  ] : [];
-
-  if (userAddress && masterChefAddress) {
-    onChainCalls.push(
-      {
-        interfaceKind: "MasterChef",
-        target: masterChefAddress,
-        function: "userInfo",
-        args: [pid, userAddress],
-      },
-      {
-        interfaceKind: "MasterChef",
-        target: masterChefAddress,
-        function: "pendingSushi",
-        args: [pid, userAddress],
-      }
-    );
-  }
-  return onChainCalls;
-}
-
-export const useMasterChefPoolsWithRecognizedPairs = () => {
-  const allPairs = useSelector(selectors.selectPossibleMasterChefPairs);
-  const debouncedPairs = useCachedValue(allPairs);
-  useUniswapPairs(debouncedPairs);
-  const pairIds = useMemo(() => {
-    return debouncedPairs.map((p) => p.id);
-  }, [debouncedPairs]);
-  const pools = useSelector((state: AppState) =>
-    selectors.selectMasterChefPoolsByStakingTokens(state, pairIds)
-  );
-  return useMemo(() => {
-    return pools.filter((_) => Boolean(_)) as MasterChefPool[];
-  }, [pools]);
-};
-
-export function useMasterChefRegistrar() {
-  const masterChefAddress = useMasterChefAddress();
-  const userAddress = useUserAddress();
-  const chainId = useChainId()
-  const stakingPools: MasterChefPool[] =
-    useMasterChefPoolsWithRecognizedPairs();
-  const { onChainCalls, offChainCalls } = useMemo(() => {
-    if (!masterChefAddress) return {
-      onChainCalls: [],
-      offChainCalls: []
-    }
-    return stakingPools.reduce(
-      (prev, next) => {
-        const poolCalls = createMasterChefCalls(
-          chainId,
-          next.id,
-          next.token,
-          userAddress
-        );
-        prev.onChainCalls.push(...poolCalls);
-        return prev;
-      },
-      {
-        onChainCalls: [
-          {
-            interfaceKind: "MasterChef",
-            target: masterChefAddress,
-            function: "totalAllocPoint",
-          },
-        ],
-        offChainCalls: [],
-      } as {
-        onChainCalls: RegisteredCall[];
-        offChainCalls: RegisteredCall[];
-      }
-    );
-  }, [stakingPools, userAddress, masterChefAddress, chainId]);
-
-  useCallRegistrar({
-    caller: masterChefCaller,
-    onChainCalls,
-    offChainCalls,
-  });
-}
-
-export function useMasterChefTransactionCallbacks(
-  pid: string
-): StakingTransactionCallbacks {
-  const stakedBalance = useMasterChefStakedBalance(pid);
-  const contract = useMasterChefContract();
-  const addTransaction = useAddTransactionCallback();
-
-  const stake = useCallback(
-    (amount: string) => {
-      // @todo Figure out a better way to handle this
-      if (!contract) throw new Error();
-      const tx = contract.deposit(pid, amount);
-      addTransaction(tx);
-    },
-    [addTransaction, contract, pid]
-  );
-
-  const withdraw = useCallback(
-    (amount: string) => {
-      // @todo Figure out a better way to handle this
-      if (!contract) throw new Error();
-      const tx = contract.withdraw(pid, amount);
-      addTransaction(tx);
-    },
-    [contract, addTransaction, pid]
-  );
-
-  const exit = useCallback(() => {
-    // @todo Figure out a better way to handle this
-    if (!contract || !stakedBalance) throw new Error();
-    const tx = contract.withdraw(pid, stakedBalance);
-    addTransaction(tx);
-  }, [contract, addTransaction, pid, stakedBalance]);
-
-  const claim = useCallback(() => {
-    // @todo Figure out a better way to handle this
-    if (!contract) throw new Error();
-    const tx = contract.deposit(pid, 0);
-    addTransaction(tx);
-  }, [contract, addTransaction, pid]);
-
-  return {
-    stake,
-    withdraw,
-    exit,
-    claim,
-  };
-}
diff --git a/src/hooks/mint-hooks.ts b/src/hooks/mint-hooks.ts
index 86907530..0e1c985a 100644
--- a/src/hooks/mint-hooks.ts
+++ b/src/hooks/mint-hooks.ts
@@ -15,7 +15,6 @@ import { getTokenValueGetter, useUniswapTradingPairs } from "./pair-hooks";
 import { useCallback, useMemo } from "react";
 import { useChainId, useGasPrice } from "./settings-hooks";
 import { useCommonBaseTokens, useTokenLookupBySymbol, useTotalSuppliesWithLoadingIndicator } from "./token-hooks";
-import { useIndexedNarwhalRouterContract } from "./contract-hooks";
 import {
   useMintMultiTransactionCallback,
   useMintSingleTransactionCallbacks,
@@ -273,15 +272,19 @@ export function useMintRouterCallbacks(poolId: string) {
         if (!uniswapResult) return null;
         totalAmountIn = totalAmountIn.plus(convert.toBigNumber(uniswapResult.inputAmount.raw.toString()));
         const path = uniswapResult.route.encodedPath;
+
         console.log(`MULTI: ANY PAIRS USING SUSHI? ${uniswapResult.route.pairs.some((p) => p.sushi)}`)
+
         const sushiFirst = uniswapResult.route.pairs[0].sushi;
         const [address, sushiNext] = path.length === 3
           ? [uniswapResult.route.path[1].address, uniswapResult.route.pairs[1].sushi]
           : [constants.AddressZero, false]
         intermediaries.push(encodeIntermediary(address, sushiFirst, sushiNext))
+
+        return null;
       });
       if (intermediaries.length !== tokens.length) return null;
-      
+
       return {
         type: 'Multi',
         tokenIn: normalizedInput.id,
@@ -309,7 +312,7 @@ export function useMintRouterCallbacks(poolId: string) {
         console.log(`LOADING ${loading} totalSupply ${totalSupply.toString()}`)
         return null;
       }
-      
+
       const normalizedInput = tokenLookupBySymbol[tokenInSymbol.toLowerCase()];
       const poolRatio = amountOut.div(totalSupply).toNumber();
       const allResults = poolTokens
@@ -433,5 +436,5 @@ export function useMintRouterCallbacks(poolId: string) {
     executeRoutedMint,
     getBestMintRouteForAmountOut,
     loading
-  } 
-}
\ No newline at end of file
+  }
+}
diff --git a/src/hooks/new-staking-hooks.ts b/src/hooks/new-staking-hooks.ts
deleted file mode 100644
index 4c1b65e8..00000000
--- a/src/hooks/new-staking-hooks.ts
+++ /dev/null
@@ -1,283 +0,0 @@
-import { AppState, selectors } from "features";
-import { NDX_ADDRESS, WETH_ADDRESS } from "config";
-import { NewStakingMeta, NewStakingPool } from "features/newStaking";
-import { RegisteredCall, convert } from "helpers";
-import {
-  StakingTransactionCallbacks,
-  useAddTransactionCallback,
-} from "./transaction-hooks";
-import { useCallRegistrar } from "./use-call-registrar";
-import { useCallback, useMemo } from "react";
-import { useChainId } from "./settings-hooks";
-import { useMultiTokenStakingContract } from "./contract-hooks";
-import { useNdxAddress } from "./address-hooks";
-import { useSelector } from "react-redux";
-import {
-  useTokenPrice,
-  useTotalSuppliesWithLoadingIndicator,
-} from "./token-hooks";
-import { useUniswapPairs } from "./pair-hooks";
-import { useUserAddress } from "./user-hooks";
-
-export const useNewStakedBalance = (id: string) =>
-  useSelector((state: AppState) =>
-    selectors.selectNewUserStakedBalance(state, id)
-  );
-
-export const useNewStakingPoolsForTokens = (stakingTokens: string[]) =>
-  useSelector((state: AppState) =>
-    selectors.selectNewStakingPoolsByStakingTokens(state, stakingTokens)
-  );
-
-export const useNewStakingPool = (id: string) =>
-  useSelector((state: AppState) => selectors.selectNewStakingPool(state, id));
-
-export function useNewStakingTokenPrice(id: string) {
-  const chainId = useChainId()
-  const stakingPool = useNewStakingPool(id);
-  const [supplyTokens, _pairs, indexPool] = useMemo(() => {
-    if (!stakingPool) return [[], [], ""];
-    if (!stakingPool.isWethPair) {
-      return [[], [], stakingPool.token];
-    }
-    const [token0, token1] = [
-      stakingPool.token0 as string,
-      stakingPool.token1 as string,
-    ];
-    const indexPool = (
-      stakingPool.token0?.toLowerCase() === WETH_ADDRESS[chainId]
-        ? stakingPool.token1
-        : stakingPool.token0
-    ) as string;
-    return [
-      [stakingPool.token.toLowerCase()],
-      [
-        {
-          id: stakingPool.token.toLowerCase(),
-          token0,
-          token1,
-          exists: undefined,
-        },
-      ],
-      indexPool,
-    ];
-  }, [stakingPool, chainId]);
-  const [supplies, suppliesLoading] =
-    useTotalSuppliesWithLoadingIndicator(supplyTokens);
-  const [pairs, pairsLoading] = useUniswapPairs(_pairs);
-  const [tokenPrice, tokenPriceLoading] = useTokenPrice(indexPool);
-  const hasLoaded = useMemo(() => {
-    if (!stakingPool) return false;
-    if (stakingPool!.isWethPair) {
-      return !(pairsLoading || suppliesLoading || tokenPriceLoading);
-    }
-    return !tokenPriceLoading;
-  }, [stakingPool, pairsLoading, suppliesLoading, tokenPriceLoading]);
-
-  return useMemo(() => {
-    if (hasLoaded) {
-      if (stakingPool!.isWethPair) {
-        const [pair] = pairs || [];
-        const [supply] = supplies || [];
-        const firstTokenIsStakingPool =
-          pair.token0.address.toLowerCase() === indexPool.toLowerCase();
-        const tokenReserve = firstTokenIsStakingPool
-          ? pair.reserve0
-          : pair.reserve1;
-        const valueOfSupplyInToken = parseFloat(tokenReserve.toExact()) * 2;
-        const tokensPerLpToken =
-          valueOfSupplyInToken /
-          parseFloat(convert.toBalance(supply, 18, false));
-        return tokensPerLpToken * (tokenPrice as number);
-      } else {
-        return tokenPrice;
-      }
-    } else {
-      return null;
-    }
-  }, [hasLoaded, pairs, stakingPool, supplies, tokenPrice, indexPool]);
-}
-
-export const useNewStakingInfoLookup = (ids: string[]) =>
-  useSelector((state: AppState) =>
-    selectors.selectNewStakingInfoLookup(state, ids)
-  );
-
-export function useNewStakingApy(pid: string) {
-  const ndxAddress = useNdxAddress();
-  const stakingPool = useNewStakingPool(pid);
-  const [ndxPrice] = useTokenPrice(ndxAddress);
-  const tokenPrice = useNewStakingTokenPrice(pid);
-
-  return useMemo(() => {
-    const hasLoaded = ndxPrice && tokenPrice && stakingPool;
-
-    if (hasLoaded) {
-      const ndxMinedPerDay = convert.toBigNumber(
-        stakingPool?.rewardsPerDay ?? "0"
-      );
-      const valueNdxPerYear = parseFloat(
-        convert.toBalance(
-          ndxMinedPerDay.times(365).times(ndxPrice ?? 0),
-          18,
-          false
-        )
-      );
-      const stakedAmount = parseFloat(
-        convert.toBalance(stakingPool?.totalStaked ?? "0", 18)
-      );
-      const totalStakedValue = stakedAmount * (tokenPrice ?? 0);
-      return convert.toPercent(valueNdxPerYear / totalStakedValue);
-    } else {
-      return null;
-    }
-  }, [tokenPrice, ndxPrice, stakingPool]);
-}
-
-export function createNewStakingCalls(
-  multiTokenStaking: string,
-  pid: string,
-  stakingToken: string,
-  userAddress?: string
-): {
-  onChainCalls: RegisteredCall[];
-  offChainCalls: RegisteredCall[];
-} {
-  const onChainCalls: RegisteredCall[] = [
-    {
-      interfaceKind: "IERC20",
-      target: stakingToken,
-      function: "balanceOf",
-      args: [multiTokenStaking],
-    },
-  ];
-
-  if (userAddress) {
-    onChainCalls.push(
-      {
-        target: multiTokenStaking,
-        function: "userInfo",
-        args: [pid, userAddress],
-        interfaceKind: "MultiTokenStaking",
-      },
-      {
-        target: multiTokenStaking,
-        function: "pendingRewards",
-        args: [pid, userAddress],
-        interfaceKind: "MultiTokenStaking",
-      }
-    );
-  }
-
-  return {
-    onChainCalls,
-    offChainCalls: [],
-  };
-}
-
-export const NEW_STAKING_CALLER = "NewStaking";
-
-const BLOCKS_PER_DAY = 86400 / 13.5;
-
-export function useNewStakingRegistrar() {
-  const userAddress = useUserAddress();
-  const meta: NewStakingMeta = useSelector(selectors.selectNewStakingMeta);
-  const stakingPools: NewStakingPool[] = useSelector(
-    selectors.selectAllNewStakingPools
-  );
-  const firstPool = stakingPools.sort(
-    (a, b) => b.lastRewardBlock - a.lastRewardBlock
-  )[0];
-  const fromBlock = firstPool?.lastRewardBlock;
-  const { onChainCalls, offChainCalls } = useMemo(() => {
-    if (!fromBlock) return { onChainCalls: [], offChainCalls: [] };
-    return stakingPools.reduce(
-      (prev, next) => {
-        const poolCalls = createNewStakingCalls(
-          meta.id,
-          next.id,
-          next.token,
-          userAddress
-        );
-
-        prev.onChainCalls.push(...poolCalls.onChainCalls);
-        prev.offChainCalls.push(...poolCalls.offChainCalls);
-
-        return prev;
-      },
-      {
-        onChainCalls: [
-          {
-            target: meta.rewardsSchedule,
-            function: "getRewardsForBlockRange",
-            interfaceKind: "RewardsSchedule",
-            args: [
-              fromBlock.toString(),
-              Math.floor(fromBlock + BLOCKS_PER_DAY).toString(),
-            ],
-          },
-        ],
-        offChainCalls: [],
-      } as {
-        onChainCalls: RegisteredCall[];
-        offChainCalls: RegisteredCall[];
-      }
-    );
-  }, [stakingPools, meta, fromBlock, userAddress]);
-
-  useCallRegistrar({
-    caller: NEW_STAKING_CALLER,
-    onChainCalls,
-    offChainCalls,
-  });
-}
-
-export function useNewStakingTransactionCallbacks(
-  pid: string
-): StakingTransactionCallbacks {
-  const userAddress = useUserAddress();
-  const stakedBalance = useNewStakedBalance(pid);
-  const contract = useMultiTokenStakingContract();
-  const addTransaction = useAddTransactionCallback();
-
-  const stake = useCallback(
-    (amount: string) => {
-      // @todo Figure out a better way to handle this
-      if (!contract) throw new Error();
-      const tx = contract.deposit(pid, amount, userAddress);
-      addTransaction(tx);
-    },
-    [contract, addTransaction, pid, userAddress]
-  );
-
-  const withdraw = useCallback(
-    (amount: string) => {
-      // @todo Figure out a better way to handle this
-      if (!contract) throw new Error();
-      const tx = contract.withdraw(pid, amount, userAddress);
-      addTransaction(tx);
-    },
-    [contract, addTransaction, pid, userAddress]
-  );
-
-  const exit = useCallback(() => {
-    // @todo Figure out a better way to handle this
-    if (!contract || !stakedBalance) throw new Error();
-    const tx = contract.withdrawAndHarvest(pid, stakedBalance, userAddress);
-    addTransaction(tx);
-  }, [contract, addTransaction, pid, userAddress, stakedBalance]);
-
-  const claim = useCallback(() => {
-    // @todo Figure out a better way to handle this
-    if (!contract) throw new Error();
-    const tx = contract.harvest(pid, userAddress);
-    addTransaction(tx);
-  }, [contract, addTransaction, pid, userAddress]);
-
-  return {
-    stake,
-    exit,
-    withdraw,
-    claim,
-  };
-}
diff --git a/src/hooks/pool-hooks.ts b/src/hooks/pool-hooks.ts
index 1fb3d18d..3c3b501f 100644
--- a/src/hooks/pool-hooks.ts
+++ b/src/hooks/pool-hooks.ts
@@ -1,7 +1,7 @@
 import { AppState, FormattedIndexPool, POOL_CALLER, selectors } from "features";
 import { useCachedValue } from "./use-debounce";
 import { useCallRegistrar } from "./use-call-registrar";
-import { useEffect, useMemo } from "react";
+import { useMemo } from "react";
 import { useSelector } from "react-redux";
 import type { RegisteredCall } from "helpers";
 
diff --git a/src/hooks/portfolio-hooks.ts b/src/hooks/portfolio-hooks.ts
deleted file mode 100644
index 0e4f07a5..00000000
--- a/src/hooks/portfolio-hooks.ts
+++ /dev/null
@@ -1,568 +0,0 @@
-import { FormattedPortfolioAsset, NormalizedIndexPool, } from "features";
-import {
-  PricedAsset,
-  useToken,
-  useTokenLookup,
-  useTokenPricesLookup,
-} from "./token-hooks";
-import { WETH_ADDRESS } from "config";
-import {
-  computeSushiswapPairAddress,
-  computeUniswapPairAddress,
-  convert,
-  sushiswapInfoPairLink,
-  uniswapInfoPairLink,
-  uniswapInfoTokenLink,
-} from "helpers";
-import { useAllPools } from "./pool-hooks";
-import { useChainId, useTheme } from "./settings-hooks";
-import {
-  useMasterChefInfoLookup,
-  useMasterChefPoolsForTokens,
-} from "./masterchef-hooks";
-import { useMemo } from "react";
-import { useNdxAddress, useSushiAddress } from "./address-hooks";
-import {
-  useNewStakingInfoLookup,
-  useNewStakingPoolsForTokens,
-} from "./new-staking-hooks";
-import { usePairExistsLookup } from "./pair-hooks";
-import {
-  useStakingInfoLookup,
-  useStakingPoolsForTokens,
-} from "./staking-hooks";
-import { useTokenBalances } from "./user-hooks";
-import { useVaultPortfolioTotalValue } from "./vault-hooks";
-import S from "string";
-
-type RawAsset = {
-  id: string;
-  name: string;
-  symbol: string;
-  isUniswapPair?: boolean;
-  isSushiswapPair?: boolean;
-};
-
-export const buildEthUniPair = (asset: RawAsset, chainId: number) => ({
-  id: computeUniswapPairAddress(asset.id, WETH_ADDRESS[chainId], chainId).toLowerCase(),
-  symbol: `UNIV2:ETH-${asset.symbol}`,
-  name: `Uniswap V2: ETH-${asset.symbol}`,
-  isUniswapPair: true,
-});
-
-export const buildEthSushiPair = (asset: RawAsset, chainId: number) => ({
-  id: computeSushiswapPairAddress(
-    asset.id,
-    WETH_ADDRESS[chainId],
-    chainId
-  ).toLowerCase(),
-  symbol: `SUSHI:ETH-${asset.symbol}`,
-  name: `Sushiswap V2: ETH-${asset.symbol}`,
-  isSushiswapPair: true,
-});
-
-export function usePortfolioTokensAndEthPairs(
-  indexPools: NormalizedIndexPool[]
-): RawAsset[] {
-  const chainId = useChainId()
-  const ndxAddress = useNdxAddress()
-  return useMemo(() => {
-    const baseTokens = [
-      ...indexPools.map(({ id, name, symbol }) => ({
-        id: id.toLowerCase(),
-        name,
-        symbol,
-      })),
-      
-    ];
-    if (ndxAddress) {
-      baseTokens.push({
-        id: ndxAddress.toLowerCase(),
-        name: "Indexed",
-        symbol: "NDX",
-      })
-    }
-    const pairTokens = baseTokens.reduce(
-      (arr, asset) => [
-        ...arr,
-        buildEthUniPair(asset, chainId),
-        buildEthSushiPair(asset, chainId),
-      ],
-      [] as RawAsset[]
-    );
-
-    return [...baseTokens, ...pairTokens];
-  }, [indexPools, ndxAddress, chainId]);
-}
-
-function usePriceLookupArgs(indexPools: NormalizedIndexPool[]): PricedAsset[] {
-  const ndxAddress = useNdxAddress()
-  return useMemo(() => {
-    const ids = indexPools.map((p) => p.id.toLowerCase());
-    if (ndxAddress) {
-      ids.push(ndxAddress.toLowerCase())
-    }
-    return ids.reduce(
-      (prev, id) => [
-        ...prev,
-        { id, useEthLpTokenPrice: false },
-        { id, useEthLpTokenPrice: true },
-        { id, useEthLpTokenPrice: true, sushiswap: true },
-      ],
-      [] as PricedAsset[]
-    );
-  }, [indexPools, ndxAddress]);
-}
-
-export function useAllPortfolioData() {
-  // Common
-  const ndxAddress = useNdxAddress()
-  const sushiAddress = useSushiAddress()
-  const allIndexes = useAllPools();
-  const tokenLookup = useTokenLookup();
-  const priceLookupArgs = usePriceLookupArgs(allIndexes);
-  const priceLookup = useTokenPricesLookup(priceLookupArgs);
-  const ndxPrice = priceLookup[ndxAddress?.toLowerCase() ?? ""] ?? 0;
-  const sushiPrice = useToken(sushiAddress)?.priceData?.price ?? 10;
-
-  // Vaults
-  const vaultsTotalValue = useVaultPortfolioTotalValue();
-
-  // Indexes
-  const tokensAndEthPairs = usePortfolioTokensAndEthPairs(allIndexes);
-  const indexIds = useMemo(
-    () =>
-      tokensAndEthPairs
-        .filter(
-          ({ isSushiswapPair, isUniswapPair }) =>
-            !(isSushiswapPair || isUniswapPair)
-        )
-        .map(({ id }) => id),
-    [tokensAndEthPairs]
-  );
-  const balances = useTokenBalances(indexIds);
-  const indexIdLookup = indexIds.reduce((prev, next) => {
-    prev[next] = true;
-    return prev;
-  }, {} as Record<string, true>);
-  const isIndex = (id: string) => Boolean(indexIdLookup[id]);
-
-  // Liquidity
-  const liquidityIds = useMemo(() => {
-    return tokensAndEthPairs
-      .filter(
-        ({ isSushiswapPair, isUniswapPair }) => isSushiswapPair || isUniswapPair
-      )
-      .map(({ id }) => id);
-  }, [tokensAndEthPairs]);
-
-  // -- Basic
-  const assetIds = indexIds.concat(liquidityIds);
-  const stakingPoolsByToken = useStakingPoolsForTokens(assetIds);
-  const stakingInfoLookup = useStakingInfoLookup();
-  const uniswapStakingInfoLookup = useNewStakingInfoLookup(assetIds);
-  const sushiswapStakingInfoLookup = useMasterChefInfoLookup(assetIds);
-
-  // #region Assets
-  let earnedNdx = 0;
-  let earnedSushi = 0;
-
-  const assetData = indexIds
-    .concat(liquidityIds)
-    .map((assetId, index) => {
-      const returnValue = {
-        id: assetId,
-        inWallet: {
-          amount: 0,
-          value: 0,
-          symbol: "",
-        },
-        accrued: {
-          amount: 0,
-          value: 0,
-          symbol: "",
-        },
-        staking: {
-          amount: 0,
-          value: 0,
-          symbol: "",
-        },
-      };
-
-      // -- Common
-      const token = tokenLookup[assetId];
-
-      if (token) {
-        const { symbol, decimals } = token;
-        const price = priceLookup[assetId] ?? 0;
-
-        // -- In Wallet
-        const walletBalance = balances[index] ?? "0";
-        const convertedWalletBalance = convert.toBalanceNumber(
-          walletBalance,
-          decimals
-        );
-        const walletValue = convertedWalletBalance * price;
-
-        returnValue.inWallet.amount = convertedWalletBalance;
-        returnValue.inWallet.value = walletValue;
-        returnValue.inWallet.symbol = symbol;
-
-        // -- Accrued and Staking
-        const associatedStakingPool = stakingPoolsByToken[index];
-        const [
-          associatedStakingUserInfo,
-          associatedUniswapStakingUserInfo,
-          associatedSushiswapStakingUserInfo,
-        ] = [
-          associatedStakingPool
-            ? stakingInfoLookup[associatedStakingPool.id]
-            : undefined,
-          uniswapStakingInfoLookup[assetId.toLowerCase()],
-          sushiswapStakingInfoLookup[assetId.toLowerCase()],
-        ];
-
-        // -- Through us...
-        if (associatedStakingUserInfo) {
-          const amount = convert.toBalanceNumber(
-            associatedStakingUserInfo.earned,
-            decimals
-          );
-
-          earnedNdx += amount;
-
-          returnValue.accrued.amount += amount;
-          returnValue.accrued.symbol = "NDX";
-
-          returnValue.staking.amount += convert.toBalanceNumber(
-            associatedStakingUserInfo.balance,
-            decimals
-          );
-          returnValue.staking.symbol = symbol;
-        }
-
-        // -- Through Uniswap...
-        if (associatedUniswapStakingUserInfo) {
-          const amount = associatedUniswapStakingUserInfo?.rewards ?? 0;
-
-          earnedNdx += amount;
-
-          returnValue.accrued.amount += amount;
-          returnValue.accrued.symbol = "NDX";
-          returnValue.staking.amount +=
-            associatedUniswapStakingUserInfo?.balance ?? 0;
-        }
-
-        // -- Through Sushiswap...
-        if (associatedSushiswapStakingUserInfo) {
-          const amount = associatedSushiswapStakingUserInfo?.rewards ?? 0;
-
-          earnedSushi += amount;
-
-          returnValue.accrued.amount += amount;
-          returnValue.accrued.symbol = "SUSHI";
-          returnValue.staking.amount +=
-            associatedSushiswapStakingUserInfo?.balance ?? 0;
-        }
-
-        // Calculate values.
-        returnValue.staking.value = returnValue.staking.amount * price;
-
-        if (returnValue.accrued.symbol === "NDX") {
-          returnValue.accrued.value = returnValue.accrued.amount * ndxPrice;
-        } else if (returnValue.accrued.symbol === "SUSHI") {
-          returnValue.accrued.value = returnValue.accrued.amount * sushiPrice;
-        }
-
-        return returnValue;
-      } else {
-        return null;
-      }
-    })
-    .filter(Boolean);
-  // #endregion
-
-  // #region Total Value
-  const totalValue = assetData.reduce(
-    (prev, next) => {
-      if (next) {
-        prev.inWallet += next.inWallet.value;
-        prev.accrued += next.accrued.value;
-        prev.staking += next.staking.value;
-      }
-
-      return prev;
-    },
-    {
-      inWallet: vaultsTotalValue,
-      accrued: 0,
-      staking: 0,
-    }
-  );
-  const ecosystemTotalValue =
-    totalValue.inWallet + totalValue.accrued + totalValue.staking;
-  // #endregion
-
-  // #region Governance Token
-  const governanceToken = assetData.find(
-    (each) => each && each.id.toLowerCase() === ndxAddress?.toLowerCase()
-  ) ?? {
-    inWallet: {
-      amount: 0,
-      value: 0,
-    },
-    staking: {
-      amount: 0,
-      value: 0,
-    },
-    accrued: {
-      amount: 0,
-      value: 0,
-    },
-  };
-  // #endregion
-
-  // #region Percentages
-  let indexValue = 0;
-  let liquidityValue = 0;
-  let ndxValue = 0;
-
-  const indexAssets = [];
-  const liquidityAssets = [];
-
-  for (const _asset of assetData) {
-    const asset = _asset!; // We filtered with Boolean before.
-    const isNdx = asset.id.toLowerCase() === ndxAddress?.toLowerCase();
-
-    if (isNdx) {
-      ndxValue += asset.inWallet.value;
-      ndxValue += asset.accrued.value;
-      ndxValue += asset.staking.value;
-    } else if (isIndex(asset.id)) {
-      // Index
-      indexAssets.push(asset);
-
-      indexValue += asset.inWallet.value;
-      indexValue += asset.accrued.value;
-      indexValue += asset.staking.value;
-    } else {
-      // Liquidity
-      liquidityAssets.push(asset);
-
-      liquidityValue += asset.inWallet.value;
-      liquidityValue += asset.accrued.value;
-      liquidityValue += asset.staking.value;
-    }
-  }
-
-  return {
-    totalValue,
-    governanceToken,
-    earnedRewards: {
-      NDX: {
-        amount: earnedNdx,
-        value: convert.toCurrency(earnedNdx * ndxPrice),
-      },
-      SUSHI: {
-        amount: earnedSushi,
-        value: convert.toCurrency(earnedSushi * sushiPrice),
-      },
-    },
-    chart: [
-      {
-        name: "NDX",
-        value: ndxValue / ecosystemTotalValue,
-      },
-      {
-        name: "Vaults",
-        value: vaultsTotalValue / ecosystemTotalValue,
-      },
-      {
-        name: "Indexes",
-        value: indexValue / ecosystemTotalValue,
-      },
-      {
-        name: "Liquidity",
-        value: liquidityValue / ecosystemTotalValue,
-      },
-    ],
-    assets: {
-      indexes: indexAssets,
-      liquidity: liquidityAssets,
-    },
-  };
-}
-
-export function usePortfolioData({
-  onlyOwnedAssets,
-}: {
-  onlyOwnedAssets: boolean;
-}): {
-  tokens: FormattedPortfolioAsset[];
-  ndx: FormattedPortfolioAsset;
-  totalValue: string;
-  totalNdxEarned: string;
-} {
-  const theme = useTheme()
-  const ndxAddress = useNdxAddress() ?? "";
-  const indexPools = useAllPools();
-  const assetsRaw = usePortfolioTokensAndEthPairs(indexPools);
-  const pairIds = useMemo(() => {
-    return assetsRaw
-      .filter((a) => a.isSushiswapPair || a.isUniswapPair)
-      .map((a) => a.id);
-  }, [assetsRaw]);
-
-  const priceLookupArgs = usePriceLookupArgs(indexPools);
-  const priceLookup = useTokenPricesLookup(priceLookupArgs);
-  const pairExistsLookup = usePairExistsLookup(pairIds);
-  const [assets, assetIds] = useMemo(() => {
-    const assets = assetsRaw.filter(
-      (asset) =>
-        pairExistsLookup[asset.id] ||
-        !(asset.isUniswapPair || asset.isSushiswapPair)
-    );
-    const assetIds = assets.map((asset) => asset.id);
-
-    return [assets, assetIds];
-  }, [assetsRaw, pairExistsLookup]);
-
-  const balances = useTokenBalances(assetIds);
-  const stakingPoolsByTokens = useStakingPoolsForTokens(assetIds);
-  const newStakingPoolsByTokens = useNewStakingPoolsForTokens(assetIds);
-  const stakingInfoLookup = useStakingInfoLookup();
-  const masterChefPools = useMasterChefPoolsForTokens(assetIds);
-  const newStakingInfoLookup = useNewStakingInfoLookup(assetIds);
-  const masterChefInfoLookup = useMasterChefInfoLookup(assetIds);
-  const tokenLookup = useTokenLookup();
-
-  return useMemo(() => {
-    let totalNdxEarned = 0;
-    let totalValue = 0;
-
-    const portfolioTokens: FormattedPortfolioAsset[] = assets.map(
-      ({ name, symbol, id, isUniswapPair, isSushiswapPair }, i) => {
-        const stakingPool = stakingPoolsByTokens[i];
-        const newStakingPool = newStakingPoolsByTokens[i];
-        const masterChefPool = masterChefPools[i];
-        const stakingPoolUserInfo = stakingPool
-          ? stakingInfoLookup[stakingPool.id.toLowerCase()]
-          : undefined;
-        const newStakingPoolUserInfo = newStakingInfoLookup[id.toLowerCase()];
-        const masterchefUserInfo = masterChefInfoLookup[id.toLowerCase()];
-        const decimals = tokenLookup[id]?.decimals ?? 18;
-
-        let ndxEarned = 0;
-        let staked = 0;
-        let sushiEarned = 0;
-
-        if (stakingPoolUserInfo) {
-          const earned = convert.toBalanceNumber(
-            stakingPoolUserInfo.earned,
-            decimals
-          );
-          ndxEarned += earned;
-          staked += convert.toBalanceNumber(
-            stakingPoolUserInfo.balance,
-            decimals,
-            6
-          );
-        }
-
-        if (newStakingPoolUserInfo) {
-          ndxEarned += newStakingPoolUserInfo.rewards;
-          staked += newStakingPoolUserInfo.balance;
-        }
-
-        if (masterchefUserInfo) {
-          sushiEarned += masterchefUserInfo.rewards;
-          staked += masterchefUserInfo.balance;
-        }
-
-        totalNdxEarned += ndxEarned;
-        const price = priceLookup[id] ?? 0;
-        const balance = convert.toBalanceNumber(balances[i] ?? "0", decimals);
-        const value = (staked + balance) * price;
-
-        totalValue += value;
-        const link = isUniswapPair
-          ? uniswapInfoPairLink(id.toLowerCase())
-          : isSushiswapPair
-          ? sushiswapInfoPairLink(id.toLowerCase())
-          : id.toLowerCase() === ndxAddress?.toLowerCase()
-          ? uniswapInfoTokenLink(ndxAddress)
-          : `/index-pools/${S(name).slugify().s}`;
-
-        return {
-          address: id,
-          decimals,
-          name,
-          symbol,
-          link,
-          image: symbol,
-          isUniswapPair: Boolean(isUniswapPair),
-          isSushiswapPair: Boolean(isSushiswapPair),
-          hasStakingPool: Boolean(
-            stakingPool || newStakingPool || masterChefPool
-          ),
-          price: price.toFixed(2),
-          balance: balance.toFixed(2),
-          value: value.toFixed(2),
-          weight: "",
-          staking: staked > 0 ? staked.toFixed(2) : "",
-          ndxEarned: ndxEarned.toFixed(2),
-          sushiEarned: sushiEarned.toFixed(2),
-        };
-      }
-    );
-
-    const ndx = portfolioTokens.find(
-      (t) => t.address === ndxAddress.toLowerCase()
-    ) as FormattedPortfolioAsset;
-    if (ndx) {
-      const earnedValue = totalNdxEarned * parseFloat(ndx.price);
-      ndx.value = (parseFloat(ndx.value) + earnedValue).toFixed(2);
-      ndx.image = `indexed-${theme}`;
-      totalValue += earnedValue;
-    }
-    portfolioTokens.sort((a, b) => parseFloat(b.value) - parseFloat(a.value));
-    portfolioTokens.forEach((token) => {
-      token.weight = convert.toPercent(parseFloat(token.value) / totalValue);
-      token.value = convert.toCurrency(parseFloat(token.value));
-    });
-
-    let tokensToUse = portfolioTokens.filter(
-      (t) => t.address !== ndxAddress.toLowerCase()
-    );
-
-    if (onlyOwnedAssets) {
-      tokensToUse = tokensToUse.filter((token) => {
-        const hasBalance = token.balance !== "0.00";
-        const isStaking = token.staking !== "";
-
-        return hasBalance || isStaking;
-      });
-    }
-
-    return {
-      ndx,
-      tokens: tokensToUse,
-      totalValue: convert.toCurrency(totalValue.toFixed(2)),
-      totalNdxEarned: totalNdxEarned.toFixed(2),
-    };
-  }, [
-    assets,
-    balances,
-    stakingInfoLookup,
-    theme,
-    stakingPoolsByTokens,
-    priceLookup,
-    newStakingInfoLookup,
-    tokenLookup,
-    masterChefInfoLookup,
-    masterChefPools,
-    newStakingPoolsByTokens,
-    onlyOwnedAssets,
-    ndxAddress
-  ]);
-}
diff --git a/src/hooks/staking-hooks.ts b/src/hooks/staking-hooks.ts
deleted file mode 100644
index db2aa1ec..00000000
--- a/src/hooks/staking-hooks.ts
+++ /dev/null
@@ -1,225 +0,0 @@
-import { AppState, selectors } from "features";
-import { WETH_ADDRESS } from "config";
-import { convert, sortTokens } from "helpers";
-import { useCallRegistrar } from "./use-call-registrar";
-import { useMemo } from "react";
-import { useNdxAddress, useWethAddress } from "./address-hooks";
-import { useSelector } from "react-redux";
-import {
-  useTokenPrice,
-  useTotalSuppliesWithLoadingIndicator,
-} from "./token-hooks";
-import { useUniswapPairs } from "./pair-hooks";
-import { useUserAddress } from "./user-hooks";
-import type { NormalizedStakingPool } from "features";
-import type { RegisteredCall } from "helpers";
-
-export const useStakingPool = (stakingPoolAddress: string) =>
-  useSelector((state: AppState) =>
-    selectors.selectStakingPool(state, stakingPoolAddress.toLowerCase())
-  );
-
-export const useStakingInfoLookup = () =>
-  useSelector((state: AppState) => selectors.selectStakingInfoLookup(state));
-
-export const useStakingPoolsForTokens = (stakingTokens: string[]) =>
-  useSelector((state: AppState) =>
-    selectors
-      .selectStakingPoolsByStakingTokens(state, stakingTokens)
-      .filter(Boolean)
-  );
-
-export function useStakingTokenPrice(stakingPoolAddress: string) {
-  const wethAddress = useWethAddress()
-  const stakingPool = useStakingPool(stakingPoolAddress);
-  const [supplyTokens, _pairs] = useMemo(() => {
-    if (!stakingPool?.isWethPair) {
-      return [[], []];
-    }
-    const [token0, token1] = sortTokens(
-      stakingPool.indexPool,
-      wethAddress
-    );
-    return [
-      [stakingPool.stakingToken.toLowerCase()],
-      [
-        {
-          id: stakingPool.stakingToken.toLowerCase(),
-          token0,
-          token1,
-          exists: true,
-        },
-      ],
-    ];
-  }, [
-    stakingPool?.isWethPair,
-    stakingPool?.stakingToken,
-    stakingPool?.indexPool,
-    wethAddress,
-  ]);
-  const [supplies, suppliesLoading] =
-    useTotalSuppliesWithLoadingIndicator(supplyTokens);
-  const [pairs, pairsLoading] = useUniswapPairs(_pairs);
-  const [tokenPrice, tokenPriceLoading] = useTokenPrice(
-    stakingPool?.indexPool ?? ""
-  );
-  const hasLoaded = useMemo(() => {
-    if (!stakingPool) return false;
-    if (stakingPool!.isWethPair) {
-      return !(pairsLoading || suppliesLoading || tokenPriceLoading);
-    }
-    return !tokenPriceLoading;
-  }, [stakingPool, pairsLoading, suppliesLoading, tokenPriceLoading]);
-
-  return useMemo(() => {
-    if (hasLoaded) {
-      if (stakingPool!.isWethPair) {
-        const [pair] = pairs || [];
-        const [supply] = supplies || [];
-        const firstTokenIsStakingPool =
-          pair.token0.address.toLowerCase() ===
-          stakingPool!.indexPool.toLowerCase();
-        const tokenReserve = firstTokenIsStakingPool
-          ? pair.reserve0
-          : pair.reserve1;
-        const valueOfSupplyInToken = parseFloat(tokenReserve.toExact()) * 2;
-        const tokensPerLpToken =
-          valueOfSupplyInToken /
-          parseFloat(convert.toBalance(supply, 18, false));
-        return tokensPerLpToken * (tokenPrice as number);
-      } else {
-        return tokenPrice;
-      }
-    } else {
-      return null;
-    }
-  }, [hasLoaded, pairs, stakingPool, supplies, tokenPrice]);
-}
-
-export function useStakingApy(stakingPoolAddress: string) {
-  const ndxAddress = useNdxAddress()
-  const stakingPool = useStakingPool(stakingPoolAddress);
-  const [ndxPrice] = useTokenPrice(ndxAddress);
-  const tokenPrice = useStakingTokenPrice(stakingPoolAddress);
-
-  return useMemo(() => {
-    const hasLoaded = ndxPrice && tokenPrice && stakingPool;
-    const isWethAddress = stakingPoolAddress === WETH_ADDRESS;
-
-    if (!isWethAddress && hasLoaded) {
-      const isExpired = stakingPool!.periodFinish < Date.now() / 1000;
-
-      if (isExpired) {
-        return "Expired";
-      } else {
-        const ndxMinedPerDay = convert
-          .toBigNumber(stakingPool?.rewardRate ?? "0")
-          .times(86400);
-        const valueNdxPerYear = parseFloat(
-          convert.toBalance(
-            ndxMinedPerDay.times(365).times(ndxPrice ?? 0),
-            18,
-            false
-          )
-        );
-        const stakedAmount = parseFloat(
-          convert.toBalance(stakingPool?.totalSupply ?? "0", 18)
-        );
-        const totalStakedValue = stakedAmount * (tokenPrice ?? 0);
-        return convert.toPercent(valueNdxPerYear / totalStakedValue);
-      }
-    } else {
-      return null;
-    }
-  }, [tokenPrice, ndxPrice, stakingPool, stakingPoolAddress]);
-}
-
-export function createStakingCalls(
-  stakingPool: string,
-  userAddress?: string
-): {
-  onChainCalls: RegisteredCall[];
-  offChainCalls: RegisteredCall[];
-} {
-  const onChainCalls: RegisteredCall[] = [
-    {
-      interfaceKind: "StakingRewards",
-      target: stakingPool,
-      function: "rewardsDuration",
-    },
-    {
-      interfaceKind: "StakingRewards",
-      target: stakingPool,
-      function: "periodFinish",
-    },
-    {
-      interfaceKind: "StakingRewards",
-      target: stakingPool,
-      function: "rewardRate",
-    },
-    {
-      interfaceKind: "StakingRewards",
-      target: stakingPool,
-      function: "rewardPerToken",
-    },
-    {
-      interfaceKind: "StakingRewards",
-      target: stakingPool,
-      function: "totalSupply",
-    },
-  ];
-
-  if (userAddress) {
-    onChainCalls.push(
-      {
-        interfaceKind: "StakingRewards",
-        target: stakingPool,
-        function: "balanceOf",
-        args: [userAddress],
-      },
-      {
-        interfaceKind: "StakingRewards",
-        target: stakingPool,
-        function: "earned",
-        args: [userAddress],
-      }
-    );
-  }
-
-  return {
-    onChainCalls,
-    offChainCalls: [],
-  };
-}
-
-export const STAKING_CALLER = "Staking";
-
-export function useStakingRegistrar() {
-  const userAddress = useUserAddress();
-  const stakingPools: NormalizedStakingPool[] = useSelector(
-    selectors.selectAllStakingPools
-  );
-  const { onChainCalls, offChainCalls } = stakingPools.reduce(
-    (prev, next) => {
-      const poolCalls = createStakingCalls(next.id, userAddress);
-
-      prev.onChainCalls.push(...poolCalls.onChainCalls);
-      prev.offChainCalls.push(...poolCalls.offChainCalls);
-
-      return prev;
-    },
-    {
-      onChainCalls: [],
-      offChainCalls: [],
-    } as {
-      onChainCalls: RegisteredCall[];
-      offChainCalls: RegisteredCall[];
-    }
-  );
-
-  useCallRegistrar({
-    caller: STAKING_CALLER,
-    onChainCalls,
-    offChainCalls,
-  });
-}
diff --git a/src/hooks/token-hooks.ts b/src/hooks/token-hooks.ts
index a5025b1b..f70432e7 100644
--- a/src/hooks/token-hooks.ts
+++ b/src/hooks/token-hooks.ts
@@ -14,7 +14,7 @@ import { constants } from "ethers";
 import { useAddTransactionCallback } from "./transaction-hooks";
 import { useCachedValue } from "./use-debounce";
 import { useCallRegistrar } from "./use-call-registrar";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo } from "react";
 import { useChainId } from "./settings-hooks";
 import { usePair, useUniswapPairs } from "./pair-hooks";
 import { useSelector } from "react-redux";
diff --git a/src/hooks/transaction-hooks.ts b/src/hooks/transaction-hooks.ts
index b1b044fe..e36f006f 100644
--- a/src/hooks/transaction-hooks.ts
+++ b/src/hooks/transaction-hooks.ts
@@ -9,8 +9,6 @@ import { useDispatch } from "react-redux";
 import {
   useIndexPoolContract,
   useIndexedNarwhalRouterContract,
-  useNirnVaultContract,
-  useStakingRewardsContract,
   useTokenContract,
 } from "./contract-hooks";
 import { usePoolSymbol } from "./pool-hooks";
@@ -287,14 +285,14 @@ export function useRoutedMintTransactionCallbacks(indexPool: string) {
           intermediaries,
           convert.toHex(poolAmountOut),
           { value: convert.toHex(amountInMax) }
-        ) 
+        );
       } else {
         console.log({
           indexPool,
           intermediaries,
           poolAmountOut: convert.toHex(poolAmountOut),
           tokenIn,
-          amountInMax: convert.toHex(amountInMax)
+          amountInMax: convert.toHex(amountInMax),
         });
         tx = contract.swapTokensForAllTokensAndMintExact(
           indexPool,
@@ -302,9 +300,9 @@ export function useRoutedMintTransactionCallbacks(indexPool: string) {
           convert.toHex(poolAmountOut),
           tokenIn,
           convert.toHex(amountInMax)
-        )
+        );
       }
-/*       const tx = fn === 'swapETHForAllTokensAndMintExact'
+      /*       const tx = fn === 'swapETHForAllTokensAndMintExact'
         // eslint-disable-next-line prefer-spread
         ? contract.swapETHForAllTokensAndMintExact.apply(contract, args as Parameters<IndexedNarwhalRouter['swapETHForAllTokensAndMintExact']>)
         // eslint-disable-next-line prefer-spread
@@ -315,9 +313,13 @@ export function useRoutedMintTransactionCallbacks(indexPool: string) {
       addTransaction(tx, { summary });
     },
     [contract, poolSymbol, addTransaction, indexPool]
-  )
+  );
 
-  return { mintExactAmountIn, mintSingleExactAmountOut, mintMultiExactAmountOut };
+  return {
+    mintExactAmountIn,
+    mintSingleExactAmountOut,
+    mintMultiExactAmountOut,
+  };
 }
 
 interface RoutedBurnTransactionCallbacks {
@@ -490,89 +492,3 @@ export function useBurnMultiTransactionCallback(poolAddress: string) {
     [contract, addTransaction]
   );
 }
-export interface StakingTransactionCallbacks {
-  stake: (amount: string) => void;
-  withdraw: (amount: string) => void;
-  exit: () => void;
-  claim: () => void;
-}
-
-export function useStakingTransactionCallbacks(
-  stakingPool: string
-): StakingTransactionCallbacks {
-  const contract = useStakingRewardsContract(stakingPool);
-  const addTransaction = useAddTransactionCallback();
-
-  const stake = useCallback(
-    (amount: string) => {
-      // @todo Figure out a better way to handle this
-      if (!contract) throw new Error();
-      const tx = contract.stake(amount);
-      addTransaction(tx);
-    },
-    [contract, addTransaction]
-  );
-
-  const withdraw = useCallback(
-    (amount: string) => {
-      // @todo Figure out a better way to handle this
-      if (!contract) throw new Error();
-      const tx = contract.withdraw(amount);
-      addTransaction(tx);
-    },
-    [contract, addTransaction]
-  );
-
-  const exit = useCallback(() => {
-    // @todo Figure out a better way to handle this
-    if (!contract) throw new Error();
-    const tx = contract.exit();
-    addTransaction(tx);
-  }, [contract, addTransaction]);
-
-  const claim = useCallback(() => {
-    // @todo Figure out a better way to handle this
-    if (!contract) throw new Error();
-    const tx = contract.getReward();
-    addTransaction(tx);
-  }, [contract, addTransaction]);
-
-  return {
-    stake,
-    exit,
-    withdraw,
-    claim,
-  };
-}
-
-export function useNirnTransactionCallbacks(vault: string) {
-  const contract = useNirnVaultContract(vault);
-  const addTransaction = useAddTransactionCallback();
-
-  const deposit = useCallback((amount: string) => {
-    // @todo Figure out a better way to handle this
-    if (!contract) throw new Error();
-    const tx = contract.deposit(amount);
-    addTransaction(tx);
-  }, [contract, addTransaction])
-
-  const withdraw = useCallback((amount: string) => {
-    // @todo Figure out a better way to handle this
-    if (!contract) throw new Error();
-    const tx = contract.withdraw(amount);
-    addTransaction(tx);
-  }, [contract, addTransaction])
-
-  const withdrawUnderlying = useCallback((amount: string) => {
-    // @todo Figure out a better way to handle this
-    if (!contract) throw new Error();
-    const tx = contract.withdrawUnderlying(amount);
-    addTransaction(tx);
-  }, [contract, addTransaction])
-
-  return {
-    deposit,
-    withdraw,
-    withdrawUnderlying
-  }
-}
\ No newline at end of file
diff --git a/src/hooks/use-debounce.ts b/src/hooks/use-debounce.ts
index 4b96f9bd..b8909295 100644
--- a/src/hooks/use-debounce.ts
+++ b/src/hooks/use-debounce.ts
@@ -1,5 +1,5 @@
 import { isEqual } from 'lodash'
-import { useEffect, useRef, useState } from 'react'
+import { useEffect, useRef } from 'react'
 
 // modified from https://usehooks.com/useDebounce/
 export function useDebounce<T>(value: T, delay: number): T {
@@ -35,4 +35,4 @@ export function useCachedValue<T>(value: T): T {
     }
   }, [value])
   return valueRef.current;
-}
\ No newline at end of file
+}
diff --git a/src/hooks/vault-hooks.ts b/src/hooks/vault-hooks.ts
deleted file mode 100644
index 83371438..00000000
--- a/src/hooks/vault-hooks.ts
+++ /dev/null
@@ -1,370 +0,0 @@
-import {
-  AppState,
-  NormalizedTokenAdapter,
-  NormalizedVault,
-  VAULTS_CALLER,
-  selectors,
-} from "features";
-import { BigNumber, RegisteredCall, convert } from "helpers";
-import {
-  useBalancesAndApprovalsRegistrar,
-  useTokenBalance,
-  useTokenBalances,
-} from "./user-hooks";
-import { useCachedValue } from "./use-debounce";
-import { useCallRegistrar } from "./use-call-registrar";
-import { useMemo } from "react";
-import { useSelector } from "react-redux";
-import { useTokenPrices, useTokenPricesLessStrict } from "./token-hooks";
-
-export interface FormattedVault extends NormalizedVault {
-  underlyingPrice?: number;
-  usdValue?: string;
-}
-
-export function useVaultsCount(): number {
-  const vaults = useSelector(selectors.selectAllVaults);
-  return vaults.length;
-}
-
-export function useAllVaults(): FormattedVault[] {
-  const vaults = useSelector(selectors.selectAprSortedVaults);
-  const underlyings = vaults.map((v) => v.underlying.id);
-  const prices = useTokenPricesLessStrict(underlyings);
-  return useMemo(() => {
-    return vaults.map((vault, i): FormattedVault => {
-      const price = prices[i];
-      const balance = convert.toBalanceNumber(
-        vault.totalValue ?? "0",
-        vault.decimals
-      );
-      return {
-        ...vault,
-        underlyingPrice: price,
-        usdValue: convert.toComma(+(balance * price).toFixed(2)),
-      };
-    });
-  }, [vaults, prices]);
-}
-
-export function useVaultAPR(id: string) {
-  return useSelector((state: AppState) => selectors.selectVaultAPR(state, id));
-}
-
-export function useVaultAdapterAPRs(
-  id: string
-): { name: string; apr: number; baseAPR: number }[] {
-  const vault = useVault(id);
-  const reserveRatio = vault?.reserveRatio ?? 0;
-  const getNameAndAPR = (adapter: NormalizedTokenAdapter, weight: number) => {
-    const name = adapter.protocol.name;
-    let apr = 0;
-    let baseAPR = 0;
-    if (adapter.revenueAPRs) {
-      baseAPR = adapter.revenueAPRs.reduce(
-        (t, n) => t + convert.toBalanceNumber(n),
-        0
-      );
-      apr = baseAPR * weight * (1 - reserveRatio);
-    }
-    return { name, apr, baseAPR };
-  };
-  return (
-    vault?.adapters.reduce(
-      (prev, next, i) => [...prev, getNameAndAPR(next, vault.weights[i])],
-      [] as { name: string; apr: number; baseAPR: number }[]
-    ) ?? []
-  );
-}
-
-export function useVault(id: string): FormattedVault | null {
-  const vault = useSelector((state: AppState) =>
-    selectors.selectVault(state, id)
-  );
-  const tokenIds = useMemo(() => vault ? [vault.underlying.id] : [], [vault]);
-  const cachedIds = useCachedValue(tokenIds)
-  const [prices, loading] = useTokenPrices(cachedIds);
-
-  return useMemo(() => {
-    if (loading || !vault) return vault;
-
-    const price = (prices as number[])[0];
-    const balance = convert.toBalanceNumber(
-      vault.totalValue ?? "0",
-      vault.decimals
-    );
-    return {
-      ...vault,
-      underlyingPrice: price,
-      usdValue: convert.toComma(+(balance * price).toFixed(2)),
-    };
-  }, [vault, prices, loading]);
-}
-
-export function useAllVaultsUserBalance(): Record<string, VaultBalanceEntries> {
-  const vaults = useAllVaults();
-  const lookup = useSelector((state: AppState) =>
-    selectors.selectVaultLookup(state)
-  );
-  const vaultIds = vaults.map((vault) => vault.id);
-  const vaultUnderlyingIds = vaults.map((vault) => vault.underlying.id);
-  const vaultTokenBalances = useTokenBalances(vaultIds);
-  const vaultUnderlyingBalances = useTokenBalances(vaultUnderlyingIds);
-  const vaultUnderlyingPrices = useTokenPricesLessStrict(vaultUnderlyingIds);
-
-  useBalancesAndApprovalsRegistrar(vaultIds, vaultUnderlyingIds);
-
-  return vaultIds
-    .map((vaultId, index) => {
-      const vault = lookup[vaultId];
-
-      if (vault) {
-        const underlyingBalance = convert.toBigNumber(
-          vaultUnderlyingBalances[index]
-        );
-        const wrappedBalance = convert.toBigNumber(vaultTokenBalances[index]);
-        const unwrappedBalance = wrappedBalance
-          .times(convert.toBigNumber(vault.price ?? "0"))
-          .div(convert.toToken("1", 18));
-        const usdValue = convert.toBalance(
-          unwrappedBalance.times(vaultUnderlyingPrices![index] ?? 0),
-          vault.decimals,
-          true,
-          2
-        );
-
-        return {
-          id: vaultId,
-          balance: {
-            exact: underlyingBalance,
-            displayed: convert.toBalance(
-              underlyingBalance,
-              vault.underlying.decimals,
-              false,
-              10
-            ),
-          },
-          wrappedBalance: {
-            exact: wrappedBalance,
-            displayed: convert.toBalance(
-              wrappedBalance,
-              vault.underlying.decimals,
-              false,
-              10
-            ),
-          },
-          unwrappedBalance: {
-            exact: unwrappedBalance,
-            displayed: convert.toBalance(
-              unwrappedBalance,
-              vault.underlying.decimals,
-              false,
-              10
-            ),
-          },
-          usdValue,
-        };
-      } else {
-        return null;
-      }
-    })
-    .filter(Boolean)
-    .reduce((prev, next) => {
-      if (next) {
-        prev[next.id] = next;
-      }
-
-      return prev;
-    }, {} as Record<string, VaultBalanceEntries>);
-}
-
-export function useVaultUserBalance(id: string) {
-  const balances = useAllVaultsUserBalance();
-
-  return balances[id];
-}
-
-export function useVaultPortfolioTotalValue() {
-  const userBalances = useAllVaultsUserBalance();
-
-  return Object.values(userBalances).reduce((prev, next) => {
-    prev += parseFloat(next.usdValue.replace(/,/g, ""));
-
-    return prev;
-  }, 0);
-}
-
-export function useVaultInterestForUser(id: string) {
-  const vault = useVault(id);
-  const userBalance = useTokenBalance(id);
-  return useMemo(() => {
-    if (!vault || !userBalance || !vault.averagePricePerShare) return 0;
-    const currentPrice = convert.toBalanceNumber(vault.price ?? "0", 18, 10);
-    const formattedBalance = convert.toBalanceNumber(
-      userBalance,
-      vault.decimals,
-      10
-    );
-    const currentValue = formattedBalance * currentPrice;
-    const paidValue = formattedBalance * vault.averagePricePerShare;
-    return currentValue - paidValue;
-  }, [vault, userBalance]);
-}
-
-export function useVaultTvl(id: string) {
-  const vault = useVault(id);
-
-  if (vault) {
-    // return vault.;
-    return "";
-  } else {
-    return null;
-  }
-}
-
-export function useVaultTokens(id: string) {
-  const vault = useVault(id);
-
-  if (vault) {
-    // vault.adapters
-  } else {
-    return null;
-  }
-}
-
-export function createVaultCalls(
-  id: string,
-  adapterIds: string[],
-  underlying: string
-) {
-  const target = id;
-  const interfaceKind = "NirnVault";
-  const baseCalls: RegisteredCall[] = [
-    {
-      interfaceKind,
-      target,
-      function: "balance",
-    },
-    {
-      interfaceKind,
-      target,
-      function: "getPricePerFullShareWithFee",
-    },
-    {
-      interfaceKind: "IERC20",
-      target,
-      function: "totalSupply",
-    },
-    {
-      interfaceKind,
-      target,
-      function: "getBalances",
-    },
-    {
-      interfaceKind,
-      target,
-      function: "reserveBalance",
-    },
-  ];
-  const adapterCalls = adapterIds.reduce((prev, next) => {
-    prev.push({
-      interfaceKind: "Erc20Adapter",
-      target: next,
-      function: "getRevenueBreakdown",
-    });
-
-    prev.push();
-
-    return prev;
-  }, [] as RegisteredCall[]);
-
-  // TheGraph calls go here as off-chain calls.
-  return {
-    onChainCalls: [...baseCalls, ...adapterCalls],
-    offChainCalls: [
-      {
-        target: "",
-        function: "fetchTokenPriceData",
-        args: [underlying],
-        canBeMerged: true,
-      },
-      {
-        target: "",
-        function: "fetchVaultsData",
-        args: [],
-        canBeMerged: true,
-      },
-    ],
-  };
-}
-
-export function useVaultRegistrar(id: string) {
-  const vault = useVault(id);
-  const caller = VAULTS_CALLER;
-  const { onChainCalls, offChainCalls } = useMemo(
-    () =>
-      id
-        ? createVaultCalls(
-            id,
-            vault!.adapters.map((each) => each.id),
-            vault?.underlying.id ?? ""
-          )
-        : {
-            onChainCalls: [],
-            offChainCalls: [],
-          },
-    [id, vault]
-  );
-
-  useCallRegistrar({
-    caller,
-    onChainCalls,
-    offChainCalls,
-  });
-}
-
-export function useAllVaultsRegistrar() {
-  const vaults = useAllVaults();
-  const caller = VAULTS_CALLER;
-  const { onChainCalls, offChainCalls } = useMemo(
-    () =>
-      vaults.reduce(
-        (prev, next) => {
-          const { onChainCalls, offChainCalls } = createVaultCalls(
-            next.id,
-            next.adapters.map((a) => a.id),
-            next.underlying.id ?? ""
-          );
-          prev.onChainCalls.push(...onChainCalls);
-          prev.offChainCalls.push(...offChainCalls);
-          return prev;
-        },
-        {
-          onChainCalls: [] as RegisteredCall[],
-          offChainCalls: [] as RegisteredCall[],
-        }
-      ),
-    [vaults]
-  );
-
-  useCallRegistrar({
-    caller,
-    onChainCalls,
-    offChainCalls,
-  });
-}
-
-// Types
-
-type BalanceEntry = {
-  exact: BigNumber;
-  displayed: string;
-};
-
-type VaultBalanceEntries = {
-  id: string;
-  balance: BalanceEntry;
-  wrappedBalance: BalanceEntry;
-  unwrappedBalance: BalanceEntry;
-  usdValue: string;
-};
diff --git a/src/routes.ts b/src/routes.ts
index abf0fc89..5bdc83d6 100644
--- a/src/routes.ts
+++ b/src/routes.ts
@@ -6,21 +6,10 @@ import { lazy } from "react";
 type RouteWithBreadcrumbs = RouteProps & { breadcrumbName?: TranslatedTerm };
 
 const Splash = lazy(() => import("./components/routes/Splash"));
-const Portfolio = lazy(() => import("./components/routes/Portfolio"));
-const Staking = lazy(() => import("./components/routes/Staking"));
-const Stake = lazy(() => import("./components/routes/Stake"));
 const Learn = lazy(() => import("./components/routes/Learn"));
 const LearnArticle = lazy(() => import("./components/routes/LearnArticle"));
-const UniswapStakeForm = lazy(
-  () => import("./components/routes/UniswapStakeForm")
-);
-const SushiswapStakeForm = lazy(
-  () => import("./components/routes/SushiswapStakeForm")
-);
 const IndexPools = lazy(() => import("./components/routes/IndexPools"));
 const IndexPool = lazy(() => import("./components/routes/IndexPool"));
-const Vaults = lazy(() => import("./components/routes/Vaults"));
-const Vault = lazy(() => import("./components/routes/Vault"));
 const Timelocks = lazy(() => import("./components/routes/Timelocks"));
 const CreateTimelock = lazy(() => import("./components/routes/CreateTimelock"));
 const TimelockWithdrawal = lazy(
@@ -33,33 +22,6 @@ export const routes: RouteWithBreadcrumbs[] = [
     exact: true,
     component: Splash,
   },
-  {
-    path: "/portfolio",
-    breadcrumbName: "PORTFOLIO",
-    exact: true,
-    component: Portfolio,
-  },
-  {
-    path: "/staking",
-    breadcrumbName: "STAKE",
-    exact: true,
-    component: Staking,
-  },
-  {
-    path: "/staking/:id",
-    exact: true,
-    component: Stake,
-  },
-  {
-    path: "/staking-new/:id",
-    exact: true,
-    component: UniswapStakeForm,
-  },
-  {
-    path: "/stake-sushi/:id",
-    exact: true,
-    component: SushiswapStakeForm,
-  },
   {
     path: "/index-pools",
     breadcrumbName: "INDEX_POOLS",
@@ -86,16 +48,6 @@ export const routes: RouteWithBreadcrumbs[] = [
     exact: true,
     component: IndexPool,
   },
-  {
-    path: "/vaults",
-    exact: true,
-    component: Vaults,
-  },
-  {
-    path: "/vaults/:slug",
-    exact: true,
-    component: Vault,
-  },
   {
     path: "/timelocks",
     exact: true,
diff --git a/src/sockets/server/state-handling.ts b/src/sockets/server/state-handling.ts
index 7780a63d..3c3ed150 100644
--- a/src/sockets/server/state-handling.ts
+++ b/src/sockets/server/state-handling.ts
@@ -1,18 +1,13 @@
-import { AppState, VAULTS_CALLER, actions, fetchVaultsData, selectors, store } from "features";
-import { MASTER_CHEF_ADDRESS, NETWORKS } from "config";
+import { AppState, actions, selectors, store } from "features";
+import { NETWORKS } from "config";
 import {
   TOKEN_PRICES_CALLER,
   buildUniswapPairs,
   createPairDataCalls,
   createPoolDetailCalls,
-  createStakingCalls,
   createTotalSuppliesCalls,
-  createVaultCalls,
 } from "hooks";
-import { createMasterChefCalls } from "hooks/masterchef-hooks";
-import { createNewStakingCalls } from "hooks/new-staking-hooks";
 import { getProvider, log, readState, writeState } from "./helpers";
-import { masterChefCaller } from "features/masterChef";
 import type { RegisteredCall, RegisteredCaller } from "helpers";
 import type { Unsubscribe } from "redux";
 
@@ -29,15 +24,13 @@ const getLastBlockNumber = () => {
     return lastState.batcher.blockNumber;
   }
   return -1;
-}
+};
 
 let lastBlockNumber = getLastBlockNumber();
 
 const poolsRegistered: Record<string, boolean> = {};
 const tokensRegistered: Record<string, boolean> = {};
 const pairsRegistered: Record<string, boolean> = {};
-const stakingPoolsRegistered: Record<string, boolean> = {};
-const vaultsRegistered: Record<string, string> = {}
 
 const NEW_SUBSCRIBER_DELAY_SECONDS = 15;
 const WRITE_STATE_INTERVAL = 5000;
@@ -50,17 +43,13 @@ function setSubscription() {
   unsubscribe = subscribe(() => {
     const state = getState();
     const indexPools = selectors.selectAllPools(state);
-    const stakingPools = selectors.selectAllStakingPools(state);
     const tokens = selectors.selectAllTokens(state);
-    const vaults = selectors.selectAllVaults(state)
 
-    if (indexPools.length > 0 && tokens.length > 0 && stakingPools.length > 0 && vaults.length > 0) {
+    if (indexPools.length > 0 && tokens.length > 0) {
       unsubscribe();
       const allCalls = [
         ...registerNewPools(),
         ...registerNewTokensAndPairs(),
-        ...registerNewStakingPools(),
-        ...registerNewVaults()
       ].filter((c) => c.offChainCalls.length > 0 || c.onChainCalls.length > 0);
       if (allCalls.length > 0) {
         dispatch(actions.callsRegistered(allCalls));
@@ -105,39 +94,16 @@ export async function setupStateHandling() {
       withSigner: false,
     })
   );
-  dispatch(
-    fetchVaultsData({
-      provider
-    })
-  )
-}
-
-function registerNewVaults() {
-  const state = getState();
-  const vaults = selectors.selectAllVaults(state);
-  const caller = VAULTS_CALLER;
-  const { vaultCalls } = vaults.reduce((prev, next) => {
-    const { onChainCalls, offChainCalls } = createVaultCalls(next.id, next.adapters.map(a => a.id), next.underlying.id);
-    prev.vaultCalls.onChainCalls.push(...onChainCalls)
-    prev.vaultCalls.offChainCalls.push(...offChainCalls)
-    return prev;
-  }, {
-    vaultCalls: {
-      chainId,
-      caller,
-      onChainCalls: [] as RegisteredCall[],
-      offChainCalls: [] as RegisteredCall[],
-    }
-  })
-  return [vaultCalls]
 }
 
 const BLOCKS_PER_DAY = 86400 / 13.5;
 
 function registerNewTokensAndPairs() {
   const state = getState();
-  const chainId = selectors.selectNetwork(state)
-  const allTokens = selectors.selectAllTokens(state).filter(t => t.chainId === chainId);
+  const chainId = selectors.selectNetwork(state);
+  const allTokens = selectors
+    .selectAllTokens(state)
+    .filter((t) => t.chainId === chainId);
   const allPairIds = Object.keys(state.pairs.entities).map((id) =>
     id.toLowerCase()
   );
@@ -154,7 +120,8 @@ function registerNewTokensAndPairs() {
     (pair) => !pairsRegistered[pair.id.toLowerCase()]
   );
 
-  if (chainId !== undefined) dispatch(actions.uniswapPairsRegistered({ pairs, chainId }));
+  if (chainId !== undefined)
+    dispatch(actions.uniswapPairsRegistered({ pairs, chainId }));
   const pairDataCalls = {
     caller: "Pair Data",
     chainId,
@@ -224,114 +191,10 @@ function registerNewPools() {
   return [poolDetailCalls];
 }
 
-function registerNewStakingPools() {
-  const state = getState();
-  const stakingPools = selectors
-    .selectAllStakingPools(state)
-    .filter((pool) => !stakingPoolsRegistered[pool.id.toLowerCase()]);
-  const newStakingPools = selectors
-    .selectAllNewStakingPools(state)
-    .filter((pool) => !stakingPoolsRegistered[pool.id.toLowerCase()]);
-  const masterChefPairs = selectors
-    .selectMasterChefPoolsWithRecognizedPairs(state)
-    .filter((pool) => !stakingPoolsRegistered[`MC-${pool.id}`.toLowerCase()]);
-  const newStakingMeta = selectors.selectNewStakingMeta(state);
-  const calls: RegisteredCaller[] = [];
-  const chainId = state.settings.network;
-  const masterChefAddress = MASTER_CHEF_ADDRESS[chainId]
-  if (newStakingPools.length > 0) {
-    const fromBlock = newStakingPools.sort(
-      (a, b) => b.lastRewardBlock - a.lastRewardBlock
-    )[0].lastRewardBlock;
-    const newStakingCalls = newStakingPools.reduce(
-      (prev, next) => {
-        const { id, token } = next;
-        const newStakingCalls = createNewStakingCalls(
-          newStakingMeta.id,
-          id,
-          token
-        );
-        prev.onChainCalls.push(...newStakingCalls.offChainCalls);
-        prev.offChainCalls.push(...newStakingCalls.offChainCalls);
-        return prev;
-      },
-      {
-        caller: "NewStaking",
-        chainId,
-        onChainCalls: [
-          {
-            target: newStakingMeta.rewardsSchedule,
-            function: "getRewardsForBlockRange",
-            interfaceKind: "RewardsSchedule",
-            args: [
-              fromBlock.toString(),
-              Math.floor(fromBlock + BLOCKS_PER_DAY).toString(),
-            ],
-          },
-        ],
-        offChainCalls: [],
-      } as RegisteredCaller
-    );
-    calls.push(newStakingCalls);
-
-    newStakingPools.forEach((pool) => {
-      stakingPoolsRegistered[pool.id.toLowerCase()] = true;
-    });
-  }
-  if (stakingPools.length > 0) {
-    const stakingCalls = stakingPools.reduce(
-      (prev, next) => {
-        const { id, stakingToken } = next;
-        const stakingCalls = createStakingCalls(id, stakingToken);
-
-        prev.onChainCalls.push(...stakingCalls.onChainCalls);
-
-        return prev;
-      },
-      {
-        caller: "Staking",
-        chainId,
-        onChainCalls: [],
-        offChainCalls: [],
-      } as RegisteredCaller
-    );
-    stakingPools.forEach((pool) => {
-      stakingPoolsRegistered[pool.id.toLowerCase()] = true;
-    });
-    calls.push(stakingCalls);
-  }
-  if (masterChefPairs.length > 0 && masterChefAddress) {
-    const mcCalls = masterChefPairs.reduce(
-      (prev, next) => {
-        const poolCalls = createMasterChefCalls(chainId, next.id, next.token);
-        prev.onChainCalls.push(...poolCalls);
-        return prev;
-      },
-      {
-        caller: masterChefCaller,
-        chainId,
-        onChainCalls: [
-          {
-            interfaceKind: "MasterChef",
-            target: masterChefAddress,
-            function: "totalAllocPoint",
-          },
-        ],
-        offChainCalls: [],
-      } as RegisteredCaller
-    );
-    masterChefPairs.forEach((pool) => {
-      stakingPoolsRegistered[`MC-${pool.id}`.toLowerCase()] = true;
-    });
-    calls.push(mcCalls);
-  }
-  return calls;
-}
-
 setupStateHandling();
 
-process.on('SIGTERM', () => {
-  console.info('SIGTERM signal received.');
+process.on("SIGTERM", () => {
+  console.info("SIGTERM signal received.");
   console.log(`Killing ${network} state updater...`);
-  process.exit(0)
-})
\ No newline at end of file
+  process.exit(0);
+});
diff --git a/yarn.lock b/yarn.lock
index f2764c23..95f39786 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -57,7 +57,7 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.5.5":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
   integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
@@ -91,7 +91,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.16", "@babel/core@^7.12.3", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
+"@babel/core@^7.1.0", "@babel/core@^7.12.16", "@babel/core@^7.12.3", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
   version "7.14.2"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.2.tgz#54e45334ffc0172048e5c93ded36461d3ad4c417"
   integrity sha512-OgC1mON+l4U4B4wiohJlQNUU3H73mpTyYY3j/c8U9dr9UagGGSm+WFpzjy/YLdoyjiG++c1kIDgxCo/mLwQJeQ==
@@ -112,7 +112,7 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.1", "@babel/generator@^7.12.11", "@babel/generator@^7.12.13", "@babel/generator@^7.14.2":
+"@babel/generator@^7.12.1", "@babel/generator@^7.12.13", "@babel/generator@^7.14.2":
   version "7.14.2"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.2.tgz#d5773e8b557d421fd6ce0d5efa5fd7fc22567c30"
   integrity sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==
@@ -146,7 +146,7 @@
     browserslist "^4.14.5"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0", "@babel/helper-create-class-features-plugin@^7.14.2":
+"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0":
   version "7.14.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.2.tgz#4e455b0329af29c2d3ad254b5dd5aed34595385d"
   integrity sha512-6YctwVsmlkchxfGUogvVrrhzyD3grFJyluj5JgDlQrwfMLJSt5tdAzFZfPf4H2Xoi5YLcQ6BxfJlaOBHuctyIw==
@@ -166,20 +166,6 @@
     "@babel/helper-annotate-as-pure" "^7.12.13"
     regexpu-core "^4.7.1"
 
-"@babel/helper-define-polyfill-provider@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz#3c2f91b7971b9fc11fe779c945c014065dea340e"
-  integrity sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.13.0"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/traverse" "^7.13.0"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-    semver "^6.1.2"
-
 "@babel/helper-define-polyfill-provider@^0.2.0":
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz#a640051772045fedaaecc6f0c6c69f02bdd34bf1"
@@ -404,15 +390,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-decorators" "^7.12.1"
 
-"@babel/plugin-proposal-decorators@^7.12.12":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.14.2.tgz#e68c3c5e4a6a08834456568256fc3e71b93590cf"
-  integrity sha512-LauAqDd/VjQDtae58QgBcEOE42NNP+jB2OE+XeC3KBI/E+BhhRjtr5viCIrj1hmu1YvrguLipIPRJZmS5yUcFw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.14.2"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-decorators" "^7.12.13"
-
 "@babel/plugin-proposal-dynamic-import@^7.12.1", "@babel/plugin-proposal-dynamic-import@^7.14.2":
   version "7.14.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz#01ebabd7c381cff231fa43e302939a9de5be9d9f"
@@ -421,14 +398,6 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-default-from@^7.12.1":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.13.tgz#f110284108a9b2b96f01b15b3be9e54c2610a989"
-  integrity sha512-idIsBT+DGXdOHL82U+8bwX4goHm/z10g8sGGrQroh+HCRcm7mDv/luaGdWJQMTuCX2FsdXS7X0Nyyzp4znAPJA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/plugin-syntax-export-default-from" "^7.12.13"
-
 "@babel/plugin-proposal-export-namespace-from@^7.12.1", "@babel/plugin-proposal-export-namespace-from@^7.14.2":
   version "7.14.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.2.tgz#62542f94aa9ce8f6dba79eec698af22112253791"
@@ -513,7 +482,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.12.1", "@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.14.2":
+"@babel/plugin-proposal-optional-chaining@^7.12.1", "@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.14.2":
   version "7.14.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz#df8171a8b9c43ebf4c1dabe6311b432d83e1b34e"
   integrity sha512-qQByMRPwMZJainfig10BoaDldx/+VDtNcrA7qdNaEOAj6VXud+gfrkA8j4CRAU5HjnWREXqIpSpH30qZX1xivA==
@@ -576,7 +545,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-syntax-decorators@^7.12.1", "@babel/plugin-syntax-decorators@^7.12.13":
+"@babel/plugin-syntax-decorators@^7.12.1":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz#fac829bf3c7ef4a1bc916257b403e58c6bdaf648"
   integrity sha512-Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA==
@@ -590,13 +559,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-export-default-from@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.13.tgz#3c807d37efaf0a806f1deb556ccb3b2f562ae9c2"
-  integrity sha512-gVry0zqoums0hA+EniCYK3gABhjYSLX1dVuwYpPw9DrLNA4/GovXySHVg4FGRsZht09ON/5C2NVx3keq+qqVGQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
 "@babel/plugin-syntax-export-namespace-from@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
@@ -604,7 +566,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-flow@^7.12.1", "@babel/plugin-syntax-flow@^7.12.13":
+"@babel/plugin-syntax-flow@^7.12.1":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz#5df9962503c0a9c918381c929d51d4d6949e7e86"
   integrity sha512-J/RYxnlSLXZLVR7wTRsozxKT8qbsx1mNKJzXEEjQ0Kjx1ZACcyHgbanNWNCFtc36IzuWhYWPpvJFFoexoOWFmA==
@@ -718,7 +680,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.12.12", "@babel/plugin-transform-block-scoping@^7.14.2":
+"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.14.2":
   version "7.14.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz#761cb12ab5a88d640ad4af4aa81f820e6b5fdf5c"
   integrity sha512-neZZcP19NugZZqNwMTH+KoBjx5WyvESPSIOQb4JHpfd+zPfqcH65RMu5xJju5+6q/Y2VzYrleQTr+b6METyyxg==
@@ -783,14 +745,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-flow" "^7.12.1"
 
-"@babel/plugin-transform-flow-strip-types@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.13.0.tgz#58177a48c209971e8234e99906cb6bd1122addd3"
-  integrity sha512-EXAGFMJgSX8gxWD7PZtW/P6M+z74jpx3wm/+9pn+c2dOawPpBkUX7BrfyPvo6ZpXbgRIEuwgwDb/MGlKvu2pOg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-flow" "^7.12.13"
-
 "@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062"
@@ -1123,7 +1077,7 @@
     core-js-compat "^3.6.2"
     semver "^5.5.0"
 
-"@babel/preset-env@^7.12.1", "@babel/preset-env@^7.12.11", "@babel/preset-env@^7.8.4":
+"@babel/preset-env@^7.12.1", "@babel/preset-env@^7.8.4":
   version "7.14.2"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.2.tgz#e80612965da73579c84ad2f963c2359c71524ed5"
   integrity sha512-7dD7lVT8GMrE73v4lvDEb85cgcQhdES91BSD7jS/xjC6QY8PnRhux35ac+GCpbiRhp8crexBvZZqnaL6VrY8TQ==
@@ -1202,15 +1156,6 @@
     core-js-compat "^3.9.0"
     semver "^6.3.0"
 
-"@babel/preset-flow@^7.12.1":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.13.13.tgz#a61a1c149b3f77589d795287744393444d5cdd9e"
-  integrity sha512-MDtwtamMifqq3R2mC7l3A3uFalUb3NH5TIBQWjN/epEPlZktcLq4se3J+ivckKrLMGsR7H9LW8+pYuIUN9tsKg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-validator-option" "^7.12.17"
-    "@babel/plugin-transform-flow-strip-types" "^7.13.0"
-
 "@babel/preset-modules@^0.1.3", "@babel/preset-modules@^0.1.4":
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
@@ -1235,7 +1180,7 @@
     "@babel/plugin-transform-react-jsx-source" "^7.12.1"
     "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
 
-"@babel/preset-react@^7.12.10", "@babel/preset-react@^7.12.5":
+"@babel/preset-react@^7.12.5":
   version "7.13.13"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.13.13.tgz#fa6895a96c50763fe693f9148568458d5a839761"
   integrity sha512-gx+tDLIE06sRjKJkVtpZ/t3mzCDOnPG+ggHZG9lffUbX8+wC739x20YQc9V35Do6ZAxaUc/HhVHIiOzz5MvDmA==
@@ -1255,7 +1200,7 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-transform-typescript" "^7.12.1"
 
-"@babel/preset-typescript@^7.12.16", "@babel/preset-typescript@^7.12.7":
+"@babel/preset-typescript@^7.12.16":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.13.0.tgz#ab107e5f050609d806fbb039bec553b33462c60a"
   integrity sha512-LXJwxrHy0N3f6gIJlYbLta1D9BDtHpQeqwzM0LIfjDlr6UE/D5Mc7W4iDiQzaE+ks0sTjT26ArcHWnJVt0QiHw==
@@ -1264,17 +1209,6 @@
     "@babel/helper-validator-option" "^7.12.17"
     "@babel/plugin-transform-typescript" "^7.13.0"
 
-"@babel/register@^7.12.1":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.13.16.tgz#ae3ab0b55c8ec28763877383c454f01521d9a53d"
-  integrity sha512-dh2t11ysujTwByQjXNgJ48QZ2zcXKQVdV8s0TbeMI0flmtGWCdTwK9tJiACHXPLmncm5+ktNn/diojA45JE4jg==
-  dependencies:
-    clone-deep "^4.0.1"
-    find-cache-dir "^2.0.0"
-    make-dir "^2.1.0"
-    pirates "^4.0.0"
-    source-map-support "^0.5.16"
-
 "@babel/runtime-corejs3@^7.10.2":
   version "7.14.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz#6bf5fbc0b961f8e3202888cb2cd0fb7a0a9a3f66"
@@ -1304,7 +1238,7 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.13.17", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.14.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6"
   integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==
@@ -1342,7 +1276,7 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.6", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.15", "@babel/traverse@^7.14.0", "@babel/traverse@^7.14.2", "@babel/traverse@^7.7.0":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.15", "@babel/traverse@^7.14.0", "@babel/traverse@^7.14.2", "@babel/traverse@^7.7.0":
   version "7.14.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b"
   integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==
@@ -1365,7 +1299,7 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.6", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.6", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.14.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3"
   integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==
@@ -1401,108 +1335,6 @@
   resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.4.0.tgz#c3c5ae543c897caa9c2a68630bed355be5f9990f"
   integrity sha512-JZButFdZ1+/xAfpguQHoabIXkcqRRKpMrWKBkpEZZyxfY9C1DpADFB8PEqGSTeFr135SaTRfKqGKx5xSCLI7ZQ==
 
-"@emotion/cache@^10.0.27":
-  version "10.0.29"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0"
-  integrity sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==
-  dependencies:
-    "@emotion/sheet" "0.9.4"
-    "@emotion/stylis" "0.8.5"
-    "@emotion/utils" "0.11.3"
-    "@emotion/weak-memoize" "0.2.5"
-
-"@emotion/core@^10.1.1":
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3"
-  integrity sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    "@emotion/cache" "^10.0.27"
-    "@emotion/css" "^10.0.27"
-    "@emotion/serialize" "^0.11.15"
-    "@emotion/sheet" "0.9.4"
-    "@emotion/utils" "0.11.3"
-
-"@emotion/css@^10.0.27":
-  version "10.0.27"
-  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.27.tgz#3a7458198fbbebb53b01b2b87f64e5e21241e14c"
-  integrity sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw==
-  dependencies:
-    "@emotion/serialize" "^0.11.15"
-    "@emotion/utils" "0.11.3"
-    babel-plugin-emotion "^10.0.27"
-
-"@emotion/hash@0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
-  integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
-
-"@emotion/is-prop-valid@0.8.8", "@emotion/is-prop-valid@^0.8.6":
-  version "0.8.8"
-  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a"
-  integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==
-  dependencies:
-    "@emotion/memoize" "0.7.4"
-
-"@emotion/memoize@0.7.4":
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb"
-  integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==
-
-"@emotion/serialize@^0.11.15", "@emotion/serialize@^0.11.16":
-  version "0.11.16"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.16.tgz#dee05f9e96ad2fb25a5206b6d759b2d1ed3379ad"
-  integrity sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==
-  dependencies:
-    "@emotion/hash" "0.8.0"
-    "@emotion/memoize" "0.7.4"
-    "@emotion/unitless" "0.7.5"
-    "@emotion/utils" "0.11.3"
-    csstype "^2.5.7"
-
-"@emotion/sheet@0.9.4":
-  version "0.9.4"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.4.tgz#894374bea39ec30f489bbfc3438192b9774d32e5"
-  integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==
-
-"@emotion/styled-base@^10.0.27":
-  version "10.0.31"
-  resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz#940957ee0aa15c6974adc7d494ff19765a2f742a"
-  integrity sha512-wTOE1NcXmqMWlyrtwdkqg87Mu6Rj1MaukEoEmEkHirO5IoHDJ8LgCQL4MjJODgxWxXibGR3opGp1p7YvkNEdXQ==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    "@emotion/is-prop-valid" "0.8.8"
-    "@emotion/serialize" "^0.11.15"
-    "@emotion/utils" "0.11.3"
-
-"@emotion/styled@^10.0.27":
-  version "10.0.27"
-  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.27.tgz#12cb67e91f7ad7431e1875b1d83a94b814133eaf"
-  integrity sha512-iK/8Sh7+NLJzyp9a5+vIQIXTYxfT4yB/OJbjzQanB2RZpvmzBQOHZWhpAMZWYEKRNNbsD6WfBw5sVWkb6WzS/Q==
-  dependencies:
-    "@emotion/styled-base" "^10.0.27"
-    babel-plugin-emotion "^10.0.27"
-
-"@emotion/stylis@0.8.5":
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04"
-  integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==
-
-"@emotion/unitless@0.7.5":
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
-  integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
-
-"@emotion/utils@0.11.3":
-  version "0.11.3"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.3.tgz#a759863867befa7e583400d322652a3f44820924"
-  integrity sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==
-
-"@emotion/weak-memoize@0.2.5":
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
-  integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
-
 "@endemolshinegroup/cosmiconfig-typescript-loader@3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.0.2.tgz#eea4635828dde372838b0909693ebd9aafeec22d"
@@ -2501,14 +2333,6 @@
   resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz#3b0efb6d3903bd49edb073696f60e90df08efb26"
   integrity sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==
 
-"@mrmlnc/readdir-enhanced@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
-  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
-  dependencies:
-    call-me-maybe "^1.0.1"
-    glob-to-regexp "^0.3.0"
-
 "@multiformats/base-x@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@multiformats/base-x/-/base-x-4.0.1.tgz#95ff0fa58711789d53aefb2590a8b7a4e715d121"
@@ -2527,11 +2351,6 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
   integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
 
-"@nodelib/fs.stat@^1.1.2":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
-  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
-
 "@nodelib/fs.walk@^1.2.3":
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
@@ -2643,7 +2462,7 @@
     enc-utils "^3.0.0"
     randombytes "^2.1.0"
 
-"@pmmmwh/react-refresh-webpack-plugin@0.4.3", "@pmmmwh/react-refresh-webpack-plugin@^0.4.3":
+"@pmmmwh/react-refresh-webpack-plugin@0.4.3":
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz#1eec460596d200c0236bf195b078a5d1df89b766"
   integrity sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ==
@@ -2655,11 +2474,6 @@
     schema-utils "^2.6.5"
     source-map "^0.7.3"
 
-"@popperjs/core@^2.5.4", "@popperjs/core@^2.6.0":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
-  integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==
-
 "@portis/web3-provider-engine@1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@portis/web3-provider-engine/-/web3-provider-engine-1.1.2.tgz#97f383156ea6b70fba69ae93a945fdd94159b1ba"
@@ -2698,16 +2512,6 @@
     penpal "3.0.7"
     pocket-js-core "0.0.3"
 
-"@reach/router@^1.3.4":
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/@reach/router/-/router-1.3.4.tgz#d2574b19370a70c80480ed91f3da840136d10f8c"
-  integrity sha512-+mtn9wjlB9NN2CNnnC/BRYtwdKBfSyyasPYraNAyvaV1occr/5NnB4CVzjEZipNHwYebQwcndGUmpFzxAUoqSA==
-  dependencies:
-    create-react-context "0.3.0"
-    invariant "^2.2.3"
-    prop-types "^15.6.1"
-    react-lifecycles-compat "^3.0.4"
-
 "@reduxjs/toolkit@^1.5.0":
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.5.1.tgz#05daa2f6eebc70dc18cd98a90421fab7fa565dc5"
@@ -2772,492 +2576,6 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@storybook/addons@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.9.tgz#b7ba2b9f0e15b852c7d6b57d04fb0a493c57477c"
-  integrity sha512-GnmEKbJwiN1jncN9NSA8CuR1i2XAlasPcl/Zn0jkfV9WitQeczVcJCPw86SGH84AD+tTBCyF2i9UC0KaOV1YBQ==
-  dependencies:
-    "@storybook/api" "6.2.9"
-    "@storybook/channels" "6.2.9"
-    "@storybook/client-logger" "6.2.9"
-    "@storybook/core-events" "6.2.9"
-    "@storybook/router" "6.2.9"
-    "@storybook/theming" "6.2.9"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    regenerator-runtime "^0.13.7"
-
-"@storybook/api@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.9.tgz#a9b46569192ad5d8da6435c9d63dc4b0c8463b51"
-  integrity sha512-okkA3HAScE9tGnYBrjTOcgzT+L1lRHNoEh3ZfGgh1u/XNEyHGNkj4grvkd6nX7BzRcYQ/l2VkcKCqmOjUnSkVQ==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/channels" "6.2.9"
-    "@storybook/client-logger" "6.2.9"
-    "@storybook/core-events" "6.2.9"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.9"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.2.9"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    store2 "^2.12.0"
-    telejson "^5.1.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/builder-webpack4@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.2.9.tgz#dddff0b1b4590a7ba088ce13e7cc42e482f6455d"
-  integrity sha512-swECic1huVdj+B+iRJIQ8ds59HuPVE4fmhI+j/nhw0CQCsgAEKqDlOQVYEimW6nZX8GO4WxNm6tiiRzxixejbw==
-  dependencies:
-    "@babel/core" "^7.12.10"
-    "@babel/plugin-proposal-class-properties" "^7.12.1"
-    "@babel/plugin-proposal-decorators" "^7.12.12"
-    "@babel/plugin-proposal-export-default-from" "^7.12.1"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
-    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
-    "@babel/plugin-proposal-private-methods" "^7.12.1"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.12.1"
-    "@babel/plugin-transform-block-scoping" "^7.12.12"
-    "@babel/plugin-transform-classes" "^7.12.1"
-    "@babel/plugin-transform-destructuring" "^7.12.1"
-    "@babel/plugin-transform-for-of" "^7.12.1"
-    "@babel/plugin-transform-parameters" "^7.12.1"
-    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
-    "@babel/plugin-transform-spread" "^7.12.1"
-    "@babel/plugin-transform-template-literals" "^7.12.1"
-    "@babel/preset-env" "^7.12.11"
-    "@babel/preset-react" "^7.12.10"
-    "@babel/preset-typescript" "^7.12.7"
-    "@storybook/addons" "6.2.9"
-    "@storybook/api" "6.2.9"
-    "@storybook/channel-postmessage" "6.2.9"
-    "@storybook/channels" "6.2.9"
-    "@storybook/client-api" "6.2.9"
-    "@storybook/client-logger" "6.2.9"
-    "@storybook/components" "6.2.9"
-    "@storybook/core-common" "6.2.9"
-    "@storybook/core-events" "6.2.9"
-    "@storybook/node-logger" "6.2.9"
-    "@storybook/router" "6.2.9"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.2.9"
-    "@storybook/ui" "6.2.9"
-    "@types/node" "^14.0.10"
-    "@types/webpack" "^4.41.26"
-    autoprefixer "^9.8.6"
-    babel-loader "^8.2.2"
-    babel-plugin-macros "^2.8.0"
-    babel-plugin-polyfill-corejs3 "^0.1.0"
-    case-sensitive-paths-webpack-plugin "^2.3.0"
-    core-js "^3.8.2"
-    css-loader "^3.6.0"
-    dotenv-webpack "^1.8.0"
-    file-loader "^6.2.0"
-    find-up "^5.0.0"
-    fork-ts-checker-webpack-plugin "^4.1.6"
-    fs-extra "^9.0.1"
-    glob "^7.1.6"
-    glob-promise "^3.4.0"
-    global "^4.4.0"
-    html-webpack-plugin "^4.0.0"
-    pnp-webpack-plugin "1.6.4"
-    postcss "^7.0.35"
-    postcss-flexbugs-fixes "^4.2.1"
-    postcss-loader "^4.2.0"
-    raw-loader "^4.0.2"
-    react-dev-utils "^11.0.3"
-    stable "^0.1.8"
-    style-loader "^1.3.0"
-    terser-webpack-plugin "^3.1.0"
-    ts-dedent "^2.0.0"
-    url-loader "^4.1.1"
-    util-deprecate "^1.0.2"
-    webpack "4"
-    webpack-dev-middleware "^3.7.3"
-    webpack-filter-warnings-plugin "^1.2.1"
-    webpack-hot-middleware "^2.25.0"
-    webpack-virtual-modules "^0.2.2"
-
-"@storybook/channel-postmessage@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.9.tgz#ad85573e0a5d6f0cde3504f168d87a73cb0b6269"
-  integrity sha512-OqV+gLeeCHR0KExsIz0B7gD17Cjd9D+I75qnBsLWM9inWO5kc/WZ5svw8Bvjlcm6snWpvxUaT8L+svuqcPSmww==
-  dependencies:
-    "@storybook/channels" "6.2.9"
-    "@storybook/client-logger" "6.2.9"
-    "@storybook/core-events" "6.2.9"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    qs "^6.10.0"
-    telejson "^5.1.0"
-
-"@storybook/channels@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.9.tgz#a9fd7f25102cbec15fb56f76abf891b7b214e9de"
-  integrity sha512-6dC8Fb2ipNyOQXnUZMDeEUaJGH5DMLzyHlGLhVyDtrO5WR6bO8mQdkzf4+5dSKXgCBNX0BSkssXth4pDjn18rg==
-  dependencies:
-    core-js "^3.8.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/client-api@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.9.tgz#f0bb44e9b2692adfbf30d7ff751c6dd44bcfe1ce"
-  integrity sha512-aLvEUVkbvv6Qo/2mF4rFCecdqi2CGOUDdsV1a6EFIVS/9gXFdpirsOwKHo9qNjacGdWPlBYGCUcbrw+DvNaSFA==
-  dependencies:
-    "@storybook/addons" "6.2.9"
-    "@storybook/channel-postmessage" "6.2.9"
-    "@storybook/channels" "6.2.9"
-    "@storybook/client-logger" "6.2.9"
-    "@storybook/core-events" "6.2.9"
-    "@storybook/csf" "0.0.1"
-    "@types/qs" "^6.9.5"
-    "@types/webpack-env" "^1.16.0"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    stable "^0.1.8"
-    store2 "^2.12.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/client-logger@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.9.tgz#77c1ea39684ad2a2cf6836051b381fc5b354e132"
-  integrity sha512-IfOQZuvpjh66qBInQCJOb9S0dTGpzZ/Cxlcvokp+PYt95KztaWN3mPm+HaDQCeRsrWNe0Bpm1zuickcJ6dBOXg==
-  dependencies:
-    core-js "^3.8.2"
-    global "^4.4.0"
-
-"@storybook/components@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.9.tgz#7189f9715b05720fe083ae8ad014849f14e98e73"
-  integrity sha512-hnV1MI2aB2g1sJ7NJphpxi7TwrMZQ/tpCJeHnkjmzyC6ez1MXqcBXGrEEdSXzRfAxjQTOEpu6H1mnns0xMP0Ag==
-  dependencies:
-    "@popperjs/core" "^2.6.0"
-    "@storybook/client-logger" "6.2.9"
-    "@storybook/csf" "0.0.1"
-    "@storybook/theming" "6.2.9"
-    "@types/color-convert" "^2.0.0"
-    "@types/overlayscrollbars" "^1.12.0"
-    "@types/react-syntax-highlighter" "11.0.5"
-    color-convert "^2.0.1"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    markdown-to-jsx "^7.1.0"
-    memoizerific "^1.11.3"
-    overlayscrollbars "^1.13.1"
-    polished "^4.0.5"
-    prop-types "^15.7.2"
-    react-colorful "^5.0.1"
-    react-popper-tooltip "^3.1.1"
-    react-syntax-highlighter "^13.5.3"
-    react-textarea-autosize "^8.3.0"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/core-client@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.2.9.tgz#3f611947e64dee0a297e512ff974087bc52c1877"
-  integrity sha512-jW841J5lCe1Ub5ZMtzYPgCy/OUddFxxVYeHLZyuNxlH5RoiQQxbDpuFlzuZMYGuIzD6eZw+ANE4w5vW/y5oBfA==
-  dependencies:
-    "@storybook/addons" "6.2.9"
-    "@storybook/channel-postmessage" "6.2.9"
-    "@storybook/client-api" "6.2.9"
-    "@storybook/client-logger" "6.2.9"
-    "@storybook/core-events" "6.2.9"
-    "@storybook/csf" "0.0.1"
-    "@storybook/ui" "6.2.9"
-    ansi-to-html "^0.6.11"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
-    unfetch "^4.2.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/core-common@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.2.9.tgz#54f8e005733d39c4cb90eec7c17f9ca4dcbeec5f"
-  integrity sha512-ve0Qb4EMit8jGibfZBprmaU2i4LtpB4vSMIzD9nB1YeBmw2cGhHubtmayZ0TwcV3fPQhtYH9wwRWuWyzzHyQyw==
-  dependencies:
-    "@babel/core" "^7.12.10"
-    "@babel/plugin-proposal-class-properties" "^7.12.1"
-    "@babel/plugin-proposal-decorators" "^7.12.12"
-    "@babel/plugin-proposal-export-default-from" "^7.12.1"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
-    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
-    "@babel/plugin-proposal-private-methods" "^7.12.1"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.12.1"
-    "@babel/plugin-transform-block-scoping" "^7.12.12"
-    "@babel/plugin-transform-classes" "^7.12.1"
-    "@babel/plugin-transform-destructuring" "^7.12.1"
-    "@babel/plugin-transform-for-of" "^7.12.1"
-    "@babel/plugin-transform-parameters" "^7.12.1"
-    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
-    "@babel/plugin-transform-spread" "^7.12.1"
-    "@babel/preset-env" "^7.12.11"
-    "@babel/preset-react" "^7.12.10"
-    "@babel/preset-typescript" "^7.12.7"
-    "@babel/register" "^7.12.1"
-    "@storybook/node-logger" "6.2.9"
-    "@storybook/semver" "^7.3.2"
-    "@types/glob-base" "^0.3.0"
-    "@types/micromatch" "^4.0.1"
-    "@types/node" "^14.0.10"
-    "@types/pretty-hrtime" "^1.0.0"
-    babel-loader "^8.2.2"
-    babel-plugin-macros "^3.0.1"
-    babel-plugin-polyfill-corejs3 "^0.1.0"
-    chalk "^4.1.0"
-    core-js "^3.8.2"
-    express "^4.17.1"
-    file-system-cache "^1.0.5"
-    find-up "^5.0.0"
-    fork-ts-checker-webpack-plugin "^6.0.4"
-    glob "^7.1.6"
-    glob-base "^0.3.0"
-    interpret "^2.2.0"
-    json5 "^2.1.3"
-    lazy-universal-dotenv "^3.0.1"
-    micromatch "^4.0.2"
-    pkg-dir "^5.0.0"
-    pretty-hrtime "^1.0.3"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-    webpack "4"
-
-"@storybook/core-events@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.9.tgz#4f12947cd15d1eb3c4109923657c012feef521cd"
-  integrity sha512-xQmbX/oYQK1QsAGN8hriXX5SUKOoTUe3L4dVaVHxJqy7MReRWJpprJmCpbAPJzWS6WCbDFfCM5kVEexHLOzJlQ==
-  dependencies:
-    core-js "^3.8.2"
-
-"@storybook/core-server@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.2.9.tgz#da8b7f043ff59ee6cd2e8631ba8d0f954fdc265a"
-  integrity sha512-DzihO73pj1Ro0Y4tq9hjw2mLMUYeSRPrx7CndCOBxcTHCKQ8Kd7Dee3wJ49t5/19V7TW1+4lYR59GAy73FeOAQ==
-  dependencies:
-    "@babel/core" "^7.12.10"
-    "@babel/plugin-transform-template-literals" "^7.12.1"
-    "@babel/preset-react" "^7.12.10"
-    "@storybook/addons" "6.2.9"
-    "@storybook/builder-webpack4" "6.2.9"
-    "@storybook/core-client" "6.2.9"
-    "@storybook/core-common" "6.2.9"
-    "@storybook/node-logger" "6.2.9"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.2.9"
-    "@storybook/ui" "6.2.9"
-    "@types/node" "^14.0.10"
-    "@types/node-fetch" "^2.5.7"
-    "@types/pretty-hrtime" "^1.0.0"
-    "@types/webpack" "^4.41.26"
-    airbnb-js-shims "^2.2.1"
-    babel-loader "^8.2.2"
-    better-opn "^2.1.1"
-    boxen "^4.2.0"
-    case-sensitive-paths-webpack-plugin "^2.3.0"
-    chalk "^4.1.0"
-    cli-table3 "0.6.0"
-    commander "^6.2.1"
-    core-js "^3.8.2"
-    cpy "^8.1.1"
-    css-loader "^3.6.0"
-    detect-port "^1.3.0"
-    dotenv-webpack "^1.8.0"
-    express "^4.17.1"
-    file-loader "^6.2.0"
-    file-system-cache "^1.0.5"
-    find-up "^5.0.0"
-    fs-extra "^9.0.1"
-    global "^4.4.0"
-    html-webpack-plugin "^4.0.0"
-    ip "^1.1.5"
-    node-fetch "^2.6.1"
-    pnp-webpack-plugin "1.6.4"
-    pretty-hrtime "^1.0.3"
-    prompts "^2.4.0"
-    read-pkg-up "^7.0.1"
-    regenerator-runtime "^0.13.7"
-    resolve-from "^5.0.0"
-    serve-favicon "^2.5.0"
-    style-loader "^1.3.0"
-    telejson "^5.1.0"
-    terser-webpack-plugin "^3.1.0"
-    ts-dedent "^2.0.0"
-    url-loader "^4.1.1"
-    util-deprecate "^1.0.2"
-    webpack "4"
-    webpack-dev-middleware "^3.7.3"
-    webpack-virtual-modules "^0.2.2"
-
-"@storybook/core@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.2.9.tgz#e32e72b3bdb44384f5f0ff93ad1a483acd033b4b"
-  integrity sha512-pzbyjWvj0t8m0kR2pC9GQne4sZn7Y/zfcbm6/31CL+yhzOQjfJEj3n4ZFUlxikXqQJPg1aWfypfyaeaLL0QyuA==
-  dependencies:
-    "@storybook/core-client" "6.2.9"
-    "@storybook/core-server" "6.2.9"
-
-"@storybook/csf@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.0.1.tgz#95901507dc02f0bc6f9ac8ee1983e2fc5bb98ce6"
-  integrity sha512-USTLkZze5gkel8MYCujSRBVIrUQ3YPBrLOx7GNk/0wttvVtlzWXAq9eLbQ4p/NicGxP+3T7KPEMVV//g+yubpw==
-  dependencies:
-    lodash "^4.17.15"
-
-"@storybook/node-logger@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.9.tgz#c67d8d7684514b8d00207502e8a9adda0ee750e5"
-  integrity sha512-ryRBChWZf1A5hOVONErJZosS25IdMweoMVFAUAcj91iC0ynoSA6YL2jmoE71jQchxEXEgkDeRkX9lR/GlqFGZQ==
-  dependencies:
-    "@types/npmlog" "^4.1.2"
-    chalk "^4.1.0"
-    core-js "^3.8.2"
-    npmlog "^4.1.2"
-    pretty-hrtime "^1.0.3"
-
-"@storybook/react@^6.1.18":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.2.9.tgz#84f42b3d9a5c8de814f71ae186886076ba377d2c"
-  integrity sha512-glvw+o/Vek2oapYIXCYDK6gm3cuSnx0XdOpiJVcXk3KLb8JfLbdzGYYp6dcWUbyOBqGcGFRpXIgMmkcwgn+fvQ==
-  dependencies:
-    "@babel/preset-flow" "^7.12.1"
-    "@babel/preset-react" "^7.12.10"
-    "@pmmmwh/react-refresh-webpack-plugin" "^0.4.3"
-    "@storybook/addons" "6.2.9"
-    "@storybook/core" "6.2.9"
-    "@storybook/core-common" "6.2.9"
-    "@storybook/node-logger" "6.2.9"
-    "@storybook/semver" "^7.3.2"
-    "@types/webpack-env" "^1.16.0"
-    babel-plugin-add-react-displayname "^0.0.5"
-    babel-plugin-named-asset-import "^0.3.1"
-    babel-plugin-react-docgen "^4.2.1"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    prop-types "^15.7.2"
-    react-dev-utils "^11.0.3"
-    react-docgen-typescript-plugin "^0.6.2"
-    react-refresh "^0.8.3"
-    read-pkg-up "^7.0.1"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
-    webpack "4"
-
-"@storybook/router@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.9.tgz#547543031dd8330870bb6b473dcf7e51982e841c"
-  integrity sha512-7Bn1OFoItCl8whXRT8N1qp1Lky7kzXJ3aslWp5E8HcM8rxh4OYXfbaeiyJEJxBTGC5zxgY+tAEXHFjsAviFROg==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/client-logger" "6.2.9"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    ts-dedent "^2.0.0"
-
-"@storybook/semver@^7.3.2":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0"
-  integrity sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==
-  dependencies:
-    core-js "^3.6.5"
-    find-up "^4.1.0"
-
-"@storybook/storybook-deployer@^2.8.7":
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/@storybook/storybook-deployer/-/storybook-deployer-2.8.8.tgz#680a46de7c5b78ac3f4b319f30a358aab0bd1907"
-  integrity sha512-nRdK7llDJR1ayWt1354lLsrPuKzVmLPk9kxOzMo2EirumMkyUNIdZH+voHdntUKkh+KuSOm7Q0OOoqlHZkY0vA==
-  dependencies:
-    git-url-parse "^11.1.2"
-    glob "^7.1.3"
-    parse-repo "^1.0.4"
-    shelljs "^0.8.1"
-    yargs "^15.0.0"
-
-"@storybook/theming@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.9.tgz#16bf40180861f222c7ed1d80abd5d1e3cb315660"
-  integrity sha512-183oJW7AD7Fhqg5NT4ct3GJntwteAb9jZnQ6yhf9JSdY+fk8OhxRbPf7ov0au2gYACcGrWDd9K5pYQsvWlP5gA==
-  dependencies:
-    "@emotion/core" "^10.1.1"
-    "@emotion/is-prop-valid" "^0.8.6"
-    "@emotion/styled" "^10.0.27"
-    "@storybook/client-logger" "6.2.9"
-    core-js "^3.8.2"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.27"
-    global "^4.4.0"
-    memoizerific "^1.11.3"
-    polished "^4.0.5"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
-
-"@storybook/ui@6.2.9":
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.2.9.tgz#25cdf7ae2ef38ab337570c2377fda1da999792e7"
-  integrity sha512-jq2xmw3reIqik/6ibUSbNKGR+Xvr9wkAEwexiOl+5WQ5BeYJpw4dmDmsFQf+SQuWaSEUUPolbzkakRQM778Kdg==
-  dependencies:
-    "@emotion/core" "^10.1.1"
-    "@storybook/addons" "6.2.9"
-    "@storybook/api" "6.2.9"
-    "@storybook/channels" "6.2.9"
-    "@storybook/client-logger" "6.2.9"
-    "@storybook/components" "6.2.9"
-    "@storybook/core-events" "6.2.9"
-    "@storybook/router" "6.2.9"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.2.9"
-    "@types/markdown-to-jsx" "^6.11.3"
-    copy-to-clipboard "^3.3.1"
-    core-js "^3.8.2"
-    core-js-pure "^3.8.2"
-    downshift "^6.0.15"
-    emotion-theming "^10.0.27"
-    fuse.js "^3.6.1"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    markdown-to-jsx "^6.11.4"
-    memoizerific "^1.11.3"
-    polished "^4.0.5"
-    qs "^6.10.0"
-    react-draggable "^4.4.3"
-    react-helmet-async "^1.0.7"
-    react-sizeme "^3.0.1"
-    regenerator-runtime "^0.13.7"
-    resolve-from "^5.0.0"
-    store2 "^2.12.0"
-
 "@surma/rollup-plugin-off-main-thread@^1.1.1":
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.2.tgz#e6786b6af5799f82f7ab3a82e53f6182d2b91a58"
@@ -3446,11 +2764,6 @@
     "@types/connect" "*"
     "@types/node" "*"
 
-"@types/braces@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/braces/-/braces-3.0.0.tgz#7da1c0d44ff1c7eb660a36ec078ea61ba7eb42cb"
-  integrity sha512-TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw==
-
 "@types/classnames@^2.2.11":
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.3.1.tgz#3c2467aa0f1a93f1f021e3b9bcf938bd5dfdc0dd"
@@ -3458,18 +2771,6 @@
   dependencies:
     classnames "*"
 
-"@types/color-convert@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.0.tgz#8f5ee6b9e863dcbee5703f5a517ffb13d3ea4e22"
-  integrity sha512-m7GG7IKKGuJUXvkZ1qqG3ChccdIM/qBBo913z+Xft0nKCX4hAU/IxKwZBU4cpRZ7GS5kV4vOblUkILtSShCPXQ==
-  dependencies:
-    "@types/color-name" "*"
-
-"@types/color-name@*":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
-  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
-
 "@types/connect@*":
   version "3.4.34"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901"
@@ -3538,12 +2839,7 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/glob-base@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@types/glob-base/-/glob-base-0.3.0.tgz#a581d688347e10e50dd7c17d6f2880a10354319d"
-  integrity sha1-pYHWiDR+EOUN18F9byiAoQNUMZ0=
-
-"@types/glob@*", "@types/glob@^7.1.1":
+"@types/glob@^7.1.1":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
   integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
@@ -3597,11 +2893,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/is-function@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/is-function/-/is-function-1.0.0.tgz#1b0b819b1636c7baf0d6785d030d12edf70c3e83"
-  integrity sha512-iTs9HReBu7evG77Q4EC8hZnqRt57irBDkK9nvmHroiOIVwYMQc4IvYvdRgwKfYepunIY7Oh/dBuuld+Gj9uo6w==
-
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
@@ -3626,7 +2917,7 @@
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.1.tgz#5544730b65a480b18ace6b6ce914e519cec2d43b"
   integrity sha512-xdOvNmXmrZqqPy3kuCQ+fz6wA0xU5pji9cd1nDrflWaAWtYLLGk5ykW0H6yg5TVyehHP1pfmuuSaZkhP+kspVA==
 
-"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
+"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
   version "7.0.7"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
   integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
@@ -3688,13 +2979,6 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.169.tgz#83c217688f07a4d9ef8f28a3ebd1d318f6ff4cbb"
   integrity sha512-DvmZHoHTFJ8zhVYwCLWbQ7uAbYQEk52Ev2/ZiQ7Y7gQGeV9pjBqjnQpECMHfKS1rCYAhMI7LHVxwyZLZinJgdw==
 
-"@types/markdown-to-jsx@^6.11.3":
-  version "6.11.3"
-  resolved "https://registry.yarnpkg.com/@types/markdown-to-jsx/-/markdown-to-jsx-6.11.3.tgz#cdd1619308fecbc8be7e6a26f3751260249b020e"
-  integrity sha512-30nFYpceM/ZEvhGiqWjm5quLUxNeld0HCzJEXMZZDpq53FPkS85mTwkWtCXzCqq8s5JYLgM5W392a02xn8Bdaw==
-  dependencies:
-    "@types/react" "*"
-
 "@types/mdast@^3.0.0":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"
@@ -3709,13 +2993,6 @@
   dependencies:
     "@types/unist" "*"
 
-"@types/micromatch@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@types/micromatch/-/micromatch-4.0.1.tgz#9381449dd659fc3823fd2a4190ceacc985083bc7"
-  integrity sha512-my6fLBvpY70KattTNzYOK6KU1oR1+UCz9ug/JbcF5UrEmeCt9P7DV2t7L8+t18mMPINqGQCE4O8PLOPbI84gxw==
-  dependencies:
-    "@types/braces" "*"
-
 "@types/mime@^1":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
@@ -3726,20 +3003,12 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21"
   integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
 
-"@types/node-fetch@^2.5.7":
-  version "2.5.10"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.10.tgz#9b4d4a0425562f9fcea70b12cb3fcdd946ca8132"
-  integrity sha512-IpkX0AasN44hgEad0gEF/V6EgR5n69VEqPEgnmoM8GsIGro3PowbWs4tR6IhxUTyPLpOn+fiGG6nrQhcmoCuIQ==
-  dependencies:
-    "@types/node" "*"
-    form-data "^3.0.0"
-
 "@types/node@*", "@types/node@>=6":
   version "15.3.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-15.3.0.tgz#d6fed7d6bc6854306da3dea1af9f874b00783e26"
   integrity sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==
 
-"@types/node@^14.0.10", "@types/node@^14.14.26":
+"@types/node@^14.14.26":
   version "14.14.45"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.45.tgz#ec2dfb5566ff814d061aef7e141575aedba245cf"
   integrity sha512-DssMqTV9UnnoxDWu959sDLZzfvqCF0qDNRjaWeYSui9xkFe61kKo4l1TWNTQONpuXEm+gLMRvdlzvNHBamzmEw==
@@ -3749,16 +3018,6 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
   integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
 
-"@types/npmlog@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@types/npmlog/-/npmlog-4.1.2.tgz#d070fe6a6b78755d1092a3dc492d34c3d8f871c4"
-  integrity sha512-4QQmOF5KlwfxJ5IGXFIudkeLCdMABz03RcUXu+LCb24zmln8QW6aDjuGl4d4XPVLf2j+FnjelHTP7dvceAFbhA==
-
-"@types/overlayscrollbars@^1.12.0":
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/@types/overlayscrollbars/-/overlayscrollbars-1.12.0.tgz#98456caceca8ad73bd5bb572632a585074e70764"
-  integrity sha512-h/pScHNKi4mb+TrJGDon8Yb06ujFG0mSg12wIO0sWMUF3dQIe2ExRRdNRviaNt9IjxIiOfnRr7FsQAdHwK4sMg==
-
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@@ -3781,11 +3040,6 @@
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0"
   integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==
 
-"@types/pretty-hrtime@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/pretty-hrtime/-/pretty-hrtime-1.0.0.tgz#c5a2d644a135e988b2932f99737e67b3c62528d0"
-  integrity sha512-xl+5r2rcrxdLViAYkkiLMYsoUs3qEyrAnHFyEzYysgRxdVp3WbhysxIvJIxZp9FvZ2CYezh0TaHZorivH+voOQ==
-
 "@types/prop-types@*":
   version "15.7.3"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
@@ -3796,7 +3050,7 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
   integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==
 
-"@types/qs@*", "@types/qs@^6.9.5":
+"@types/qs@*":
   version "6.9.6"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1"
   integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==
@@ -3806,13 +3060,6 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
   integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
 
-"@types/reach__router@^1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.7.tgz#de8ab374259ae7f7499fc1373b9697a5f3cd6428"
-  integrity sha512-cyBEb8Ef3SJNH5NYEIDGPoMMmYUxROatuxbICusVRQIqZUB85UCt6R2Ok60tKS/TABJsJYaHyNTW3kqbpxlMjg==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-dom@^17.0.2":
   version "17.0.5"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.5.tgz#df44eed5b8d9e0b13bb0cd38e0ea6572a1231227"
@@ -3854,13 +3101,6 @@
     "@types/history" "*"
     "@types/react" "*"
 
-"@types/react-syntax-highlighter@11.0.5":
-  version "11.0.5"
-  resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.5.tgz#0d546261b4021e1f9d85b50401c0a42acb106087"
-  integrity sha512-VIOi9i2Oj5XsmWWoB72p3KlZoEbdRAcechJa8Ztebw7bDl2YmR+odxIqhtJGp1q2EozHs02US+gzxJ9nuf56qg==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-transition-group@^4.4.1":
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz#e1a3cb278df7f47f17b5082b1b3da17170bd44b1"
@@ -3941,11 +3181,6 @@
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
   integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
 
-"@types/webpack-env@^1.16.0":
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.0.tgz#8c0a9435dfa7b3b1be76562f3070efb3f92637b4"
-  integrity sha512-Fx+NpfOO0CpeYX2g9bkvX8O5qh9wrU1sOF4g8sft4Mu7z+qfe387YlyY8w8daDyDsKY5vUxM0yxkAYnbkRbZEw==
-
 "@types/webpack-sources@*":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz#8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10"
@@ -3955,7 +3190,7 @@
     "@types/source-list-map" "*"
     source-map "^0.7.3"
 
-"@types/webpack@^4.41.26", "@types/webpack@^4.41.8":
+"@types/webpack@^4.41.8":
   version "4.41.28"
   resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.28.tgz#0069a2159b7ad4d83d0b5801942c17d54133897b"
   integrity sha512-Nn84RAiJjKRfPFFCVR8LC4ueTtTdfWAMZ03THIzZWRJB+rX24BD3LqPSFnbMscWauEsT4segAsylPDIaZyZyLQ==
@@ -4821,29 +4056,6 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
-airbnb-js-shims@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/airbnb-js-shims/-/airbnb-js-shims-2.2.1.tgz#db481102d682b98ed1daa4c5baa697a05ce5c040"
-  integrity sha512-wJNXPH66U2xjgo1Zwyjf9EydvJ2Si94+vSdk6EERcBfB2VZkeltpqIats0cqIZMLCXP3zcyaUKGYQeIBT6XjsQ==
-  dependencies:
-    array-includes "^3.0.3"
-    array.prototype.flat "^1.2.1"
-    array.prototype.flatmap "^1.2.1"
-    es5-shim "^4.5.13"
-    es6-shim "^0.35.5"
-    function.prototype.name "^1.1.0"
-    globalthis "^1.0.0"
-    object.entries "^1.1.0"
-    object.fromentries "^2.0.0 || ^1.0.0"
-    object.getownpropertydescriptors "^2.0.3"
-    object.values "^1.1.0"
-    promise.allsettled "^1.0.0"
-    promise.prototype.finally "^3.1.0"
-    string.prototype.matchall "^4.0.0 || ^3.0.1"
-    string.prototype.padend "^3.0.0"
-    string.prototype.padstart "^3.0.0"
-    symbol.prototype.description "^1.0.0"
-
 ajv-errors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
@@ -4854,7 +4066,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@~6.12.6:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@~6.12.6:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -4952,13 +4164,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-ansi-to-html@^0.6.11:
-  version "0.6.15"
-  resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.15.tgz#ac6ad4798a00f6aa045535d7f6a9cb9294eebea7"
-  integrity sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==
-  dependencies:
-    entities "^2.0.0"
-
 antd-theme-generator@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/antd-theme-generator/-/antd-theme-generator-1.2.8.tgz#8f1ef814afd7d0c99c12de25e477cc44323607a0"
@@ -5118,24 +4323,11 @@ app-module-path@^2.2.0:
   resolved "https://registry.yarnpkg.com/app-module-path/-/app-module-path-2.2.0.tgz#641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5"
   integrity sha1-ZBqlXft9am8KgUHEucCqULbCTdU=
 
-app-root-dir@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/app-root-dir/-/app-root-dir-1.0.2.tgz#38187ec2dea7577fff033ffcb12172692ff6e118"
-  integrity sha1-OBh+wt6nV3//Az/8sSFyaS/24Rg=
-
-aproba@^1.0.3, aproba@^1.1.1:
+aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 arg@^4.1.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
@@ -5210,7 +4402,7 @@ array-flatten@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.0.3, array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3:
+array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
   integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
@@ -5226,7 +4418,7 @@ array-tree-filter@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-tree-filter/-/array-tree-filter-2.1.0.tgz#873ac00fec83749f255ac8dd083814b4f6329190"
   integrity sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw==
 
-array-union@^1.0.1, array-union@^1.0.2:
+array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
   integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
@@ -5248,7 +4440,7 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.4:
+array.prototype.flat@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
   integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==
@@ -5257,7 +4449,7 @@ array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.4:
     define-properties "^1.1.3"
     es-abstract "^1.18.0-next.1"
 
-array.prototype.flatmap@^1.2.1, array.prototype.flatmap@^1.2.4:
+array.prototype.flatmap@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9"
   integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==
@@ -5267,17 +4459,6 @@ array.prototype.flatmap@^1.2.1, array.prototype.flatmap@^1.2.4:
     es-abstract "^1.18.0-next.1"
     function-bind "^1.1.1"
 
-array.prototype.map@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.3.tgz#1609623618d3d84134a37d4a220030c2bd18420b"
-  integrity sha512-nNcb30v0wfDyIe26Yif3PcV1JXQp4zEeEfupG7L4SRjnD6HLbO5b2a7eVSba53bOx4YCHYMBHt+Fp4vYstneRA==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-    es-array-method-boxes-properly "^1.0.0"
-    is-string "^1.0.5"
-
 arrify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
@@ -5333,13 +4514,6 @@ ast-types-flow@^0.0.7:
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
   integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
 
-ast-types@^0.14.2:
-  version "0.14.2"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd"
-  integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==
-  dependencies:
-    tslib "^2.0.1"
-
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
@@ -5406,7 +4580,7 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@^9.6.1, autoprefixer@^9.8.6:
+autoprefixer@^9.6.1:
   version "9.8.6"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
   integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
@@ -5683,11 +4857,6 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-add-react-displayname@^0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz#339d4cddb7b65fd62d1df9db9fe04de134122bd5"
-  integrity sha1-M51M3be2X9YtHfnbn+BN4TQSK9U=
-
 babel-plugin-check-es2015-constants@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
@@ -5702,22 +4871,6 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-emotion@^10.0.27:
-  version "10.2.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.2.2.tgz#a1fe3503cff80abfd0bdda14abd2e8e57a79d17d"
-  integrity sha512-SMSkGoqTbTyUTDeuVuPIWifPdUGkTk1Kf9BWRiXIOIcuyMfsdp2EjeiiFvOzX8NOBvEh/ypKYvUh2rkgAJMCLA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@emotion/hash" "0.8.0"
-    "@emotion/memoize" "0.7.4"
-    "@emotion/serialize" "^0.11.16"
-    babel-plugin-macros "^2.0.0"
-    babel-plugin-syntax-jsx "^6.18.0"
-    convert-source-map "^1.5.0"
-    escape-string-regexp "^1.0.5"
-    find-root "^1.1.0"
-    source-map "^0.5.7"
-
 babel-plugin-import@^1.13.3:
   version "1.13.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-import/-/babel-plugin-import-1.13.3.tgz#9dbbba7d1ac72bd412917a830d445e00941d26d7"
@@ -5747,7 +4900,7 @@ babel-plugin-jest-hoist@^26.6.2:
     "@types/babel__core" "^7.0.0"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-macros@2.8.0, babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.8.0:
+babel-plugin-macros@2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
   integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==
@@ -5756,16 +4909,7 @@ babel-plugin-macros@2.8.0, babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.8.
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
-babel-plugin-macros@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1"
-  integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    cosmiconfig "^7.0.0"
-    resolve "^1.19.0"
-
-babel-plugin-named-asset-import@^0.3.1, babel-plugin-named-asset-import@^0.3.7:
+babel-plugin-named-asset-import@^0.3.7:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz#156cd55d3f1228a5765774340937afc8398067dd"
   integrity sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw==
@@ -5779,14 +4923,6 @@ babel-plugin-polyfill-corejs2@^0.2.0:
     "@babel/helper-define-polyfill-provider" "^0.2.0"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.1.0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz#80449d9d6f2274912e05d9e182b54816904befd0"
-  integrity sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.1.5"
-    core-js-compat "^3.8.1"
-
 babel-plugin-polyfill-corejs3@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz#f4b4bb7b19329827df36ff56f6e6d367026cb7a2"
@@ -5802,15 +4938,6 @@ babel-plugin-polyfill-regenerator@^0.2.0:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.2.0"
 
-babel-plugin-react-docgen@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-react-docgen/-/babel-plugin-react-docgen-4.2.1.tgz#7cc8e2f94e8dc057a06e953162f0810e4e72257b"
-  integrity sha512-UQ0NmGHj/HAqi5Bew8WvNfCk8wSsmdgNd8ZdMjBCICtyCJCq9LiqgqvjCYe570/Wg7AQArSq1VQ60Dd/CHN7mQ==
-  dependencies:
-    ast-types "^0.14.2"
-    lodash "^4.17.15"
-    react-docgen "^5.0.0"
-
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
@@ -5821,11 +4948,6 @@ babel-plugin-syntax-exponentiation-operator@^6.8.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
   integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=
 
-babel-plugin-syntax-jsx@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
-  integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
-
 babel-plugin-syntax-object-rest-spread@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
@@ -6272,11 +5394,6 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
 
-batch-processor@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/batch-processor/-/batch-processor-1.0.0.tgz#75c95c32b748e0850d10c2b168f6bdbe9891ace8"
-  integrity sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg=
-
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
@@ -6299,13 +5416,6 @@ before-after-hook@^2.2.0:
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
   integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
 
-better-opn@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/better-opn/-/better-opn-2.1.1.tgz#94a55b4695dc79288f31d7d0e5f658320759f7c6"
-  integrity sha512-kIPXZS5qwyKiX/HcRvDYfmBQUa8XP17I0mYZZ0y4UhpYOSvtsLHDYqmomS+Mj20aDvD3knEiQ0ecQy2nhio3yA==
-  dependencies:
-    open "^7.0.3"
-
 bfj@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/bfj/-/bfj-7.0.2.tgz#1988ce76f3add9ac2913fd8ba47aad9e651bfbb2"
@@ -6369,7 +5479,7 @@ blakejs@^1.1.0:
   resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.1.0.tgz#69df92ef953aa88ca51a32df6ab1c54a155fc7a5"
   integrity sha1-ad+S75U6qIylGjLfarHFShVfx6U=
 
-bluebird@^3.3.5, bluebird@^3.5.5:
+bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -6667,26 +5777,8 @@ bytes@3.0.0:
 
 bytes@3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-
-c8@^7.6.0:
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/c8/-/c8-7.7.2.tgz#30ff37b8125d96cab3eb065895a0b68dbc495a0f"
-  integrity sha512-8AqNnUMxB3hsgYCYso2GJjlwnaNPlrEEbYbCQb7N76V1nrOgCKXiTcE3gXU18rIj0FeduPywROrIBMC7XAKApg==
-  dependencies:
-    "@bcoe/v8-coverage" "^0.2.3"
-    "@istanbuljs/schema" "^0.1.2"
-    find-up "^5.0.0"
-    foreground-child "^2.0.0"
-    istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-report "^3.0.0"
-    istanbul-reports "^3.0.2"
-    rimraf "^3.0.0"
-    test-exclude "^6.0.0"
-    v8-to-istanbul "^7.1.0"
-    yargs "^16.2.0"
-    yargs-parser "^20.2.7"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
 cacache@^12.0.2:
   version "12.0.4"
@@ -6768,11 +5860,6 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
-call-me-maybe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
-  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
-
 caller-callsite@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
@@ -6864,11 +5951,6 @@ case-sensitive-paths-webpack-plugin@2.3.0:
   resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz#23ac613cc9a856e4f88ff8bb73bbb5e989825cf7"
   integrity sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ==
 
-case-sensitive-paths-webpack-plugin@^2.3.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4"
-  integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -7018,7 +6100,7 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.2.2, chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.4.3:
+chokidar@^3.2.2, chokidar@^3.4.1, chokidar@^3.4.3:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
   integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
@@ -7127,16 +6209,6 @@ cli-spinners@^2.5.0:
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.0.tgz#36c7dc98fb6a9a76bd6238ec3f77e2425627e939"
   integrity sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==
 
-cli-table3@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.0.tgz#b7b1bc65ca8e7b5cef9124e13dc2b21e2ce4faee"
-  integrity sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==
-  dependencies:
-    object-assign "^4.1.0"
-    string-width "^4.2.0"
-  optionalDependencies:
-    colors "^1.1.2"
-
 cli-truncate@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
@@ -7150,15 +6222,6 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-clipboard@^2.0.0:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.8.tgz#ffc6c103dd2967a83005f3f61976aa4655a4cdba"
-  integrity sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==
-  dependencies:
-    good-listener "^1.2.2"
-    select "^1.1.2"
-    tiny-emitter "^2.0.0"
-
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -7186,15 +6249,6 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
-
 clone-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
@@ -7315,11 +6369,6 @@ colorette@^1.2.1, colorette@^1.2.2:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
-colors@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
 combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -7341,7 +6390,7 @@ command-line-args@^4.0.7:
     find-replace "^1.0.3"
     typical "^2.6.1"
 
-commander@^2.16.0, commander@^2.19.0, commander@^2.20.0, commander@^2.20.3, commander@^2.8.1:
+commander@^2.16.0, commander@^2.20.0, commander@^2.20.3, commander@^2.8.1:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -7445,11 +6494,6 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 constant-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-3.0.4.tgz#3b84a9aeaf4cf31ec45e6bf5de91bdfb0589faf1"
@@ -7484,7 +6528,7 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@1.7.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@1.7.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -7542,7 +6586,7 @@ copy-to-clipboard@^3.2.0, copy-to-clipboard@^3.3.1:
   dependencies:
     toggle-selection "^1.0.6"
 
-core-js-compat@^3.6.2, core-js-compat@^3.8.1, core-js-compat@^3.9.0, core-js-compat@^3.9.1:
+core-js-compat@^3.6.2, core-js-compat@^3.9.0, core-js-compat@^3.9.1:
   version "3.12.1"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.1.tgz#2c302c4708505fa7072b0adb5156d26f7801a18b"
   integrity sha512-i6h5qODpw6EsHAoIdQhKoZdWn+dGBF3dSS8m5tif36RlWvW3A6+yu2S16QHUo3CrkzrnEskMAt9f8FxmY9fhWQ==
@@ -7550,7 +6594,7 @@ core-js-compat@^3.6.2, core-js-compat@^3.8.1, core-js-compat@^3.9.0, core-js-com
     browserslist "^4.16.6"
     semver "7.0.0"
 
-core-js-pure@^3.0.0, core-js-pure@^3.8.2:
+core-js-pure@^3.0.0:
   version "3.12.1"
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.12.1.tgz#934da8b9b7221e2a2443dc71dfa5bd77a7ea00b8"
   integrity sha512-1cch+qads4JnDSWsvc7d6nzlKAippwjUlf6vykkTLW53VSV+NkE6muGBToAjEA8pG90cSfcud3JgVmW2ds5TaQ==
@@ -7560,7 +6604,7 @@ core-js@^2.4.0, core-js@^2.5.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
-core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
+core-js@^3.6.5:
   version "3.12.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.12.1.tgz#6b5af4ff55616c08a44d386f1f510917ff204112"
   integrity sha512-Ne9DKPHTObRuB09Dru5AjwKjY4cJHVGu+y5f7coGn1E9Grkc3p2iBwE9AI/nJzsE29mQF7oq+mhYYRqOMFN1Bw==
@@ -7609,31 +6653,6 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-cp-file@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-7.0.0.tgz#b9454cfd07fe3b974ab9ea0e5f29655791a9b8cd"
-  integrity sha512-0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    make-dir "^3.0.0"
-    nested-error-stacks "^2.0.0"
-    p-event "^4.1.0"
-
-cpy@^8.1.1:
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/cpy/-/cpy-8.1.2.tgz#e339ea54797ad23f8e3919a5cffd37bfc3f25935"
-  integrity sha512-dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg==
-  dependencies:
-    arrify "^2.0.1"
-    cp-file "^7.0.0"
-    globby "^9.2.0"
-    has-glob "^1.0.0"
-    junk "^3.1.0"
-    nested-error-stacks "^2.1.0"
-    p-all "^2.1.0"
-    p-filter "^2.1.0"
-    p-map "^3.0.0"
-
 create-ecdh@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
@@ -7672,14 +6691,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-create-react-context@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.3.0.tgz#546dede9dc422def0d3fc2fe03afe0bc0f4f7d8c"
-  integrity sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==
-  dependencies:
-    gud "^1.0.0"
-    warning "^4.0.3"
-
 create-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
@@ -7800,25 +6811,6 @@ css-loader@4.3.0:
     schema-utils "^2.7.1"
     semver "^7.3.2"
 
-css-loader@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"
-  integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==
-  dependencies:
-    camelcase "^5.3.1"
-    cssesc "^3.0.0"
-    icss-utils "^4.1.1"
-    loader-utils "^1.2.3"
-    normalize-path "^3.0.0"
-    postcss "^7.0.32"
-    postcss-modules-extract-imports "^2.0.0"
-    postcss-modules-local-by-default "^3.0.2"
-    postcss-modules-scope "^2.2.0"
-    postcss-modules-values "^3.0.0"
-    postcss-value-parser "^4.1.0"
-    schema-utils "^2.7.0"
-    semver "^6.3.0"
-
 css-loader@^5.2.6:
   version "5.2.7"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae"
@@ -8000,11 +6992,6 @@ cssstyle@^2.3.0:
   dependencies:
     cssom "~0.3.6"
 
-csstype@^2.5.7:
-  version "2.6.17"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.17.tgz#4cf30eb87e1d1a005d8b6510f95292413f6a1c0e"
-  integrity sha512-u1wmTI1jJGzCJzWndZo8mk4wnPTZd1eOIYTYvuEyOQGfmDl3TrabCCfKnOC86FZwW/9djqTl933UF/cS425i9A==
-
 csstype@^3.0.2:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"
@@ -8153,7 +7140,7 @@ debug@=3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.0, debug@^3.1.1, debug@^3.2.6, debug@^3.2.7:
+debug@^3.1.1, debug@^3.2.6, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -8221,11 +7208,6 @@ deep-is@^0.1.3, deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-deep-object-diff@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.0.tgz#d6fabf476c2ed1751fc94d5ca693d2ed8c18bc5a"
-  integrity sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw==
-
 deepmerge@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
@@ -8322,16 +7304,6 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-delegate@^3.1.2:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
-  integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -8406,14 +7378,6 @@ detect-port-alt@1.1.6:
     address "^1.0.1"
     debug "^2.6.0"
 
-detect-port@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.3.0.tgz#d9c40e9accadd4df5cac6a782aefd014d573d1f1"
-  integrity sha512-E+B1gzkl2gqxt1IhUzwjrxBKRqx1UzC3WLONHinn8S3T6lwV/agVCyitiFOsGJ/eYuEUBvD71MZHy3Pv1G9doQ==
-  dependencies:
-    address "^1.0.1"
-    debug "^2.6.0"
-
 detective-amd@^3.0.1:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/detective-amd/-/detective-amd-3.1.0.tgz#92daee3214a0ca4522646cf333cac90a3fca6373"
@@ -8525,13 +7489,6 @@ dijkstrajs@^1.0.1:
   resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b"
   integrity sha1-082BIh4+pAdCz83lVtTpnpjdxxs=
 
-dir-glob@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
-  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
-  dependencies:
-    path-type "^3.0.0"
-
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -8665,13 +7622,6 @@ dot-prop@^5.2.0:
   dependencies:
     is-obj "^2.0.0"
 
-dotenv-defaults@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/dotenv-defaults/-/dotenv-defaults-1.1.1.tgz#032c024f4b5906d9990eb06d722dc74cc60ec1bd"
-  integrity sha512-6fPRo9o/3MxKvmRZBD3oNFdxODdhJtIy1zcJeUSCs6HCy4tarUpd+G67UTU9tF6OWXeSPqsm4fPAB+2eY9Rt9Q==
-  dependencies:
-    dotenv "^6.2.0"
-
 dotenv-defaults@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dotenv-defaults/-/dotenv-defaults-2.0.2.tgz#6b3ec2e4319aafb70940abda72d3856770ee77ac"
@@ -8679,18 +7629,11 @@ dotenv-defaults@^2.0.2:
   dependencies:
     dotenv "^8.2.0"
 
-dotenv-expand@5.1.0, dotenv-expand@^5.1.0:
+dotenv-expand@5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
   integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
-dotenv-webpack@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.8.0.tgz#7ca79cef2497dd4079d43e81e0796bc9d0f68a5e"
-  integrity sha512-o8pq6NLBehtrqA8Jv8jFQNtG9nhRtVqmoD4yWbgUyoU3+9WBlPe+c2EAiaJok9RB28QvrWvdWLZGeTT5aATDMg==
-  dependencies:
-    dotenv-defaults "^1.0.2"
-
 dotenv-webpack@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-7.0.3.tgz#f50ec3c7083a69ec6076e110566720003b7b107b"
@@ -8703,12 +7646,7 @@ dotenv@8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
   integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
-dotenv@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
-  integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
-
-dotenv@^8.0.0, dotenv@^8.2.0:
+dotenv@^8.2.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
   integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
@@ -8720,16 +7658,6 @@ dotignore@~0.1.2:
   dependencies:
     minimatch "^3.0.4"
 
-downshift@^6.0.15:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/downshift/-/downshift-6.1.3.tgz#e794b7805d24810968f21e81ad6bdd9f3fdc40da"
-  integrity sha512-RA1MuaNcTbt0j+sVLhSs8R2oZbBXYAtdQP/V+uHhT3DoDteZzJPjlC+LQVm9T07Wpvo84QXaZtUCePLDTDwGXg==
-  dependencies:
-    "@babel/runtime" "^7.13.10"
-    compute-scroll-into-view "^1.0.17"
-    prop-types "^15.7.2"
-    react-is "^17.0.2"
-
 drbg.js@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/drbg.js/-/drbg.js-1.0.1.tgz#3e36b6c42b37043823cdbc332d58f31e2445480b"
@@ -8808,13 +7736,6 @@ elegant-spinner@^1.0.1:
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
   integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
 
-element-resize-detector@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.2.2.tgz#bf7c3ff915957e4e62e86241ed2f9c86b078892b"
-  integrity sha512-+LOXRkCJc4I5WhEJxIDjhmE3raF8jtOMBDqSCgZTMz2TX3oXAX5pE2+MDeopJlGdXzP7KzPbBJaUGfNaP9HG4A==
-  dependencies:
-    batch-processor "1.0.0"
-
 elliptic@6.5.4, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
@@ -8863,15 +7784,6 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-emotion-theming@^10.0.27:
-  version "10.0.27"
-  resolved "https://registry.yarnpkg.com/emotion-theming/-/emotion-theming-10.0.27.tgz#1887baaec15199862c89b1b984b79806f2b9ab10"
-  integrity sha512-MlF1yu/gYh8u+sLUqA0YuA9JX0P4Hb69WlKc/9OLo+WCXuX6sy/KoIa+qJimgmr2dWqnypYKYPX37esjDBbhdw==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    "@emotion/weak-memoize" "0.2.5"
-    hoist-non-react-statics "^3.3.0"
-
 enc-utils@3.0.0, enc-utils@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/enc-utils/-/enc-utils-3.0.0.tgz#65935d2d6a867fa0ae995f05f3a2f055ce764dcf"
@@ -8899,16 +7811,7 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-endent@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/endent/-/endent-2.0.1.tgz#fb18383a3f37ae3213a5d9f6c4a880d1061eb4c5"
-  integrity sha512-mADztvcC+vCk4XEZaCz6xIPO2NHQuprv5CAEjuVAu6aZwqAj7nVNlMyl1goPFYqCCpS2OJV9jwpumJLkotZrNw==
-  dependencies:
-    dedent "^0.7.0"
-    fast-json-parse "^1.0.3"
-    objectorarray "^1.0.4"
-
-enhanced-resolve@^4.0.0, enhanced-resolve@^4.3.0, enhanced-resolve@^4.5.0:
+enhanced-resolve@^4.0.0, enhanced-resolve@^4.3.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
   integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
@@ -8970,7 +7873,7 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.17.0-next.0, es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
+es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
   integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
@@ -8992,25 +7895,6 @@ es-abstract@^1.17.0-next.0, es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.0"
 
-es-array-method-boxes-properly@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
-  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
-
-es-get-iterator@^1.0.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz#9234c54aba713486d7ebde0220864af5e2b283f7"
-  integrity sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.0"
-    has-symbols "^1.0.1"
-    is-arguments "^1.1.0"
-    is-map "^2.0.2"
-    is-set "^2.0.2"
-    is-string "^1.0.5"
-    isarray "^2.0.5"
-
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -9029,11 +7913,6 @@ es5-ext@^0.10.35, es5-ext@^0.10.50:
     es6-symbol "~3.1.3"
     next-tick "~1.0.0"
 
-es5-shim@^4.5.13:
-  version "4.5.15"
-  resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.15.tgz#6a26869b261854a3b045273f5583c52d390217fe"
-  integrity sha512-FYpuxEjMeDvU4rulKqFdukQyZSTpzhg4ScQHrAosrlVpR6GFyaw14f74yn2+4BugniIS0Frpg7TvwZocU4ZMTw==
-
 es6-iterator@2.0.3, es6-iterator@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
@@ -9043,11 +7922,6 @@ es6-iterator@2.0.3, es6-iterator@~2.0.3:
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
-es6-shim@^0.35.5:
-  version "0.35.6"
-  resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.6.tgz#d10578301a83af2de58b9eadb7c2c9945f7388a0"
-  integrity sha512-EmTr31wppcaIAgblChZiuN/l9Y7DPyw8Xtbg7fIVngn6zMW+IEBJDJngeKC3x6wr0V/vcA2wqeFnaw1bFJbDdA==
-
 es6-symbol@^3.1.1, es6-symbol@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
@@ -9405,15 +8279,6 @@ estraverse@^5.1.0, estraverse@^5.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
   integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
 
-estree-to-babel@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/estree-to-babel/-/estree-to-babel-3.2.1.tgz#82e78315275c3ca74475fdc8ac1a5103c8a75bf5"
-  integrity sha512-YNF+mZ/Wu2FU/gvmzuWtYc8rloubL7wfXCTgouFrnjGVXPA/EeYYA7pupXWrb3Iv1cTBeSSxxJIbK23l4MRNqg==
-  dependencies:
-    "@babel/traverse" "^7.1.6"
-    "@babel/types" "^7.2.0"
-    c8 "^7.6.0"
-
 estree-walker@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
@@ -10026,7 +8891,7 @@ fancy-canvas@0.2.2:
   resolved "https://registry.yarnpkg.com/fancy-canvas/-/fancy-canvas-0.2.2.tgz#33fd4976724169a1eda5015f515a2a1302d1ec91"
   integrity sha512-50qi8xA0QkHbjmb8h7XQ6k2fvD7y/yMfiUw9YTarJ7rWrq6o5/3CCXPouYk+XSLASvvxtjyiQLRBFt3qkE3oyA==
 
-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
+fast-deep-equal@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -10036,18 +8901,6 @@ fast-equals@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-2.0.3.tgz#7039b0a039909f345a2ce53f6202a14e5f392efc"
   integrity sha512-0EMw4TTUxsMDpDkCg0rXor2gsg+npVrMIHbEhvD0HZyIhUX6AktC/yasm+qKwfyswd06Qy95ZKk8p2crTo0iPA==
 
-fast-glob@^2.2.6:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
-  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
-  dependencies:
-    "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.1.2"
-    glob-parent "^3.1.0"
-    is-glob "^4.0.0"
-    merge2 "^1.2.3"
-    micromatch "^3.1.10"
-
 fast-glob@^3.1.1:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
@@ -10060,11 +8913,6 @@ fast-glob@^3.1.1:
     micromatch "^4.0.2"
     picomatch "^2.2.1"
 
-fast-json-parse@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/fast-json-parse/-/fast-json-parse-1.0.3.tgz#43e5c61ee4efa9265633046b770fb682a7577c4d"
-  integrity sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==
-
 fast-json-patch@^3.0.0-1:
   version "3.0.0-1"
   resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.0.0-1.tgz#4c68f2e7acfbab6d29d1719c44be51899c93dabb"
@@ -10092,13 +8940,6 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-fault@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13"
-  integrity sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==
-  dependencies:
-    format "^0.2.0"
-
 faye-websocket@^0.11.3:
   version "0.11.3"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
@@ -10177,15 +9018,6 @@ file-loader@^6.2.0:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
-file-system-cache@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/file-system-cache/-/file-system-cache-1.0.5.tgz#84259b36a2bbb8d3d6eb1021d3132ffe64cfff4f"
-  integrity sha1-hCWbNqK7uNPW6xAh0xMv/mTP/08=
-  dependencies:
-    bluebird "^3.3.5"
-    fs-extra "^0.30.0"
-    ramda "^0.21.0"
-
 file-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
@@ -10232,11 +9064,6 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-filter-obj@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
-  integrity sha1-mzERErxsYSehbgFsbF1/GeCAXFs=
-
 finalhandler@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
@@ -10250,7 +9077,7 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
+find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
   integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
@@ -10276,11 +9103,6 @@ find-replace@^1.0.3:
     array-back "^1.0.4"
     test-value "^2.1.0"
 
-find-root@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
-  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
-
 find-up@4.1.0, find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -10303,14 +9125,6 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -10380,20 +9194,12 @@ foreach@^2.0.5:
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
   integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
 
-foreground-child@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-2.0.0.tgz#71b32800c9f15aa8f2f83f4a6bd9bff35d861a53"
-  integrity sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==
-  dependencies:
-    cross-spawn "^7.0.0"
-    signal-exit "^3.0.2"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-fork-ts-checker-webpack-plugin@4.1.6, fork-ts-checker-webpack-plugin@^4.1.6:
+fork-ts-checker-webpack-plugin@4.1.6:
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz#5055c703febcf37fa06405d400c122b905167fc5"
   integrity sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==
@@ -10406,25 +9212,6 @@ fork-ts-checker-webpack-plugin@4.1.6, fork-ts-checker-webpack-plugin@^4.1.6:
     tapable "^1.0.0"
     worker-rpc "^0.1.0"
 
-fork-ts-checker-webpack-plugin@^6.0.4:
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.9.tgz#08f51b685a48b09ab3ec079a8501762422443120"
-  integrity sha512-D/KSb/2VeiOy3odDerrC16WiZ1t5TLwiFfZmuDeTXcf3Km79M+f8nTCIdKkokxybybrgMcStbx0QpGaseePxnA==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@types/json-schema" "^7.0.5"
-    chalk "^4.1.0"
-    chokidar "^3.4.2"
-    cosmiconfig "^6.0.0"
-    deepmerge "^4.2.2"
-    fs-extra "^9.0.0"
-    glob "^7.1.6"
-    memfs "^3.1.2"
-    minimatch "^3.0.4"
-    schema-utils "2.7.0"
-    semver "^7.3.2"
-    tapable "^1.0.0"
-
 form-data@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
@@ -10452,11 +9239,6 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-format@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
-  integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=
-
 formik@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/formik/-/formik-2.2.6.tgz#378a4bafe4b95caf6acf6db01f81f3fe5147559d"
@@ -10507,17 +9289,6 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-extra@^0.30.0:
-  version "0.30.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
-  integrity sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
-    path-is-absolute "^1.0.0"
-    rimraf "^2.2.8"
-
 fs-extra@^7.0.0:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
@@ -10536,7 +9307,7 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.0.0, fs-extra@^9.0.1:
+fs-extra@^9.0.1:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -10553,11 +9324,6 @@ fs-minipass@^2.0.0:
   dependencies:
     minipass "^3.0.0"
 
-fs-monkey@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
-  integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
-
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -10598,45 +9364,11 @@ function.name@^1.0.3:
   dependencies:
     noop6 "^1.0.1"
 
-function.prototype.name@^1.1.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.4.tgz#e4ea839b9d3672ae99d0efd9f38d9191c5eaac83"
-  integrity sha512-iqy1pIotY/RmhdFZygSSlW0wko2yxkSCKqsuv4pr8QESohpYyG/Z7B/XXvPRKTJS//960rgguE5mSRUsDdaJrQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.2"
-    functions-have-names "^1.2.2"
-
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-functions-have-names@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz#98d93991c39da9361f8e50b337c4f6e41f120e21"
-  integrity sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA==
-
-fuse.js@^3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.6.1.tgz#7de85fdd6e1b3377c23ce010892656385fd9b10c"
-  integrity sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw==
-
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
 gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -10730,21 +9462,6 @@ git-up@^1.0.0:
     is-ssh "^1.0.0"
     parse-url "^1.0.0"
 
-git-up@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.2.tgz#10c3d731051b366dc19d3df454bfca3f77913a7c"
-  integrity sha512-kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ==
-  dependencies:
-    is-ssh "^1.3.0"
-    parse-url "^5.0.0"
-
-git-url-parse@^11.1.2:
-  version "11.4.4"
-  resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.4.4.tgz#5d747debc2469c17bc385719f7d0427802d83d77"
-  integrity sha512-Y4o9o7vQngQDIU9IjyCmRJBin5iYjI5u9ZITnddRZpD7dcCFQj2sL2XuMNbLRE4b4B/4ENPsp2Q8P44fjAZ0Pw==
-  dependencies:
-    git-up "^4.0.0"
-
 git-url-parse@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-5.0.1.tgz#fe3d79c6746ae05048cfa508c81e79dddbba3843"
@@ -10759,21 +9476,6 @@ github-slugger@^1.0.0:
   dependencies:
     emoji-regex ">=6.0.0 <=6.1.1"
 
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
-  dependencies:
-    is-glob "^2.0.0"
-
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -10789,19 +9491,7 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
-glob-promise@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-3.4.0.tgz#b6b8f084504216f702dc2ce8c9bc9ac8866fdb20"
-  integrity sha512-q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw==
-  dependencies:
-    "@types/glob" "*"
-
-glob-to-regexp@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
-  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
-
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.6:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.6:
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
   integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
@@ -10836,7 +9526,7 @@ global-prefix@^3.0.0:
     kind-of "^6.0.2"
     which "^1.3.1"
 
-global@^4.4.0, global@~4.4.0:
+global@~4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
   integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
@@ -10868,13 +9558,6 @@ globals@^9.18.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
   integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
-globalthis@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b"
-  integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==
-  dependencies:
-    define-properties "^1.1.3"
-
 globby@11.0.1:
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
@@ -10910,20 +9593,6 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globby@^9.2.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
-  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    array-union "^1.0.2"
-    dir-glob "^2.2.2"
-    fast-glob "^2.2.6"
-    glob "^7.1.3"
-    ignore "^4.0.3"
-    pify "^4.0.1"
-    slash "^2.0.0"
-
 gonzales-pe@^4.2.3:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
@@ -10931,13 +9600,6 @@ gonzales-pe@^4.2.3:
   dependencies:
     minimist "^1.2.5"
 
-good-listener@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
-  integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=
-  dependencies:
-    delegate "^3.1.2"
-
 got@^5.0.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/got/-/got-5.7.1.tgz#5f81635a61e4a6589f180569ea4e381680a51f35"
@@ -10976,7 +9638,7 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
   version "4.2.6"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
   integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
@@ -11047,11 +9709,6 @@ gry@^5.0.0:
     one-by-one "^3.0.0"
     ul "^5.0.0"
 
-gud@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0"
-  integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==
-
 gzip-size@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
@@ -11105,23 +9762,11 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-glob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-glob/-/has-glob-1.0.0.tgz#9aaa9eedbffb1ba3990a7b0010fb678ee0081207"
-  integrity sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=
-  dependencies:
-    is-glob "^3.0.0"
-
 has-symbols@^1.0.1, has-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -11308,11 +9953,6 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-highlight.js@^10.1.1, highlight.js@~10.7.0:
-  version "10.7.2"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.2.tgz#89319b861edc66c48854ed1e6da21ea89f847360"
-  integrity sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==
-
 history@^4.9.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
@@ -11386,7 +10026,7 @@ html-encoding-sniffer@^2.0.1:
   dependencies:
     whatwg-encoding "^1.0.5"
 
-html-entities@^1.2.0, html-entities@^1.2.1, html-entities@^1.3.1:
+html-entities@^1.2.1, html-entities@^1.3.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
   integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
@@ -11429,21 +10069,6 @@ html-webpack-plugin@4.5.0:
     tapable "^1.1.3"
     util.promisify "1.0.0"
 
-html-webpack-plugin@^4.0.0:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz#76fc83fa1a0f12dd5f7da0404a54e2699666bc12"
-  integrity sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==
-  dependencies:
-    "@types/html-minifier-terser" "^5.0.0"
-    "@types/tapable" "^1.0.5"
-    "@types/webpack" "^4.41.8"
-    html-minifier-terser "^5.0.1"
-    loader-utils "^1.2.3"
-    lodash "^4.17.20"
-    pretty-error "^2.1.1"
-    tapable "^1.1.3"
-    util.promisify "1.0.0"
-
 htmlparser2@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
@@ -11616,7 +10241,7 @@ ignore-loader@^0.1.2:
   resolved "https://registry.yarnpkg.com/ignore-loader/-/ignore-loader-0.1.2.tgz#d81f240376d0ba4f0d778972c3ad25874117a463"
   integrity sha1-2B8kA3bQuk8Nd4lyw60lh0EXpGM=
 
-ignore@^4.0.3, ignore@^4.0.6:
+ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
@@ -11808,17 +10433,7 @@ internmap@^1.0.0:
   resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95"
   integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==
 
-interpret@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
-  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
-
-interpret@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
-  integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
-
-invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4:
+invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -11877,7 +10492,7 @@ is-alphanumerical@^1.0.0:
     is-alphabetical "^1.0.0"
     is-decimal "^1.0.0"
 
-is-arguments@^1.0.4, is-arguments@^1.1.0:
+is-arguments@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
   integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
@@ -12025,11 +10640,6 @@ is-extendable@^1.0.1:
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
-
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -12062,7 +10672,7 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-function@^1.0.1, is-function@^1.0.2:
+is-function@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08"
   integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==
@@ -12084,14 +10694,7 @@ is-glob@4.0.1, is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-glob@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
-  dependencies:
-    is-extglob "^1.0.0"
-
-is-glob@^3.0.0, is-glob@^3.1.0:
+is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
   integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
@@ -12128,11 +10731,6 @@ is-lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-is-map@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
-  integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
-
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
@@ -12293,11 +10891,6 @@ is-root@2.1.0:
   resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
   integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==
 
-is-set@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
-  integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
-
 is-ssh@^1.0.0, is-ssh@^1.3.0:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.3.tgz#7f133285ccd7f2c2c7fc897b771b53d95a2b2c7e"
@@ -12397,7 +10990,7 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isarray@^2.0.1, isarray@^2.0.5:
+isarray@^2.0.1:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
@@ -12419,11 +11012,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isobject@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
-  integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
-
 isomorphic-fetch@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
@@ -12496,24 +11084,11 @@ iterall@^1.2.1:
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea"
   integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==
 
-iterate-iterator@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/iterate-iterator/-/iterate-iterator-1.0.1.tgz#1693a768c1ddd79c969051459453f082fe82e9f6"
-  integrity sha512-3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw==
-
 iterate-object@^1.1.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/iterate-object/-/iterate-object-1.3.4.tgz#fa50b1d9e58e340a7dd6b4c98c8a5e182e790096"
   integrity sha512-4dG1D1x/7g8PwHS9aK6QV5V94+ZvyP4+d19qDv43EzImmrndysIl4prmJ1hWWIGCqrZHyaHBm6BSEWHOLnpoNw==
 
-iterate-value@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/iterate-value/-/iterate-value-1.0.2.tgz#935115bd37d006a52046535ebc8d07e9c9337f57"
-  integrity sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==
-  dependencies:
-    es-get-iterator "^1.0.2"
-    iterate-iterator "^1.0.1"
-
 jest-changed-files@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
@@ -12931,7 +11506,7 @@ jest-worker@^24.9.0:
     merge-stream "^2.0.0"
     supports-color "^6.1.0"
 
-jest-worker@^26.2.1, jest-worker@^26.5.0, jest-worker@^26.6.2:
+jest-worker@^26.5.0, jest-worker@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
   integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
@@ -13165,20 +11740,13 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.1.3:
+json5@^2.1.2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
   integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
   dependencies:
     minimist "^1.2.5"
 
-jsonfile@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -13234,11 +11802,6 @@ jsprim@^1.2.2:
     array-includes "^3.1.2"
     object.assign "^4.1.2"
 
-junk@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
-  integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
-
 jwa@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
@@ -13315,13 +11878,6 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-klaw@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk=
-  optionalDependencies:
-    graceful-fs "^4.1.9"
-
 kleur@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -13359,17 +11915,6 @@ latest-version@5.1.0, latest-version@^5.0.0:
   dependencies:
     package-json "^6.3.0"
 
-lazy-universal-dotenv@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lazy-universal-dotenv/-/lazy-universal-dotenv-3.0.1.tgz#a6c8938414bca426ab8c9463940da451a911db38"
-  integrity sha512-prXSYk799h3GY3iOWnC6ZigYzMPjxN2svgjJ9shk7oMadSNX3wXy0B6F32PMJv7qtMnrIbUxoEHzbutvxR2LBQ==
-  dependencies:
-    "@babel/runtime" "^7.5.0"
-    app-root-dir "^1.0.2"
-    core-js "^3.0.4"
-    dotenv "^8.0.0"
-    dotenv-expand "^5.1.0"
-
 less-bundle-promise@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/less-bundle-promise/-/less-bundle-promise-1.0.7.tgz#198d7991ac4f5f3c7862fac1074c7b9aca7b9cb2"
@@ -13624,13 +12169,6 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
 lodash-es@^4.17.14, lodash-es@^4.17.15:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
@@ -13811,14 +12349,6 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
-lowlight@^1.14.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.20.0.tgz#ddb197d33462ad0d93bf19d17b6c301aa3941888"
-  integrity sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==
-  dependencies:
-    fault "^1.0.0"
-    highlight.js "~10.7.0"
-
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -13905,11 +12435,6 @@ map-cache@^0.2.2:
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
-map-or-similar@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/map-or-similar/-/map-or-similar-1.5.0.tgz#6de2653174adfb5d9edc33c69d3e92a1b76faf08"
-  integrity sha1-beJlMXSt+12e3DPGnT6Sobdvrwg=
-
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
@@ -13924,19 +12449,6 @@ markdown-table@^2.0.0:
   dependencies:
     repeat-string "^1.0.0"
 
-markdown-to-jsx@^6.11.4:
-  version "6.11.4"
-  resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-6.11.4.tgz#b4528b1ab668aef7fe61c1535c27e837819392c5"
-  integrity sha512-3lRCD5Sh+tfA52iGgfs/XZiw33f7fFX9Bn55aNnVNUd2GzLDkOWyKYYD8Yju2B1Vn+feiEdgJs8T6Tg0xNokPw==
-  dependencies:
-    prop-types "^15.6.2"
-    unquote "^1.1.0"
-
-markdown-to-jsx@^7.1.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-7.1.2.tgz#19d3da4cd8864045cdd13a0d179147fbd6a088d4"
-  integrity sha512-O8DMCl32V34RrD+ZHxcAPc2+kYytuDIoQYjY36RVdsLK7uHjgNVvFec4yv0X6LgB4YEZgSvK5QtFi5YVqEpoMA==
-
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -14083,20 +12595,6 @@ memdown@^1.0.0:
     ltgt "~2.2.0"
     safe-buffer "~5.1.1"
 
-memfs@^3.1.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.2.2.tgz#5de461389d596e3f23d48bb7c2afb6161f4df40e"
-  integrity sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==
-  dependencies:
-    fs-monkey "1.0.3"
-
-memoizerific@^1.11.3:
-  version "1.11.3"
-  resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a"
-  integrity sha1-fIekZGREwy11Q4VwkF8tvRsagFo=
-  dependencies:
-    map-or-similar "^1.5.0"
-
 memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -14123,7 +12621,7 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.2.3, merge2@^1.3.0:
+merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -14294,11 +12792,6 @@ min-document@^2.19.0:
   dependencies:
     dom-walk "^0.1.0"
 
-min-indent@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
-  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
-
 mini-create-react-context@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e"
@@ -14335,7 +12828,7 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
+minimatch@3.0.4, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -14602,11 +13095,6 @@ neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-nested-error-stacks@^2.0.0, nested-error-stacks@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz#0fbdcf3e13fe4994781280524f8b96b0cdff9c61"
-  integrity sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==
-
 next-tick@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
@@ -14630,13 +13118,6 @@ node-addon-api@^2.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32"
   integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==
 
-node-dir@^0.1.10:
-  version "0.1.17"
-  resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
-  integrity sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=
-  dependencies:
-    minimatch "^3.0.2"
-
 node-fetch@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5"
@@ -14798,7 +13279,7 @@ normalize-url@1.9.1:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
-normalize-url@^3.0.0, normalize-url@^3.3.0:
+normalize-url@^3.0.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
@@ -14822,16 +13303,6 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-npmlog@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
 nth-check@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -14943,7 +13414,7 @@ object.entries@^1.1.0, object.entries@^1.1.3:
     es-abstract "^1.18.0-next.1"
     has "^1.0.3"
 
-"object.fromentries@^2.0.0 || ^1.0.0", object.fromentries@^2.0.4:
+object.fromentries@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz#26e1ba5c4571c5c6f0890cef4473066456a120b8"
   integrity sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==
@@ -14953,7 +13424,7 @@ object.entries@^1.1.0, object.entries@^1.1.3:
     es-abstract "^1.18.0-next.2"
     has "^1.0.3"
 
-object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0, object.getownpropertydescriptors@^2.1.2:
+object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7"
   integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==
@@ -14979,11 +13450,6 @@ object.values@^1.1.0, object.values@^1.1.3:
     es-abstract "^1.18.0-next.2"
     has "^1.0.3"
 
-objectorarray@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/objectorarray/-/objectorarray-1.0.4.tgz#d69b2f0ff7dc2701903d308bb85882f4ddb49483"
-  integrity sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w==
-
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
@@ -15030,7 +13496,7 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@^7.0.2, open@^7.0.3:
+open@^7.0.2:
   version "7.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
   integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
@@ -15121,18 +13587,6 @@ os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-overlayscrollbars@^1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/overlayscrollbars/-/overlayscrollbars-1.13.1.tgz#0b840a88737f43a946b9d87875a2f9e421d0338a"
-  integrity sha512-gIQfzgGgu1wy80EB4/6DaJGHMEGmizq27xHIESrzXq0Y/J0Ay1P3DWk6tuVmEPIZH15zaBlxeEJOqdJKmowHCQ==
-
-p-all@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-all/-/p-all-2.1.0.tgz#91419be56b7dee8fe4c5db875d55e0da084244a0"
-  integrity sha512-HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA==
-  dependencies:
-    p-map "^2.0.0"
-
 p-cancelable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
@@ -15143,20 +13597,6 @@ p-each-series@^2.1.0:
   resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
   integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==
 
-p-event@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/p-event/-/p-event-4.2.0.tgz#af4b049c8acd91ae81083ebd1e6f5cae2044c1b5"
-  integrity sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==
-  dependencies:
-    p-timeout "^3.1.0"
-
-p-filter@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-filter/-/p-filter-2.1.0.tgz#1b1472562ae7a0f742f0f3d3d3718ea66ff9c09c"
-  integrity sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==
-  dependencies:
-    p-map "^2.0.0"
-
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -15204,25 +13644,11 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
 p-map@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
   integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
-p-map@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
-  integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
 p-map@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
@@ -15237,13 +13663,6 @@ p-retry@^3.0.1:
   dependencies:
     retry "^0.12.0"
 
-p-timeout@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
-  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
-  dependencies:
-    p-finally "^1.0.0"
-
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -15382,21 +13801,6 @@ parse-node-version@^1.0.1:
   resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
   integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
 
-parse-path@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.3.tgz#82d81ec3e071dcc4ab49aa9f2c9c0b8966bb22bf"
-  integrity sha512-9Cepbp2asKnWTJ9x2kpw6Fe8y9JDbqwahGCTvklzd/cEq5C5JC59x2Xb0Kx+x0QZ8bvNquGO8/BWP0cwBHzSAA==
-  dependencies:
-    is-ssh "^1.3.0"
-    protocols "^1.4.0"
-    qs "^6.9.4"
-    query-string "^6.13.8"
-
-parse-repo@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/parse-repo/-/parse-repo-1.0.4.tgz#74b91d2cb8675d11b99976a0065f6ce17fa1bcc8"
-  integrity sha1-dLkdLLhnXRG5mXagBl9s4X+hvMg=
-
 parse-url@^1.0.0:
   version "1.3.11"
   resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-1.3.11.tgz#57c15428ab8a892b1f43869645c711d0e144b554"
@@ -15405,16 +13809,6 @@ parse-url@^1.0.0:
     is-ssh "^1.3.0"
     protocols "^1.4.0"
 
-parse-url@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.2.tgz#856a3be1fcdf78dc93fc8b3791f169072d898b59"
-  integrity sha512-Czj+GIit4cdWtxo3ISZCvLiUjErSo0iI3wJ+q9Oi3QuMYTI6OZu+7cewMWZ+C1YAnKhYTk6/TLuhIgCypLthPA==
-  dependencies:
-    is-ssh "^1.3.0"
-    normalize-url "^3.3.0"
-    parse-path "^4.0.0"
-    protocols "^1.4.0"
-
 parse5@6.0.1, parse5@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
@@ -15580,7 +13974,7 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pirates@^4.0.0, pirates@^4.0.1:
+pirates@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
   integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
@@ -15608,13 +14002,6 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-dir@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
-  integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
-  dependencies:
-    find-up "^5.0.0"
-
 pkg-up@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
@@ -15653,13 +14040,6 @@ pocket-js-core@0.0.3:
   dependencies:
     axios "^0.18.0"
 
-polished@^4.0.5:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/polished/-/polished-4.1.2.tgz#c04fcc203e287e2d866e9cfcaf102dae1c01a816"
-  integrity sha512-jq4t3PJUpVRcveC53nnbEX35VyQI05x3tniwp26WFdm1dwaNUBHAi5awa/roBlwQxx1uRhwNSYeAi/aMbfiJCQ==
-  dependencies:
-    "@babel/runtime" "^7.13.17"
-
 portfinder@^1.0.26:
   version "1.0.28"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
@@ -15834,7 +14214,7 @@ postcss-env-function@^2.0.2:
     postcss "^7.0.2"
     postcss-values-parser "^2.0.0"
 
-postcss-flexbugs-fixes@4.2.1, postcss-flexbugs-fixes@^4.2.1:
+postcss-flexbugs-fixes@4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz#9218a65249f30897deab1033aced8578562a6690"
   integrity sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==
@@ -15918,17 +14298,6 @@ postcss-loader@3.0.0:
     postcss-load-config "^2.0.0"
     schema-utils "^1.0.0"
 
-postcss-loader@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.3.0.tgz#2c4de9657cd4f07af5ab42bd60a673004da1b8cc"
-  integrity sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==
-  dependencies:
-    cosmiconfig "^7.0.0"
-    klona "^2.0.4"
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-    semver "^7.3.4"
-
 postcss-logical@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-3.0.0.tgz#2495d0f8b82e9f262725f75f9401b34e7b45d5b5"
@@ -16017,7 +14386,7 @@ postcss-modules-extract-imports@^3.0.0:
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
   integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
 
-postcss-modules-local-by-default@^3.0.2, postcss-modules-local-by-default@^3.0.3:
+postcss-modules-local-by-default@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"
   integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==
@@ -16378,7 +14747,7 @@ postcss@^6.0.21:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.5, postcss@^7.0.6:
+postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.35"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
   integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
@@ -16487,11 +14856,6 @@ pretty-format@^26.6.0, pretty-format@^26.6.2:
     ansi-styles "^4.0.0"
     react-is "^17.0.1"
 
-pretty-hrtime@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
-  integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
-
 pretty-ms@^7.0.0:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-7.0.1.tgz#7d903eaab281f7d8e03c66f867e239dc32fb73e8"
@@ -16499,13 +14863,6 @@ pretty-ms@^7.0.0:
   dependencies:
     parse-ms "^2.1.0"
 
-prismjs@^1.21.0, prismjs@~1.23.0:
-  version "1.23.0"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33"
-  integrity sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA==
-  optionalDependencies:
-    clipboard "^2.0.0"
-
 prismjs@~1.24.0:
   version "1.24.1"
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.24.1.tgz#c4d7895c4d6500289482fa8936d9cdd192684036"
@@ -16544,27 +14901,6 @@ promise-to-callback@^1.0.0:
     is-fn "^1.0.0"
     set-immediate-shim "^1.0.1"
 
-promise.allsettled@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/promise.allsettled/-/promise.allsettled-1.0.4.tgz#65e71f2a604082ed69c548b68603294090ee6803"
-  integrity sha512-o73CbvQh/OnPFShxHcHxk0baXR2a1m4ozb85ha0H14VEoi/EJJLa9mnPfEWJx9RjA9MLfhdjZ8I6HhWtBa64Ag==
-  dependencies:
-    array.prototype.map "^1.0.3"
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.2"
-    get-intrinsic "^1.0.2"
-    iterate-value "^1.0.2"
-
-promise.prototype.finally@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz#b8af89160c9c673cefe3b4c4435b53cfd0287067"
-  integrity sha512-A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.0"
-    function-bind "^1.1.1"
-
 promise@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e"
@@ -16587,7 +14923,7 @@ prompts@2.4.0:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prompts@^2.0.1, prompts@^2.4.0:
+prompts@^2.0.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61"
   integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==
@@ -16595,7 +14931,7 @@ prompts@^2.0.1, prompts@^2.4.0:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -16726,13 +15062,6 @@ qs@6.7.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
-qs@^6.10.0, qs@^6.9.4:
-  version "6.10.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
-  integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
-  dependencies:
-    side-channel "^1.0.4"
-
 qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
@@ -16755,16 +15084,6 @@ query-string@^4.1.0:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-query-string@^6.13.8:
-  version "6.14.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a"
-  integrity sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==
-  dependencies:
-    decode-uri-component "^0.2.0"
-    filter-obj "^1.1.0"
-    split-on-first "^1.0.0"
-    strict-uri-encode "^2.0.0"
-
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -16810,11 +15129,6 @@ raf@^3.4.0, raf@^3.4.1:
   dependencies:
     performance-now "^2.1.0"
 
-ramda@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.21.0.tgz#a001abedb3ff61077d4ff1d577d44de77e8d0a35"
-  integrity sha1-oAGr7bP/YQd9T/HVd9RN536NCjU=
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -17225,11 +15539,6 @@ react-app-rewired@^2.1.8:
   dependencies:
     semver "^5.6.0"
 
-react-colorful@^5.0.1:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.2.0.tgz#1cd24ca7deff73a70cf34261813a4ed6c45129c2"
-  integrity sha512-SJXywyc9oew0rOp7xjmtStiJ5N4Mk2RYc/1OptlaEnbuCz9PvILmRotoHfowdmO142HASUSgKdngL4WOHo/TnQ==
-
 react-dev-utils@^11.0.3:
   version "11.0.4"
   resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-11.0.4.tgz#a7ccb60257a1ca2e0efe7a83e38e6700d17aa37a"
@@ -17267,38 +15576,6 @@ react-device-detect@^1.17.0:
   dependencies:
     ua-parser-js "^0.7.24"
 
-react-docgen-typescript-plugin@^0.6.2:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-0.6.3.tgz#664b22601df083597ecb1e60bd21beca60125fdf"
-  integrity sha512-av1S/fmWBNFGgNa4qtkidFjjOz23eEi6EdCtwSWo9WNhGzUMyMygbD/DosMWoeFlZpk9R3MXPkRE7PDH6j5GMQ==
-  dependencies:
-    debug "^4.1.1"
-    endent "^2.0.1"
-    micromatch "^4.0.2"
-    react-docgen-typescript "^1.20.5"
-    tslib "^2.0.0"
-
-react-docgen-typescript@^1.20.5:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/react-docgen-typescript/-/react-docgen-typescript-1.22.0.tgz#00232c8e8e47f4437cac133b879b3e9437284bee"
-  integrity sha512-MPLbF8vzRwAG3GcjdL+OHQlhgtWsLTXs+7uJiHfEeT3Ur7IsZaNYqRTLQ9sj2nB6M6jylcPCeCmH7qbszJmecg==
-
-react-docgen@^5.0.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-5.4.0.tgz#2cd7236720ec2769252ef0421f23250b39a153a1"
-  integrity sha512-JBjVQ9cahmNlfjMGxWUxJg919xBBKAoy3hgDgKERbR+BcF4ANpDuzWAScC7j27hZfd8sJNmMPOLWo9+vB/XJEQ==
-  dependencies:
-    "@babel/core" "^7.7.5"
-    "@babel/generator" "^7.12.11"
-    "@babel/runtime" "^7.7.6"
-    ast-types "^0.14.2"
-    commander "^2.19.0"
-    doctrine "^3.0.0"
-    estree-to-babel "^3.1.0"
-    neo-async "^2.6.1"
-    node-dir "^0.1.10"
-    strip-indent "^3.0.0"
-
 react-dom@^17.0.1:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
@@ -17308,14 +15585,6 @@ react-dom@^17.0.1:
     object-assign "^4.1.1"
     scheduler "^0.20.2"
 
-react-draggable@^4.4.3:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3"
-  integrity sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w==
-  dependencies:
-    classnames "^2.2.5"
-    prop-types "^15.6.0"
-
 react-error-overlay@^6.0.9:
   version "6.0.9"
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a"
@@ -17326,27 +15595,11 @@ react-fast-compare@^2.0.1:
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
   integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
 
-react-fast-compare@^3.0.1, react-fast-compare@^3.1.1, react-fast-compare@^3.2.0:
+react-fast-compare@^3.1.1:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
   integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
 
-react-ga@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/react-ga/-/react-ga-3.3.0.tgz#c91f407198adcb3b49e2bc5c12b3fe460039b3ca"
-  integrity sha512-o8RScHj6Lb8cwy3GMrVH6NJvL+y0zpJvKtc0+wmH7Bt23rszJmnqEQxRbyrqUzk9DTJIHoP42bfO5rswC9SWBQ==
-
-react-helmet-async@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.0.9.tgz#5b9ed2059de6b4aab47f769532f9fbcbce16c5ca"
-  integrity sha512-N+iUlo9WR3/u9qGMmP4jiYfaD6pe9IvDTapZLFJz2D3xlTlCM1Bzy4Ab3g72Nbajo/0ZyW+W9hdz8Hbe4l97pQ==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    invariant "^2.2.4"
-    prop-types "^15.7.2"
-    react-fast-compare "^3.2.0"
-    shallowequal "^1.1.0"
-
 react-helmet@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726"
@@ -17377,7 +15630,7 @@ react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^17.0.0, react-is@^17.0.1, react-is@^17.0.2:
+react-is@^17.0.0, react-is@^17.0.1:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
@@ -17411,23 +15664,6 @@ react-parallax@^3.2.1:
   resolved "https://registry.yarnpkg.com/react-parallax/-/react-parallax-3.3.0.tgz#79f7a33451e7a419d0052f795c5d3655aa1e20b4"
   integrity sha512-gI7YdblxdbhZ1ISqaWzIqlPSuQLX76QFbzWKmeA0hCprjephVdVD35gCN+Fu8v0p3cfw+DFTN/PE+jYgcCOLUw==
 
-react-popper-tooltip@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-3.1.1.tgz#329569eb7b287008f04fcbddb6370452ad3f9eac"
-  integrity sha512-EnERAnnKRptQBJyaee5GJScWNUKQPDD2ywvzZyUjst/wj5U64C8/CnSYLNEmP2hG0IJ3ZhtDxE8oDN+KOyavXQ==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@popperjs/core" "^2.5.4"
-    react-popper "^2.2.4"
-
-react-popper@^2.2.4:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.5.tgz#1214ef3cec86330a171671a4fbcbeeb65ee58e96"
-  integrity sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==
-  dependencies:
-    react-fast-compare "^3.0.1"
-    warning "^4.0.2"
-
 react-redux@^7.2.2:
   version "7.2.4"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.4.tgz#1ebb474032b72d806de2e0519cd07761e222e225"
@@ -17555,16 +15791,6 @@ react-side-effect@^2.1.0:
   resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3"
   integrity sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==
 
-react-sizeme@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-3.0.1.tgz#4d12f4244e0e6a0fb97253e7af0314dc7c83a5a0"
-  integrity sha512-9Hf1NLgSbny1bha77l9HwvwwxQUJxFUqi44Ih+y3evA+PezBpGdCGlnvye6avss2cIgs9PgdYgMnfuzJWn/RUw==
-  dependencies:
-    element-resize-detector "^1.2.2"
-    invariant "^2.2.4"
-    shallowequal "^1.1.0"
-    throttle-debounce "^3.0.1"
-
 react-smooth@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/react-smooth/-/react-smooth-2.0.0.tgz#561647b33e498b2e25f449b3c6689b2e9111bf91"
@@ -17574,26 +15800,6 @@ react-smooth@^2.0.0:
     raf "^3.4.0"
     react-transition-group "2.9.0"
 
-react-syntax-highlighter@^13.5.3:
-  version "13.5.3"
-  resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz#9712850f883a3e19eb858cf93fad7bb357eea9c6"
-  integrity sha512-crPaF+QGPeHNIblxxCdf2Lg936NAHKhNhuMzRL3F9ct6aYXL3NcZtCL0Rms9+qVo6Y1EQLdXGypBNSbPL/r+qg==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    highlight.js "^10.1.1"
-    lowlight "^1.14.0"
-    prismjs "^1.21.0"
-    refractor "^3.1.0"
-
-react-textarea-autosize@^8.3.0:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.2.tgz#4f9374d357b0a6f6469956726722549124a1b2db"
-  integrity sha512-JrMWVgQSaExQByP3ggI1eA8zF4mF0+ddVuX7acUeK2V7bmrpjVOY72vmLz2IXFJSAXoY3D80nEzrn0GWajWK3Q==
-  dependencies:
-    "@babel/runtime" "^7.10.2"
-    use-composed-ref "^1.0.0"
-    use-latest "^1.0.0"
-
 react-transition-group@2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
@@ -17666,7 +15872,7 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -17750,13 +15956,6 @@ recharts@^2.0.9:
     recharts-scale "^0.4.4"
     reduce-css-calc "^2.1.8"
 
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
-  dependencies:
-    resolve "^1.1.6"
-
 recursive-readdir@2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
@@ -17784,15 +15983,6 @@ redux@^4.0.0:
   dependencies:
     "@babel/runtime" "^7.9.2"
 
-refractor@^3.1.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.3.1.tgz#ebbc04b427ea81dc25ad333f7f67a0b5f4f0be3a"
-  integrity sha512-vaN6R56kLMuBszHSWlwTpcZ8KTMG6aUCok4GrxYDT20UIOXxOc5o6oDc8tNTzSlH3m2sI+Eu9Jo2kVdDcUTWYw==
-  dependencies:
-    hastscript "^6.0.0"
-    parse-entities "^2.0.0"
-    prismjs "~1.23.0"
-
 refractor@^3.3.1:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.4.0.tgz#62bd274b06c942041f390c371b676eb67cb0a678"
@@ -18234,7 +16424,7 @@ resolve@1.18.1:
     is-core-module "^2.0.0"
     path-parse "^1.0.6"
 
-resolve@>=1.9.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.8.1:
+resolve@>=1.9.0, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.8.1:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -18345,7 +16535,7 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.3:
+rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -18445,11 +16635,6 @@ rxjs@^6.3.3, rxjs@^6.6.0, rxjs@^6.6.3:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
-
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -18547,15 +16732,6 @@ scheduler@^0.20.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-schema-utils@2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
-  integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
-  dependencies:
-    "@types/json-schema" "^7.0.4"
-    ajv "^6.12.2"
-    ajv-keywords "^3.4.1"
-
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -18565,7 +16741,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0, schema-utils@^2.7.1:
+schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
   integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
@@ -18628,11 +16804,6 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-select@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
-  integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
-
 selfsigned@^1.10.8:
   version "1.10.11"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
@@ -18726,17 +16897,6 @@ serialize-javascript@^5.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-serve-favicon@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.5.0.tgz#935d240cdfe0f5805307fdfe967d88942a2cbcf0"
-  integrity sha1-k10kDN/g9YBTB/3+ln2IlCosvPA=
-  dependencies:
-    etag "~1.8.1"
-    fresh "0.5.2"
-    ms "2.1.1"
-    parseurl "~1.3.2"
-    safe-buffer "5.1.1"
-
 serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
@@ -18760,7 +16920,7 @@ serve-static@1.14.1:
     parseurl "~1.3.3"
     send "0.17.1"
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -18803,13 +16963,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
-
 shallowequal@^1.0.2, shallowequal@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
@@ -18844,15 +16997,6 @@ shell-quote@1.7.2:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
   integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
-shelljs@^0.8.1:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
-  integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
@@ -18889,11 +17033,6 @@ slash@^1.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -19021,7 +17160,7 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
+source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -19196,11 +17335,6 @@ stealthy-require@^1.1.1:
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
   integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
-store2@^2.12.0:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/store2/-/store2-2.12.0.tgz#e1f1b7e1a59b6083b2596a8d067f6ee88fd4d3cf"
-  integrity sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==
-
 stream-browserify@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
@@ -19275,7 +17409,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.1.1:
+string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -19301,7 +17435,7 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-"string.prototype.matchall@^4.0.0 || ^3.0.1", string.prototype.matchall@^4.0.4:
+string.prototype.matchall@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz#608f255e93e072107f5de066f81a2dfb78cf6b29"
   integrity sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ==
@@ -19314,24 +17448,6 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
     regexp.prototype.flags "^1.3.1"
     side-channel "^1.0.4"
 
-string.prototype.padend@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.2.tgz#6858ca4f35c5268ebd5e8615e1327d55f59ee311"
-  integrity sha512-/AQFLdYvePENU3W5rgurfWSMU6n+Ww8n/3cUt7E+vPBB/D7YDG8x+qjoFs4M/alR2bW7Qg6xMjVwWUOvuQ0XpQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.2"
-
-string.prototype.padstart@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.padstart/-/string.prototype.padstart-3.1.2.tgz#f9b9ce66bedd7c06acb40ece6e34c6046e1a019d"
-  integrity sha512-HDpngIP3pd0DeazrfqzuBrQZa+D2arKWquEHfGt5LzVjd+roLC3cjqVI0X8foaZz5rrrhcu8oJAQamW8on9dqw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.2"
-
 string.prototype.trim@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz#6014689baf5efaf106ad031a5fa45157666ed1bd"
@@ -19469,13 +17585,6 @@ strip-hex-prefix@1.0.0:
   dependencies:
     is-hex-prefixed "1.0.0"
 
-strip-indent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
-  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
-  dependencies:
-    min-indent "^1.0.0"
-
 strip-json-comments@^3.0.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
@@ -19486,7 +17595,7 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-style-loader@1.3.0, style-loader@^1.3.0:
+style-loader@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz#828b4a3b3b7e7aa5847ce7bae9e874512114249e"
   integrity sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==
@@ -19612,16 +17721,6 @@ symbol-tree@^3.2.4:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-symbol.prototype.description@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/symbol.prototype.description/-/symbol.prototype.description-1.0.4.tgz#c30edd3fe8c040d941cf7dc15842be15adf66855"
-  integrity sha512-fZkHwJ8ZNRVRzF/+/2OtygyyH06CjC0YZAQRHu9jKKw8RXlJpbizEHvGRUu22Qkg182wJk1ugb5Aovcv3UPrww==
-  dependencies:
-    call-bind "^1.0.2"
-    es-abstract "^1.18.0-next.2"
-    has-symbols "^1.0.1"
-    object.getownpropertydescriptors "^2.1.2"
-
 sync-fetch@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/sync-fetch/-/sync-fetch-0.3.0.tgz#77246da949389310ad978ab26790bb05f88d1335"
@@ -19695,20 +17794,6 @@ tar@^6.0.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-telejson@^5.1.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/telejson/-/telejson-5.3.1.tgz#456418a05a8d5b0de7d5244feadcfe1d280dc088"
-  integrity sha512-je5hys3IpAWmf270iaxJgeboUgJL+pGNeZykvn58nbKhCGbTtiMZpzkCx6cKhsXaqAXS6uNOBOoaw/ttp+nuOw==
-  dependencies:
-    "@types/is-function" "^1.0.0"
-    global "^4.4.0"
-    is-function "^1.0.2"
-    is-regex "^1.1.2"
-    is-symbol "^1.0.3"
-    isobject "^4.0.0"
-    lodash "^4.17.21"
-    memoizerific "^1.11.3"
-
 temp-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
@@ -19771,22 +17856,7 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser-webpack-plugin@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.1.0.tgz#91e6d39571460ed240c0cf69d295bcf30ebf98cb"
-  integrity sha512-cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA==
-  dependencies:
-    cacache "^15.0.5"
-    find-cache-dir "^3.3.1"
-    jest-worker "^26.2.1"
-    p-limit "^3.0.2"
-    schema-utils "^2.6.6"
-    serialize-javascript "^4.0.0"
-    source-map "^0.6.1"
-    terser "^4.8.0"
-    webpack-sources "^1.4.3"
-
-terser@^4.1.2, terser@^4.6.2, terser@^4.6.3, terser@^4.8.0:
+terser@^4.1.2, terser@^4.6.2, terser@^4.6.3:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
   integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
@@ -19831,11 +17901,6 @@ throat@^5.0.0:
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
   integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
 
-throttle-debounce@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb"
-  integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==
-
 through2@^2.0.0, through2@^2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
@@ -19871,11 +17936,6 @@ timsort@^0.3.0:
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
 
-tiny-emitter@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
-  integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
-
 tiny-invariant@^1.0.2, tiny-invariant@^1.0.6, tiny-invariant@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875"
@@ -20030,16 +18090,6 @@ tryer@^1.0.1:
   resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
   integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
 
-ts-dedent@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.1.1.tgz#6dd56870bb5493895171334fa5d7e929107e5bbc"
-  integrity sha512-riHuwnzAUCfdIeTBNUq7+Yj+ANnrMXo/7+Z74dIdudS7ys2k8aSGMzpJRMFDF7CLwUTbtvi1ZZff/Wl+XxmqIA==
-
-ts-essentials@^2.0.3:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745"
-  integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==
-
 ts-essentials@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-7.0.1.tgz#d205508cae0cdadfb73c89503140cf2228389e2d"
@@ -20108,7 +18158,7 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@~2.2.0:
+tslib@^2, tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
   integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
@@ -20312,11 +18362,6 @@ undefsafe@^2.0.3:
   dependencies:
     debug "^2.2.0"
 
-unfetch@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be"
-  integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==
-
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -20471,7 +18516,7 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
-unquote@^1.1.0, unquote@~1.1.1:
+unquote@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
   integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
@@ -20539,7 +18584,7 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-loader@4.1.1, url-loader@^4.1.1:
+url-loader@4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2"
   integrity sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==
@@ -20578,25 +18623,6 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-use-composed-ref@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.1.0.tgz#9220e4e94a97b7b02d7d27eaeab0b37034438bbc"
-  integrity sha512-my1lNHGWsSDAhhVAT4MKs6IjBUtG6ZG11uUqexPH9PptiIZDQOzaF4f5tEbJ2+7qvNbtXNBbU3SfmN+fXlWDhg==
-  dependencies:
-    ts-essentials "^2.0.3"
-
-use-isomorphic-layout-effect@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz#7bb6589170cd2987a152042f9084f9effb75c225"
-  integrity sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ==
-
-use-latest@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/use-latest/-/use-latest-1.2.0.tgz#a44f6572b8288e0972ec411bdd0840ada366f232"
-  integrity sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw==
-  dependencies:
-    use-isomorphic-layout-effect "^1.0.0"
-
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
@@ -20676,7 +18702,7 @@ v8-compile-cache@^2.0.3:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-v8-to-istanbul@^7.0.0, v8-to-istanbul@^7.1.0:
+v8-to-istanbul@^7.0.0:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1"
   integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==
@@ -20807,7 +18833,7 @@ walletlink@^2.1.0:
     preact "^10.5.9"
     rxjs "^6.6.3"
 
-warning@^4.0.1, warning@^4.0.2, warning@^4.0.3:
+warning@^4.0.1, warning@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
   integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
@@ -20898,7 +18924,7 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
-webpack-dev-middleware@^3.7.2, webpack-dev-middleware@^3.7.3:
+webpack-dev-middleware@^3.7.2:
   version "3.7.3"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5"
   integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==
@@ -20953,16 +18979,6 @@ webpack-filter-warnings-plugin@^1.2.1:
   resolved "https://registry.yarnpkg.com/webpack-filter-warnings-plugin/-/webpack-filter-warnings-plugin-1.2.1.tgz#dc61521cf4f9b4a336fbc89108a75ae1da951cdb"
   integrity sha512-Ez6ytc9IseDMLPo0qCuNNYzgtUl8NovOqjIq4uAU8LTD4uoa1w1KpZyyzFtLTEMZpkkOkLfL9eN+KGYdk1Qtwg==
 
-webpack-hot-middleware@^2.25.0:
-  version "2.25.0"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.0.tgz#4528a0a63ec37f8f8ef565cf9e534d57d09fe706"
-  integrity sha512-xs5dPOrGPCzuRXNi8F6rwhawWvQQkeli5Ro48PRuQh8pYPCPmNnltP9itiUPT4xI8oW+y0m59lyyeQk54s5VgA==
-  dependencies:
-    ansi-html "0.0.7"
-    html-entities "^1.2.0"
-    querystring "^0.2.0"
-    strip-ansi "^3.0.0"
-
 webpack-log@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
@@ -20989,42 +19005,6 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-virtual-modules@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.2.2.tgz#20863dc3cb6bb2104729fff951fbe14b18bd0299"
-  integrity sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA==
-  dependencies:
-    debug "^3.0.0"
-
-webpack@4:
-  version "4.46.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
-  integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-module-context" "1.9.0"
-    "@webassemblyjs/wasm-edit" "1.9.0"
-    "@webassemblyjs/wasm-parser" "1.9.0"
-    acorn "^6.4.1"
-    ajv "^6.10.2"
-    ajv-keywords "^3.4.1"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.5.0"
-    eslint-scope "^4.0.3"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^2.4.0"
-    loader-utils "^1.2.3"
-    memory-fs "^0.4.1"
-    micromatch "^3.1.10"
-    mkdirp "^0.5.3"
-    neo-async "^2.6.1"
-    node-libs-browser "^2.2.1"
-    schema-utils "^1.0.0"
-    tapable "^1.1.3"
-    terser-webpack-plugin "^1.4.3"
-    watchpack "^1.7.4"
-    webpack-sources "^1.4.1"
-
 webpack@4.44.2:
   version "4.44.2"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72"
@@ -21142,13 +19122,6 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
 widest-line@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
@@ -21526,7 +19499,7 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^20.2.2, yargs-parser@^20.2.7:
+yargs-parser@^20.2.2:
   version "20.2.7"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"
   integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==
@@ -21547,7 +19520,7 @@ yargs@^13.2.4, yargs@^13.3.2:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
-yargs@^15.0.0, yargs@^15.4.1:
+yargs@^15.4.1:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
   integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
@@ -21564,7 +19537,7 @@ yargs@^15.0.0, yargs@^15.4.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
-yargs@^16.1.1, yargs@^16.2.0:
+yargs@^16.1.1:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
   integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==