From 156ea1af766bd34d08d132e819e90807a97b30c8 Mon Sep 17 00:00:00 2001
From: Stuart Taylor <staylor1012@gmail.com>
Date: Tue, 15 May 2018 06:12:05 +0100
Subject: [PATCH] Feat: Welcome Page (#17150)

---
 client/index.js                               |  18 +-
 client/less/main.less                         |  18 +
 client/utils/use-lang-routes.js               |  44 -
 common/app/App.jsx                            |   7 +-
 common/app/Map/Block.jsx                      | 105 ---
 common/app/Map/Blocks.jsx                     |  39 -
 common/app/Map/Challenge.jsx                  | 155 ----
 common/app/Map/Challenges.jsx                 |  35 -
 common/app/Map/Map.jsx                        | 127 ---
 common/app/Map/Super-Block.jsx                |  96 --
 common/app/Map/index.js                       |   1 -
 common/app/Map/map.less                       | 144 ---
 common/app/Map/ns.json                        |   1 -
 common/app/Map/redux/fetch-map-ui-epic.js     |  12 +-
 common/app/Map/redux/index.js                 |   3 +-
 common/app/Nav/LargeNav.jsx                   |  13 +-
 common/app/Nav/MediumNav.jsx                  |  27 +-
 common/app/Nav/Nav.jsx                        |  61 +-
 common/app/Nav/SmallNav.jsx                   |  25 +-
 common/app/Nav/components/NavLinks.jsx        |  20 -
 common/app/Nav/components/NavLogo.jsx         |   6 +-
 common/app/Nav/links.json                     |  43 +-
 common/app/Nav/navPropTypes.js                |   5 +-
 common/app/Nav/redux/index.js                 |   5 +-
 .../Nav/redux/load-current-challenge-epic.js  |  58 --
 common/app/Panes/Divider.jsx                  |  51 --
 common/app/Panes/Pane.jsx                     |  41 -
 common/app/Panes/Panes.jsx                    | 127 ---
 common/app/Panes/index.js                     |   1 -
 common/app/Panes/ns.json                      |   1 -
 common/app/Panes/panes.less                   |  42 -
 common/app/Panes/quotes.js                    |  71 --
 common/app/Panes/redux/divider-epic.js        |  40 -
 common/app/Panes/redux/index.js               | 213 -----
 common/app/Panes/redux/utils.js               |  62 --
 common/app/Panes/redux/window-epic.js         |  19 -
 common/app/Router/Link.jsx                    |   9 +-
 common/app/Router/redux/add-lang-enhancer.js  |  28 -
 common/app/Router/redux/index.js              |   1 -
 common/app/Router/to-url.js                   |  10 +-
 common/app/Toasts/Toasts.jsx                  |   9 +-
 common/app/create-app.jsx                     |  15 +-
 common/app/create-panes-map.js                |   1 -
 common/app/entities/index.js                  |  54 +-
 common/app/epics.js                           |   4 -
 common/app/files/index.js                     |  53 --
 common/app/index.less                         |   2 -
 common/app/reducer.js                         |   5 +-
 common/app/redux-form-reducer.js              |  37 -
 common/app/redux/fetch-challenges-epic.js     | 118 ---
 common/app/redux/index.js                     | 150 +---
 common/app/redux/update-my-challenge-epic.js  |  51 --
 common/app/redux/utils.js                     |  45 -
 common/app/redux/utils.test.js                | 152 ----
 common/app/routes-map.js                      |   8 +-
 .../Challenges/Challenge-Description.jsx      |  51 --
 .../app/routes/Challenges/Challenge-Title.jsx |  52 --
 .../app/routes/Challenges/Child-Container.jsx |  23 -
 .../Challenges/Code-Mirror-Skeleton.jsx       |  42 -
 .../routes/Challenges/Completion-Modal.jsx    | 116 ---
 common/app/routes/Challenges/Help-Modal.jsx   |  75 --
 common/app/routes/Challenges/Output.jsx       |  46 -
 common/app/routes/Challenges/Preview.jsx      |  20 -
 common/app/routes/Challenges/Show.jsx         | 127 ---
 common/app/routes/Challenges/Side-Panel.jsx   | 182 ----
 .../app/routes/Challenges/Solution-Input.jsx  |  46 -
 common/app/routes/Challenges/Test-Suite.jsx   |  80 --
 common/app/routes/Challenges/Tool-Panel.jsx   | 179 ----
 common/app/routes/Challenges/challenges.less  | 201 -----
 common/app/routes/Challenges/index.js         |  65 --
 common/app/routes/Challenges/ns.json          |   1 -
 .../routes/Challenges/rechallenge/builders.js | 118 ---
 .../routes/Challenges/rechallenge/throwers.js | 124 ---
 .../Challenges/rechallenge/transformers.js    | 162 ----
 .../routes/Challenges/redux/challenge-epic.js |  80 --
 .../Challenges/redux/code-storage-epic.js     | 196 ----
 .../Challenges/redux/completion-epic.js       | 175 ----
 .../redux/execute-challenge-epic.js           | 125 ---
 common/app/routes/Challenges/redux/index.js   | 351 --------
 .../app/routes/Challenges/redux/modal-epic.js |  64 --
 common/app/routes/Challenges/utils/build.js   |  85 --
 .../app/routes/Challenges/utils/code-uri.js   |  79 --
 .../Challenges/utils/fetch-and-cache.js       |  74 --
 common/app/routes/Challenges/utils/frame.js   | 145 ---
 common/app/routes/Challenges/utils/index.js   | 348 -------
 .../app/routes/Challenges/utils/index.test.js | 848 ------------------
 .../routes/Challenges/views/Modern/Editor.jsx | 155 ----
 .../routes/Challenges/views/Modern/Show.jsx   | 111 ---
 .../routes/Challenges/views/Modern/index.js   |   1 -
 .../routes/Challenges/views/Modern/ns.json    |   1 -
 .../Challenges/views/backend/Back-End.jsx     | 184 ----
 .../routes/Challenges/views/backend/Show.jsx  |  39 -
 .../routes/Challenges/views/backend/index.js  |   1 -
 .../Challenges/views/classic/Editor.jsx       | 162 ----
 .../routes/Challenges/views/classic/Show.jsx  |  51 --
 .../Challenges/views/classic/classic.less     |  21 -
 .../routes/Challenges/views/classic/index.js  |   1 -
 .../routes/Challenges/views/classic/ns.json   |   1 -
 common/app/routes/Challenges/views/index.less |   3 -
 .../routes/Challenges/views/project/Forms.jsx | 158 ----
 .../Challenges/views/project/Project.jsx      |  58 --
 .../routes/Challenges/views/project/Show.jsx  |  39 -
 .../Challenges/views/project/Side-Panel.jsx   |  39 -
 .../Challenges/views/project/Tool-Panel.jsx   | 131 ---
 .../routes/Challenges/views/project/index.js  |   1 -
 .../routes/Challenges/views/project/ns.json   |   1 -
 .../Challenges/views/project/redux/index.js   |  29 -
 .../views/project/redux/project-normalizer.js |  11 -
 .../routes/Challenges/views/quiz/Choice.jsx   |  83 --
 .../app/routes/Challenges/views/quiz/Quiz.jsx | 241 -----
 .../app/routes/Challenges/views/quiz/Show.jsx |  39 -
 .../app/routes/Challenges/views/quiz/index.js |   1 -
 .../app/routes/Challenges/views/quiz/ns.json  |   1 -
 .../routes/Challenges/views/quiz/quiz.less    |  93 --
 .../Challenges/views/quiz/redux/index.js      |  81 --
 .../app/routes/Challenges/views/step/Show.jsx |  39 -
 .../app/routes/Challenges/views/step/Step.jsx | 293 ------
 .../app/routes/Challenges/views/step/index.js |   1 -
 .../app/routes/Challenges/views/step/ns.json  |   1 -
 .../Challenges/views/step/redux/index.js      |  92 --
 .../views/step/redux/step-challenge-epic.js   |  52 --
 .../step/redux/step-challenge-epic.test.js    | 146 ---
 .../routes/Challenges/views/step/step.less    |  60 --
 common/app/routes/Map/index.js                |  10 -
 common/app/routes/Profile/Profile.jsx         |   7 +-
 .../routes/Profile/components/Timeline.jsx    |  13 +-
 common/app/routes/Settings/Settings.jsx       |  18 +-
 .../Settings/components/Cert-Settings.jsx     |  10 -
 .../Settings/components/Language-Settings.jsx | 141 ---
 common/app/routes/Settings/redux/index.js     |   5 -
 .../routes/Settings/redux/update-user-epic.js |  56 +-
 common/app/routes/index.js                    |  27 -
 common/app/routes/index.less                  |   1 -
 common/app/routes/redux.js                    |   7 -
 common/app/utils/lang.js                      |  39 -
 common/app/utils/quotes.js                    | 143 +++
 common/app/utils/redux-first-router.js        |  26 -
 common/models/user.json                       |  19 +-
 common/utils/supported-languages.js           |   5 -
 package-lock.json                             |  16 +
 package.json                                  |   1 +
 server/boot/authentication.js                 |   2 +-
 server/boot/challenge.js                      |   8 +-
 server/boot/commit.js                         |   2 +-
 server/boot/home.js                           |  89 +-
 server/boot/randomAPIs.js                     |  22 +-
 server/boot/react.js                          |   5 +-
 server/boot/settings.js                       |  29 -
 server/boot/user.js                           |   2 +-
 server/boot/z-lang-redirect.js                |  37 -
 server/boot/z-not-found.js                    |  22 +
 server/component-passport.js                  |  36 +-
 server/middleware.json                        |   1 -
 server/middlewares/add-lang.js                |  68 --
 server/middlewares/add-return-to.js           |   4 +-
 server/models/about.js                        |   9 +-
 server/rss/index.js                           |  86 ++
 server/rss/lybsyn.js                          |  47 +
 server/rss/medium.js                          |  39 +
 server/services/challenge.js                  |   8 +-
 server/services/mapUi.js                      |  13 +-
 server/utils/map.js                           |  43 +-
 server/utils/publicUserProps.js               |   1 -
 .../views/homePartials/activeUsersScript.jade |  14 +
 .../views/homePartials/activeUsersView.jade   |   4 +
 server/views/homePartials/newsFeed.jade       |  18 +
 server/views/homePartials/quote.jade          |   6 +
 server/views/homePartials/scripts.jade        |   3 +
 server/views/homePartials/stats.jade          |  26 +
 server/views/{home.jade => noUserHome.jade}   |   9 +
 server/views/partials/navbar.jade             |  23 +-
 server/views/userHome.jade                    |  22 +
 172 files changed, 693 insertions(+), 9738 deletions(-)
 delete mode 100644 client/utils/use-lang-routes.js
 delete mode 100644 common/app/Map/Block.jsx
 delete mode 100644 common/app/Map/Blocks.jsx
 delete mode 100644 common/app/Map/Challenge.jsx
 delete mode 100644 common/app/Map/Challenges.jsx
 delete mode 100644 common/app/Map/Map.jsx
 delete mode 100644 common/app/Map/Super-Block.jsx
 delete mode 100644 common/app/Map/index.js
 delete mode 100644 common/app/Map/map.less
 delete mode 100644 common/app/Map/ns.json
 delete mode 100644 common/app/Nav/redux/load-current-challenge-epic.js
 delete mode 100644 common/app/Panes/Divider.jsx
 delete mode 100644 common/app/Panes/Pane.jsx
 delete mode 100644 common/app/Panes/Panes.jsx
 delete mode 100644 common/app/Panes/index.js
 delete mode 100644 common/app/Panes/ns.json
 delete mode 100644 common/app/Panes/panes.less
 delete mode 100644 common/app/Panes/quotes.js
 delete mode 100644 common/app/Panes/redux/divider-epic.js
 delete mode 100644 common/app/Panes/redux/index.js
 delete mode 100644 common/app/Panes/redux/utils.js
 delete mode 100644 common/app/Panes/redux/window-epic.js
 delete mode 100644 common/app/Router/redux/add-lang-enhancer.js
 delete mode 100644 common/app/create-panes-map.js
 delete mode 100644 common/app/files/index.js
 delete mode 100644 common/app/redux-form-reducer.js
 delete mode 100644 common/app/redux/fetch-challenges-epic.js
 delete mode 100644 common/app/redux/update-my-challenge-epic.js
 delete mode 100644 common/app/redux/utils.test.js
 delete mode 100644 common/app/routes/Challenges/Challenge-Description.jsx
 delete mode 100644 common/app/routes/Challenges/Challenge-Title.jsx
 delete mode 100644 common/app/routes/Challenges/Child-Container.jsx
 delete mode 100644 common/app/routes/Challenges/Code-Mirror-Skeleton.jsx
 delete mode 100644 common/app/routes/Challenges/Completion-Modal.jsx
 delete mode 100644 common/app/routes/Challenges/Help-Modal.jsx
 delete mode 100644 common/app/routes/Challenges/Output.jsx
 delete mode 100644 common/app/routes/Challenges/Preview.jsx
 delete mode 100644 common/app/routes/Challenges/Show.jsx
 delete mode 100644 common/app/routes/Challenges/Side-Panel.jsx
 delete mode 100644 common/app/routes/Challenges/Solution-Input.jsx
 delete mode 100644 common/app/routes/Challenges/Test-Suite.jsx
 delete mode 100644 common/app/routes/Challenges/Tool-Panel.jsx
 delete mode 100644 common/app/routes/Challenges/challenges.less
 delete mode 100644 common/app/routes/Challenges/index.js
 delete mode 100644 common/app/routes/Challenges/ns.json
 delete mode 100644 common/app/routes/Challenges/rechallenge/builders.js
 delete mode 100644 common/app/routes/Challenges/rechallenge/throwers.js
 delete mode 100644 common/app/routes/Challenges/rechallenge/transformers.js
 delete mode 100644 common/app/routes/Challenges/redux/challenge-epic.js
 delete mode 100644 common/app/routes/Challenges/redux/code-storage-epic.js
 delete mode 100644 common/app/routes/Challenges/redux/completion-epic.js
 delete mode 100644 common/app/routes/Challenges/redux/execute-challenge-epic.js
 delete mode 100644 common/app/routes/Challenges/redux/index.js
 delete mode 100644 common/app/routes/Challenges/redux/modal-epic.js
 delete mode 100644 common/app/routes/Challenges/utils/build.js
 delete mode 100644 common/app/routes/Challenges/utils/code-uri.js
 delete mode 100644 common/app/routes/Challenges/utils/fetch-and-cache.js
 delete mode 100644 common/app/routes/Challenges/utils/frame.js
 delete mode 100644 common/app/routes/Challenges/utils/index.js
 delete mode 100644 common/app/routes/Challenges/utils/index.test.js
 delete mode 100644 common/app/routes/Challenges/views/Modern/Editor.jsx
 delete mode 100644 common/app/routes/Challenges/views/Modern/Show.jsx
 delete mode 100644 common/app/routes/Challenges/views/Modern/index.js
 delete mode 100644 common/app/routes/Challenges/views/Modern/ns.json
 delete mode 100644 common/app/routes/Challenges/views/backend/Back-End.jsx
 delete mode 100644 common/app/routes/Challenges/views/backend/Show.jsx
 delete mode 100644 common/app/routes/Challenges/views/backend/index.js
 delete mode 100644 common/app/routes/Challenges/views/classic/Editor.jsx
 delete mode 100644 common/app/routes/Challenges/views/classic/Show.jsx
 delete mode 100644 common/app/routes/Challenges/views/classic/classic.less
 delete mode 100644 common/app/routes/Challenges/views/classic/index.js
 delete mode 100644 common/app/routes/Challenges/views/classic/ns.json
 delete mode 100644 common/app/routes/Challenges/views/index.less
 delete mode 100644 common/app/routes/Challenges/views/project/Forms.jsx
 delete mode 100644 common/app/routes/Challenges/views/project/Project.jsx
 delete mode 100644 common/app/routes/Challenges/views/project/Show.jsx
 delete mode 100644 common/app/routes/Challenges/views/project/Side-Panel.jsx
 delete mode 100644 common/app/routes/Challenges/views/project/Tool-Panel.jsx
 delete mode 100644 common/app/routes/Challenges/views/project/index.js
 delete mode 100644 common/app/routes/Challenges/views/project/ns.json
 delete mode 100644 common/app/routes/Challenges/views/project/redux/index.js
 delete mode 100644 common/app/routes/Challenges/views/project/redux/project-normalizer.js
 delete mode 100644 common/app/routes/Challenges/views/quiz/Choice.jsx
 delete mode 100644 common/app/routes/Challenges/views/quiz/Quiz.jsx
 delete mode 100644 common/app/routes/Challenges/views/quiz/Show.jsx
 delete mode 100644 common/app/routes/Challenges/views/quiz/index.js
 delete mode 100644 common/app/routes/Challenges/views/quiz/ns.json
 delete mode 100644 common/app/routes/Challenges/views/quiz/quiz.less
 delete mode 100644 common/app/routes/Challenges/views/quiz/redux/index.js
 delete mode 100644 common/app/routes/Challenges/views/step/Show.jsx
 delete mode 100644 common/app/routes/Challenges/views/step/Step.jsx
 delete mode 100644 common/app/routes/Challenges/views/step/index.js
 delete mode 100644 common/app/routes/Challenges/views/step/ns.json
 delete mode 100644 common/app/routes/Challenges/views/step/redux/index.js
 delete mode 100644 common/app/routes/Challenges/views/step/redux/step-challenge-epic.js
 delete mode 100644 common/app/routes/Challenges/views/step/redux/step-challenge-epic.test.js
 delete mode 100644 common/app/routes/Challenges/views/step/step.less
 delete mode 100644 common/app/routes/Map/index.js
 delete mode 100644 common/app/routes/Settings/components/Language-Settings.jsx
 delete mode 100644 common/app/utils/lang.js
 create mode 100644 common/app/utils/quotes.js
 delete mode 100644 common/app/utils/redux-first-router.js
 delete mode 100644 common/utils/supported-languages.js
 delete mode 100644 server/boot/z-lang-redirect.js
 create mode 100644 server/boot/z-not-found.js
 delete mode 100644 server/middlewares/add-lang.js
 create mode 100644 server/rss/index.js
 create mode 100644 server/rss/lybsyn.js
 create mode 100644 server/rss/medium.js
 create mode 100644 server/views/homePartials/activeUsersScript.jade
 create mode 100644 server/views/homePartials/activeUsersView.jade
 create mode 100644 server/views/homePartials/newsFeed.jade
 create mode 100644 server/views/homePartials/quote.jade
 create mode 100644 server/views/homePartials/scripts.jade
 create mode 100644 server/views/homePartials/stats.jade
 rename server/views/{home.jade => noUserHome.jade} (95%)
 create mode 100644 server/views/userHome.jade

diff --git a/client/index.js b/client/index.js
index 969dab1366..514fb1a6f0 100644
--- a/client/index.js
+++ b/client/index.js
@@ -4,20 +4,13 @@ import Rx from 'rx';
 import debug from 'debug';
 import { render } from 'redux-epic';
 import createHistory from 'history/createBrowserHistory';
-import useLangRoutes from './utils/use-lang-routes';
 import sendPageAnalytics from './utils/send-page-analytics';
 
 import { App, createApp, provideStore } from '../common/app';
-import { getLangFromPath } from '../common/app/utils/lang';
 
 // client specific epics
 import epics from './epics';
 
-import {
-  isColdStored,
-  getColdStorage,
-  saveToColdStorage
-} from './cold-reload';
 
 const {
   __OPBEAT__ORG_ID,
@@ -47,7 +40,7 @@ const {
   document,
   ga,
   __fcc__: {
-    data: ssrState = {},
+    data: defaultState = {},
     csrf: {
       token: csrfToken
     } = {}
@@ -63,10 +56,6 @@ const epicOptions = {
 
 
 const DOMContainer = document.getElementById('fcc');
-const defaultState = isColdStored() ?
-  getColdStorage() :
-  ssrState;
-const primaryLang = getLangFromPath(location.pathname);
 
 defaultState.app.csrfToken = csrfToken;
 
@@ -76,7 +65,7 @@ const serviceOptions = {
   xhrTimeout: 15000
 };
 
-const history = useLangRoutes(createHistory, primaryLang)();
+const history = createHistory();
 sendPageAnalytics(history, ga);
 
 createApp({
@@ -88,14 +77,13 @@ createApp({
     enhancers: isDev && devToolsExtension && [ devToolsExtension() ],
     middlewares: enableOpbeat && [ createOpbeatMiddleware() ]
   })
-  .doOnNext(({ store }) => {
+  .doOnNext(() => {
     if (module.hot && typeof module.hot.accept === 'function') {
       module.hot.accept(() => {
         // note(berks): not sure this ever runs anymore after adding
         // RHR?
         log('saving state and refreshing.');
         log('ignore react ssr warning.');
-        saveToColdStorage(store.getState());
         setTimeout(() => location.reload(), hotReloadTimeout);
       });
     }
diff --git a/client/less/main.less b/client/less/main.less
index f1653e0759..db9a804e05 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -152,6 +152,24 @@ h1, h2, h3, h4, h5, h6, p, li {
   width: 100px;
 }
 
+p.stats {
+  font-size: 2rem;
+}
+
+.green-text {
+  color: #006400;
+}
+
+.more-button-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  div {
+    flex-grow: 1;
+  }
+}
+
 .completion-icon {
   font-size: 150px;
 }
diff --git a/client/utils/use-lang-routes.js b/client/utils/use-lang-routes.js
deleted file mode 100644
index d254e1ac09..0000000000
--- a/client/utils/use-lang-routes.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { addLang, getLangFromPath } from '../../common/app/utils/lang.js';
-
-function addLangToLocation(location, lang) {
-  if (!location) {
-    return location;
-  }
-  if (typeof location === 'string') {
-    return addLang(location, lang);
-  }
-  return {
-    ...location,
-    pathname: addLang(location.pathname, lang)
-  };
-}
-
-function getLangFromLocation(location) {
-  if (!location) {
-    return location;
-  }
-  if (typeof location === 'string') {
-    return getLangFromPath(location);
-  }
-  return getLangFromPath(location.pathname);
-}
-
-export default function useLangRoutes(createHistory, primaryLang) {
-  return (options = {}) => {
-    let lang = primaryLang || 'en';
-    const history = createHistory(options);
-    const unsubscribeFromHistory = history.listen(nextLocation => {
-      lang = getLangFromLocation(nextLocation);
-    });
-    const push = location => history.push(addLangToLocation(location, lang));
-    const replace = location => history.replace(
-      addLangToLocation(location, lang)
-    );
-    return {
-      ...history,
-      push,
-      replace,
-      unsubscribe() { unsubscribeFromHistory(); }
-    };
-  };
-}
diff --git a/common/app/App.jsx b/common/app/App.jsx
index f4e17b61f6..7d32cdc6e6 100644
--- a/common/app/App.jsx
+++ b/common/app/App.jsx
@@ -10,17 +10,19 @@ import {
   isSignedInSelector
 } from './redux';
 
+import { fetchMapUi } from './Map/redux';
+
 import Flash from './Flash';
 import Nav from './Nav';
 import Toasts from './Toasts';
 import NotFound from './NotFound';
 import { mainRouteSelector } from './routes/redux';
-import Challenges from './routes/Challenges';
 import Profile from './routes/Profile';
 import Settings from './routes/Settings';
 
 const mapDispatchToProps = {
   appMounted,
+  fetchMapUi,
   fetchUser
 };
 
@@ -37,6 +39,7 @@ const mapStateToProps = state => {
 const propTypes = {
   appMounted: PropTypes.func.isRequired,
   children: PropTypes.node,
+  fetchMapUi: PropTypes.func.isRequired,
   fetchUser: PropTypes.func,
   isSignedIn: PropTypes.bool,
   route: PropTypes.string,
@@ -44,7 +47,6 @@ const propTypes = {
 };
 
 const routes = {
-  challenges: Challenges,
   profile: Profile,
   settings: Settings
 };
@@ -53,6 +55,7 @@ const routes = {
 export class FreeCodeCamp extends React.Component {
   componentDidMount() {
     this.props.appMounted();
+    this.props.fetchMapUi();
     if (!this.props.isSignedIn) {
       this.props.fetchUser();
     }
diff --git a/common/app/Map/Block.jsx b/common/app/Map/Block.jsx
deleted file mode 100644
index 1387faa0bd..0000000000
--- a/common/app/Map/Block.jsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import FA from 'react-fontawesome';
-import { Panel } from 'react-bootstrap';
-
-import ns from './ns.json';
-import Challenges from './Challenges.jsx';
-import {
-  toggleThisPanel,
-  makePanelOpenSelector
-} from './redux';
-import { fetchNewBlock } from '../redux';
-
-import { makeBlockSelector } from '../entities';
-
-const mapDispatchToProps = {
-  fetchNewBlock,
-  toggleThisPanel
-};
-function makeMapStateToProps(_, { dashedName }) {
-  return createSelector(
-    makeBlockSelector(dashedName),
-    makePanelOpenSelector(dashedName),
-    (block, isOpen) => {
-      return {
-        isOpen,
-        dashedName,
-        title: block.title,
-        time: block.time,
-        challenges: block.challenges || []
-      };
-    }
-  );
-}
-const propTypes = {
-  challenges: PropTypes.array,
-  dashedName: PropTypes.string,
-  fetchNewBlock: PropTypes.func.isRequired,
-  isOpen: PropTypes.bool,
-  time: PropTypes.string,
-  title: PropTypes.string,
-  toggleThisPanel: PropTypes.func
-};
-
-export class Block extends PureComponent {
-  constructor(...props) {
-    super(...props);
-    this.handleSelect = this.handleSelect.bind(this);
-  }
-  handleSelect(eventKey, e) {
-    e.preventDefault();
-    this.props.toggleThisPanel(eventKey);
-  }
-
-  renderHeader(isOpen, title, time, isCompleted) {
-    return (
-      <div className={ isCompleted ? 'faded' : '' }>
-        <FA
-          className='map-caret'
-          name={ isOpen ? 'caret-down' : 'caret-right' }
-          size='lg'
-        />
-        <span>
-        { title }
-        </span>
-        {
-          time && <span className={ `${ns}-block-time` }>({ time })</span>
-        }
-      </div>
-    );
-  }
-
-  render() {
-    const {
-      title,
-      time,
-      dashedName,
-      isOpen,
-      challenges,
-      fetchNewBlock
-    } = this.props;
-    return (
-      <Panel
-        bsClass={ `${ns}-accordion-panel` }
-        collapsible={ true }
-        eventKey={ dashedName || title }
-        expanded={ isOpen }
-        header={ this.renderHeader(isOpen, title, time) }
-        id={ title }
-        key={ title }
-        onClick={ () => fetchNewBlock(dashedName) }
-        onSelect={ this.handleSelect }
-        >
-        { isOpen && <Challenges challenges={ challenges } /> }
-      </Panel>
-    );
-  }
-}
-
-Block.displayName = 'Block';
-Block.propTypes = propTypes;
-
-export default connect(makeMapStateToProps, mapDispatchToProps)(Block);
diff --git a/common/app/Map/Blocks.jsx b/common/app/Map/Blocks.jsx
deleted file mode 100644
index 879a928334..0000000000
--- a/common/app/Map/Blocks.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-
-import ns from './ns.json';
-import Block from './Block.jsx';
-
-const propTypes = {
-  blocks: PropTypes.array.isRequired
-};
-
-export default class Blocks extends Component {
-  shouldComponentUpdate(nextProps) {
-    return this.props.blocks !== nextProps.blocks;
-  }
-
-  render() {
-    const {
-      blocks
-    } = this.props;
-    if (blocks.length <= 0) {
-      return null;
-    }
-    return (
-      <div className={ `${ns}-accordion-block` }>
-        {
-          blocks.map(dashedName => (
-            <Block
-              dashedName={ dashedName }
-              key={ dashedName }
-            />
-          ))
-        }
-      </div>
-    );
-  }
-}
-
-Blocks.displayName = 'Blocks';
-Blocks.propTypes = propTypes;
diff --git a/common/app/Map/Challenge.jsx b/common/app/Map/Challenge.jsx
deleted file mode 100644
index ccc4d18401..0000000000
--- a/common/app/Map/Challenge.jsx
+++ /dev/null
@@ -1,155 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import classnames from 'classnames';
-import debug from 'debug';
-
-import { clickOnChallenge } from './redux';
-import { userSelector } from '../redux';
-import { paramsSelector } from '../Router/redux';
-import { challengeMapSelector } from '../entities';
-import { Link } from '../Router';
-import { onRouteChallenges } from '../routes/Challenges/redux';
-
-const propTypes = {
-  block: PropTypes.string,
-  challenge: PropTypes.object,
-  clickOnChallenge: PropTypes.func.isRequired,
-  dashedName: PropTypes.string,
-  isComingSoon: PropTypes.bool,
-  isCompleted: PropTypes.bool,
-  isDev: PropTypes.bool,
-  isLocked: PropTypes.bool,
-  selected: PropTypes.bool,
-  title: PropTypes.string
-};
-const mapDispatchToProps = { clickOnChallenge };
-
-function makeMapStateToProps(_, { dashedName }) {
-  return createSelector(
-    userSelector,
-    challengeMapSelector,
-    paramsSelector,
-    (
-      { challengeMap: userChallengeMap },
-      challengeMap,
-      params
-    ) => {
-      const {
-        id,
-        title,
-        block,
-        isLocked,
-        isComingSoon
-      } = challengeMap[dashedName] || {};
-      const isCompleted = userChallengeMap ? !!userChallengeMap[id] : false;
-      const selected = dashedName === params.dashedName;
-      return {
-        dashedName,
-        isCompleted,
-        title,
-        block,
-        isLocked,
-        isComingSoon,
-        isDev: debug.enabled('fcc:*'),
-        selected
-      };
-    }
-  );
-}
-
-export class Challenge extends PureComponent {
-  renderCompleted(isCompleted, isLocked) {
-    if (isLocked || !isCompleted) {
-      return null;
-    }
-    return <span className='sr-only'>completed</span>;
-  }
-
-  renderComingSoon(isComingSoon) {
-    if (!isComingSoon) {
-      return null;
-    }
-    return (
-      <span className='text-info small'>
-        &thinsp; &thinsp;
-        <strong>
-          <em>Coming Soon</em>
-        </strong>
-      </span>
-    );
-  }
-
-  renderLocked(title, isComingSoon, className) {
-    return (
-      <p
-        className={ className }
-        key={ title }
-        >
-        { title }
-        { this.renderComingSoon(isComingSoon) }
-      </p>
-    );
-  }
-
-
-  render() {
-    const {
-      block,
-      clickOnChallenge,
-      dashedName,
-      isComingSoon,
-      isCompleted,
-      isDev,
-      isLocked,
-      title,
-      selected
-    } = this.props;
-    if (!title) {
-      return null;
-    }
-    const challengeClassName = classnames({
-      'text-primary': true,
-      'padded-ionic-icon': true,
-      'map-challenge-title': true,
-      'ion-checkmark-circled faded': !(isLocked || isComingSoon) && isCompleted,
-      'ion-ios-circle-outline': !(isLocked || isComingSoon) && !isCompleted,
-      'ion-locked': isLocked || isComingSoon,
-      disabled: isLocked || (!isDev && isComingSoon),
-      selectedChallenge: selected
-    });
-    if (isLocked || (!isDev && isComingSoon)) {
-      return this.renderLocked(
-        title,
-        isComingSoon,
-        challengeClassName
-      );
-    }
-    return (
-      <div
-        className={ challengeClassName }
-        data-challenge={dashedName}
-        key={ title }
-        >
-        <Link
-          onClick={ clickOnChallenge }
-          to={ onRouteChallenges({ dashedName, block }) }
-          >
-          <span >
-            { title }
-            { this.renderCompleted(isCompleted, isLocked) }
-          </span>
-        </Link>
-      </div>
-    );
-  }
-}
-
-Challenge.propTypes = propTypes;
-Challenge.dispalyName = 'Challenge';
-
-export default connect(
-  makeMapStateToProps,
-  mapDispatchToProps
-)(Challenge);
diff --git a/common/app/Map/Challenges.jsx b/common/app/Map/Challenges.jsx
deleted file mode 100644
index 975553a48a..0000000000
--- a/common/app/Map/Challenges.jsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-
-import Challenge from './Challenge.jsx';
-
-const propTypes = {
-  challenges: PropTypes.array.isRequired
-};
-
-export default class Challenges extends Component {
-  shouldComponentUpdate(nextProps) {
-    return this.props.challenges !== nextProps.challenges;
-  }
-  render() {
-    const { challenges } = this.props;
-    if (!challenges.length) {
-      return <div>No Challenges Found</div>;
-    }
-    return (
-      <div>
-        {
-          challenges.map(dashedName => (
-            <Challenge
-              dashedName={ dashedName }
-              key={ dashedName }
-            />
-          ))
-        }
-      </div>
-    );
-  }
-}
-
-Challenges.displayName = 'Challenges';
-Challenges.propTypes = propTypes;
diff --git a/common/app/Map/Map.jsx b/common/app/Map/Map.jsx
deleted file mode 100644
index 6d9ec9e3c8..0000000000
--- a/common/app/Map/Map.jsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { Col, Row } from 'react-bootstrap';
-
-import ns from './ns.json';
-import { Loader } from '../helperComponents';
-import SuperBlock from './Super-Block.jsx';
-import { currentChallengeSelector, superBlocksSelector } from '../redux';
-import { fetchMapUi } from './redux';
-
-const mapStateToProps = state => ({
-  currentChallenge: currentChallengeSelector(state),
-  superBlocks: superBlocksSelector(state)
-});
-
-const mapDispatchToProps = { fetchMapUi };
-const propTypes = {
-  currentChallenge: PropTypes.string,
-  fetchMapUi: PropTypes.func.isRequired,
-  params: PropTypes.object,
-  superBlocks: PropTypes.array
-};
-
-export class ShowMap extends PureComponent {
-  componentDidMount() {
-    this.setupMapScroll();
-  }
-
-  componentDidUpdate() {
-    this.setupMapScroll();
-  }
-
-  setupMapScroll() {
-    this.updateMapScrollAttempts = 0;
-    this.updateMapScroll();
-  }
-
-  updateMapScroll() {
-    const { currentChallenge } = this.props;
-    const rowNode = this._row;
-    const challengeNode = rowNode.querySelector(
-      `[data-challenge="${currentChallenge}"]`
-    );
-
-    if ( !challengeNode ) {
-      this.retryUpdateMapScroll();
-      return;
-    }
-
-    const containerScrollHeight = rowNode.scrollHeight;
-    const containerHeight = rowNode.clientHeight;
-
-    const offset = 100;
-    const itemTop = challengeNode.offsetTop;
-    const itemBottom = itemTop + challengeNode.clientHeight;
-
-    const currentViewBottom = rowNode.scrollTop + containerHeight;
-
-    if ( itemBottom + offset < currentViewBottom ) {
-      // item is visible with enough offset from bottom => no need to scroll
-      return;
-    }
-
-    if ( containerHeight === containerScrollHeight ) {
-      /*
-      * During a first run containerNode scrollHeight may be not updated yet.
-      * In this case containerNode ignores changes of scrollTop property.
-      * So we have to wait some time before scrollTop can be updated
-      * */
-      this.retryUpdateMapScroll();
-      return;
-    }
-
-    const scrollTop = itemBottom + offset - containerHeight;
-    rowNode.scrollTop = scrollTop;
-  }
-
-  retryUpdateMapScroll() {
-    const maxAttempts = 5;
-    this.updateMapScrollAttempts++;
-
-    if (this.updateMapScrollAttempts < maxAttempts) {
-      setTimeout(() => this.updateMapScroll(), 300);
-    }
-  }
-
-  renderSuperBlocks() {
-    const { superBlocks } = this.props;
-    if (!Array.isArray(superBlocks) || !superBlocks.length) {
-      return (
-        <div style={{ height: '300px' }}>
-          <Loader />
-        </div>
-      );
-    }
-    return superBlocks.map(dashedName => (
-      <SuperBlock
-        dashedName={ dashedName }
-        key={ dashedName }
-      />
-    ));
-  }
-
-  render() {
-    return (
-      <div className = { `${ns}-container`} ref={ ref => { this._row = ref; }}>
-        <Row>
-          <Col xs={ 12 }>
-            <div className={ `${ns}-accordion center-block` }>
-              { this.renderSuperBlocks() }
-              <div className='spacer' />
-            </div>
-          </Col>
-        </Row>
-      </div>
-    );
-  }
-}
-
-ShowMap.displayName = 'Map';
-ShowMap.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(ShowMap);
diff --git a/common/app/Map/Super-Block.jsx b/common/app/Map/Super-Block.jsx
deleted file mode 100644
index c5ce006263..0000000000
--- a/common/app/Map/Super-Block.jsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import FA from 'react-fontawesome';
-import { Panel } from 'react-bootstrap';
-
-import ns from './ns.json';
-import Blocks from './Blocks.jsx';
-import {
-  toggleThisPanel,
-
-  makePanelOpenSelector
-} from './redux';
-import { makeSuperBlockSelector } from '../entities';
-
-const mapDispatchToProps = { toggleThisPanel };
-// make selectors unique to each component
-// see
-// reactjs/reselect
-// sharing-selectors-with-props-across-multiple-components
-function mapStateToProps(_, { dashedName }) {
-  return createSelector(
-    makeSuperBlockSelector(dashedName),
-    makePanelOpenSelector(dashedName),
-    (superBlock, isOpen) => ({
-      isOpen,
-      dashedName,
-      title: superBlock.title || dashedName,
-      blocks: superBlock.blocks || []
-    })
-  );
-}
-
-const propTypes = {
-  blocks: PropTypes.array,
-  dashedName: PropTypes.string,
-  isOpen: PropTypes.bool,
-  title: PropTypes.string,
-  toggleThisPanel: PropTypes.func
-};
-
-export class SuperBlock extends PureComponent {
-  constructor(...props) {
-    super(...props);
-    this.handleSelect = this.handleSelect.bind(this);
-  }
-  handleSelect(eventKey, e) {
-    e.preventDefault();
-    this.props.toggleThisPanel(eventKey);
-  }
-
-  renderHeader(isOpen, title, isCompleted) {
-    return (
-      <div className={ isCompleted ? 'faded' : '' }>
-        <FA
-          className={ `${ns}-caret` }
-          name={ isOpen ? 'caret-down' : 'caret-right' }
-          size='lg'
-        />
-        { title }
-      </div>
-    );
-  }
-
-  render() {
-    const {
-      title,
-      dashedName,
-      blocks,
-      isOpen
-    } = this.props;
-    return (
-      <Panel
-        bsClass={ `${ns}-accordion-panel` }
-        collapsible={ true }
-        eventKey={ dashedName || title }
-        expanded={ isOpen }
-        header={ this.renderHeader(isOpen, title) }
-        id={ title }
-        key={ dashedName || title }
-        onSelect={ this.handleSelect }
-        >
-        <Blocks blocks={ blocks } />
-      </Panel>
-    );
-  }
-}
-
-SuperBlock.displayName = 'SuperBlock';
-SuperBlock.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(SuperBlock);
diff --git a/common/app/Map/index.js b/common/app/Map/index.js
deleted file mode 100644
index a046dd5d2d..0000000000
--- a/common/app/Map/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default from './Map.jsx';
diff --git a/common/app/Map/map.less b/common/app/Map/map.less
deleted file mode 100644
index c95767bf79..0000000000
--- a/common/app/Map/map.less
+++ /dev/null
@@ -1,144 +0,0 @@
-// should be the same as the filename and ./ns.json
-@ns: map;
-
-.@{ns}-container {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
-.@{ns}-accordion {
-  max-width: 700px;
-  overflow-y: auto;
-  width: 100%;
-
-  a:focus {
-    text-decoration: none;
-    color:darkgreen;
-  }
-
-  a:focus:hover {
-    text-decoration: underline;
-    color:#001800;
-  }
-
-  @media (max-width: 720px) {
-    left: 0;
-    right: 0;
-    width: 100%;
-    top: 195px;
-    bottom: 0;
-    // position:absolute;
-    overflow-x: hidden;
-    overflow-y: auto;
-    -webkit-overflow-scrolling: touch;
-    h2 {
-      margin:15px 0;
-      padding:0;
-      &:first-of-type {
-        margin-top:0;
-      }
-      > a {
-        padding: 10px 0;
-        padding-left: 50px;
-        padding-right: 20px;
-        font-size: 20px;
-      }
-    }
-    a {
-      margin: 10px 0;
-      padding: 0;
-      > h3 {
-        clear:both;
-        font-size:20px;
-      }
-    }
-  }
-
-  .@{ns}-caret {
-    color: @gray-dark;
-    text-decoration: none;
-    // make sure all carats are fixed width
-    width: 10px;
-  }
-}
-
-
-.@{ns}-accordion-block .@{ns}-accordion-panel-heading {
-  padding-left: 26px;
-}
-
-.@{ns}-challenge-title, .@{ns}-accordion-panel-heading {
-  background: @body-bg;
-  line-height: 26px;
-  padding: 2px 12px 2px 10px;
-  width:100%;
-}
-
-.@{ns}-challenge-title {
-  &::before {
-    padding-right: 6px;
-  }
-  padding-left: 40px;
-  a {
-    cursor: pointer;
-  }
-  @media (min-width: 721px) {
-    clear: both;
-  }
-}
-
-.@{ns}-accordion-panel-heading a {
-  cursor: pointer;
-  display: block;
-}
-
-.@{ns}-accordion-panel-collapse {
-  transition: height 0.001s;
-}
-
-.@{ns}-accordion-panel-title {
-  @media (min-width: 721px) {
-    clear: both;
-  }
-}
-
-.@{ns}-block-time {
-  color: #555555;
-  @media (min-width: 721px) {
-    float: right;
-  }
-}
-
-.@{ns}-block-description {
-  margin:0;
-  margin-top:-10px;
-  padding:0 15px 23px 30px;
-}
-
-
-.night {
-  .@{ns}-accordion .no-link-underline {
-    color: @brand-primary;
-  }
-  .@{ns}-accordion h2 > a {
-    background: #666;
-  }
-  .@{ns}-accordion a:focus, #noneFound {
-    color: #ABABAB;
-  }
-  .@{ns}-challenge-title, .@{ns}-accordion-panel-heading {
-    background: @night-body-bg;
-    color: @night-text-color;
-    a {
-      color: @night-text-color;
-    }
-  }
-  .@{ns}-caret {
-    color: @night-text-color;
-  }
-}
diff --git a/common/app/Map/ns.json b/common/app/Map/ns.json
deleted file mode 100644
index 6bc66fc09e..0000000000
--- a/common/app/Map/ns.json
+++ /dev/null
@@ -1 +0,0 @@
-"map"
diff --git a/common/app/Map/redux/fetch-map-ui-epic.js b/common/app/Map/redux/fetch-map-ui-epic.js
index 37e7cfa09b..9933f1121e 100644
--- a/common/app/Map/redux/fetch-map-ui-epic.js
+++ b/common/app/Map/redux/fetch-map-ui-epic.js
@@ -3,38 +3,34 @@ import debug from 'debug';
 
 import {
   types as appTypes,
-  createErrorObservable,
-  currentChallengeSelector
+  createErrorObservable
 } from '../../redux';
 import { types, fetchMapUiComplete } from './';
-import { langSelector } from '../../Router/redux';
 import { shapeChallenges } from '../../redux/utils';
 
 const isDev = debug.enabled('fcc:*');
 
 export default function fetchMapUiEpic(
   actions,
-  { getState },
+  _,
   { services }
 ) {
-  return actions::ofType(
+  return actions.do(console.log)::ofType(
     appTypes.appMounted,
     types.fetchMapUi.start
   )
     .flatMapLatest(() => {
-      const lang = langSelector(getState());
       const options = {
-        params: { lang },
         service: 'map-ui'
       };
       return services.readService$(options)
         .retry(3)
+        .do(console.info)
         .map(({ entities, ...res }) => ({
           entities: shapeChallenges(
             entities,
             isDev
           ),
-          initialNode: currentChallengeSelector(getState()),
           ...res
         }))
         .map(fetchMapUiComplete)
diff --git a/common/app/Map/redux/index.js b/common/app/Map/redux/index.js
index f68e67c32e..8fdc57c0a7 100644
--- a/common/app/Map/redux/index.js
+++ b/common/app/Map/redux/index.js
@@ -8,13 +8,14 @@ import { createSelector } from 'reselect';
 import { capitalize, noop } from 'lodash';
 
 import * as utils from './utils.js';
-import ns from '../ns.json';
 import {
   createEventMetaCreator
 } from '../../redux';
 
 import fetchMapUiEpic from './fetch-map-ui-epic';
 
+const ns = 'map';
+
 export const epics = [ fetchMapUiEpic ];
 
 export const types = createTypes([
diff --git a/common/app/Nav/LargeNav.jsx b/common/app/Nav/LargeNav.jsx
index d0925bc37d..a1127e3bf4 100644
--- a/common/app/Nav/LargeNav.jsx
+++ b/common/app/Nav/LargeNav.jsx
@@ -2,11 +2,11 @@ import React from 'react';
 import Media from 'react-media';
 import { Col, Navbar, Row } from 'react-bootstrap';
 import FCCSearchBar from 'react-freecodecamp-search';
-import { NavLogo, BinButtons, NavLinks } from './components';
+import { NavLogo, NavLinks } from './components';
 
 import propTypes from './navPropTypes';
 
-function LargeNav({ clickOnLogo, clickOnMap, shouldShowMapButton, panes }) {
+function LargeNav({ clickOnLogo }) {
   return (
     <Media
       query='(min-width: 956px)'
@@ -19,15 +19,10 @@ function LargeNav({ clickOnLogo, clickOnMap, shouldShowMapButton, panes }) {
                 <FCCSearchBar />
               </Navbar.Header>
             </Col>
-            <Col className='nav-component bins' sm={ 3 } xs={ 6 }>
-              <BinButtons panes={ panes } />
-            </Col>
+            <Col className='nav-component bins' sm={ 3 } xs={ 6 }/>
             <Col className='nav-component nav-links' sm={ 4 } xs={ 0 }>
               <Navbar.Collapse>
-                <NavLinks
-                  clickOnMap={ clickOnMap }
-                  shouldShowMapButton={ shouldShowMapButton }
-                />
+                <NavLinks />
               </Navbar.Collapse>
           </Col>
           </Row>
diff --git a/common/app/Nav/MediumNav.jsx b/common/app/Nav/MediumNav.jsx
index 559bf623f1..76c84095b5 100644
--- a/common/app/Nav/MediumNav.jsx
+++ b/common/app/Nav/MediumNav.jsx
@@ -2,11 +2,11 @@ import React from 'react';
 import Media from 'react-media';
 import { Navbar, Row } from 'react-bootstrap';
 import FCCSearchBar from 'react-freecodecamp-search';
-import { NavLogo, BinButtons, NavLinks } from './components';
+import { NavLogo, NavLinks } from './components';
 
 import propTypes from './navPropTypes';
 
-function MediumNav({ clickOnLogo, clickOnMap, shouldShowMapButton, panes }) {
+function MediumNav({ clickOnLogo }) {
   return (
     <Media
       query={{ maxWidth: 955, minWidth: 751 }}
@@ -15,23 +15,18 @@ function MediumNav({ clickOnLogo, clickOnMap, shouldShowMapButton, panes }) {
         matches => matches && typeof window !== 'undefined' && (
           <div>
           <Row>
-              <Navbar.Header className='medium-nav'>
-            <div className='nav-component header'>
-                <Navbar.Toggle />
-                <NavLogo clickOnLogo={ clickOnLogo } />
-                <FCCSearchBar />
-            </div>
-            <div className='nav-component bins'>
-              <BinButtons panes={ panes } />
-            </div>
-              </Navbar.Header>
+            <Navbar.Header className='medium-nav'>
+              <div className='nav-component header'>
+                  <Navbar.Toggle />
+                  <NavLogo clickOnLogo={ clickOnLogo } />
+                  <FCCSearchBar />
+              </div>
+              <div className='nav-component bins'/>
+            </Navbar.Header>
           </Row>
           <Row className='collapse-row'>
             <Navbar.Collapse>
-                <NavLinks
-                  clickOnMap={ clickOnMap }
-                  shouldShowMapButton={ shouldShowMapButton }
-                />
+                <NavLinks />
               </Navbar.Collapse>
           </Row>
           </div>
diff --git a/common/app/Nav/Nav.jsx b/common/app/Nav/Nav.jsx
index aaddb015fa..23714fcb0f 100644
--- a/common/app/Nav/Nav.jsx
+++ b/common/app/Nav/Nav.jsx
@@ -1,67 +1,25 @@
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
 import { Navbar } from 'react-bootstrap';
 
 import LargeNav from './LargeNav.jsx';
 import MediumNav from './MediumNav.jsx';
 import SmallNav from './SmallNav.jsx';
 import {
-  clickOnLogo,
-  clickOnMap
+  clickOnLogo
 } from './redux';
-import { panesSelector, panesByNameSelector } from '../Panes/redux';
 import propTypes from './navPropTypes';
 
-const mapStateToProps = createSelector(
-  panesSelector,
-  panesByNameSelector,
-  (panes, panesByName) => {
-    return {
-      panes: panes.map(({ name, type }) => {
-        return {
-          content: name,
-          action: type,
-          isHidden: panesByName[name].isHidden
-        };
-      }, {}),
-      shouldShowMapButton: panes.length === 0
-    };
-  }
-);
+const mapStateToProps = () => ({});
 
 function mapDispatchToProps(dispatch) {
-  const dispatchers = bindActionCreators(
+  return bindActionCreators(
     {
-      clickOnMap: e => {
-        e.preventDefault();
-        return clickOnMap();
-      },
-      clickOnLogo: e => {
-        e.preventDefault();
-        return clickOnLogo();
-      }
+      clickOnLogo
     },
     dispatch
   );
-  dispatchers.dispatch = dispatch;
-  return () => dispatchers;
-}
-
-function mergeProps(stateProps, dispatchProps, ownProps) {
-  const panes = stateProps.panes.map(pane => {
-    return {
-      ...pane,
-      actionCreator: () => dispatchProps.dispatch({ type: pane.action })
-    };
-  });
-  return {
-    ...ownProps,
-    ...stateProps,
-    ...dispatchProps,
-    panes
-  };
 }
 
 const allNavs = [
@@ -72,18 +30,12 @@ const allNavs = [
 
 function FCCNav(props) {
   const {
-    panes,
-    clickOnLogo,
-    clickOnMap,
-    shouldShowMapButton
+    clickOnLogo
   } = props;
   const withNavProps = Component => (
     <Component
       clickOnLogo={ clickOnLogo }
-      clickOnMap={ clickOnMap }
       key={ Component.displayName }
-      panes={ panes }
-      shouldShowMapButton={ shouldShowMapButton }
     />
   );
   return (
@@ -104,6 +56,5 @@ FCCNav.propTypes = propTypes;
 
 export default connect(
   mapStateToProps,
-  mapDispatchToProps,
-  mergeProps
+  mapDispatchToProps
 )(FCCNav);
diff --git a/common/app/Nav/SmallNav.jsx b/common/app/Nav/SmallNav.jsx
index 50b456e1c3..dfa251437e 100644
--- a/common/app/Nav/SmallNav.jsx
+++ b/common/app/Nav/SmallNav.jsx
@@ -2,11 +2,11 @@ import React from 'react';
 import Media from 'react-media';
 import { Navbar, Row } from 'react-bootstrap';
 import FCCSearchBar from 'react-freecodecamp-search';
-import { NavLogo, BinButtons, NavLinks } from './components';
+import { NavLogo, NavLinks } from './components';
 
 import propTypes from './navPropTypes';
 
-function SmallNav({ clickOnLogo, clickOnMap, shouldShowMapButton, panes }) {
+function SmallNav({ clickOnLogo }) {
   return (
     <Media
       query='(max-width: 750px)'
@@ -15,22 +15,17 @@ function SmallNav({ clickOnLogo, clickOnMap, shouldShowMapButton, panes }) {
         matches => matches && typeof window !== 'undefined' && (
           <div>
           <Row>
-              <Navbar.Header className='small-nav'>
-            <div className='nav-component header'>
-                <Navbar.Toggle />
-                <NavLogo clickOnLogo={ clickOnLogo } />
-            </div>
-            <div className='nav-component bins'>
-              <BinButtons panes={ panes } />
-            </div>
-              </Navbar.Header>
+            <Navbar.Header className='small-nav'>
+              <div className='nav-component header'>
+                  <Navbar.Toggle />
+                  <NavLogo clickOnLogo={ clickOnLogo } />
+              </div>
+              <div className='nav-component bins'/>
+            </Navbar.Header>
           </Row>
           <Row className='collapse-row'>
             <Navbar.Collapse>
-              <NavLinks
-                clickOnMap={ clickOnMap }
-                shouldShowMapButton={ shouldShowMapButton }
-                >
+              <NavLinks>
                 <FCCSearchBar />
               </NavLinks>
             </Navbar.Collapse>
diff --git a/common/app/Nav/components/NavLinks.jsx b/common/app/Nav/components/NavLinks.jsx
index 950d7ed8e8..ac12ba778b 100644
--- a/common/app/Nav/components/NavLinks.jsx
+++ b/common/app/Nav/components/NavLinks.jsx
@@ -8,10 +8,8 @@ import { MenuItem, NavDropdown, NavItem, Nav } from 'react-bootstrap';
 
 import navLinks from '../links.json';
 import SignUp from './Sign-Up.jsx';
-import NoPropsPassThrough from '../../utils/No-Props-Passthrough.jsx';
 import { Link } from '../../Router';
 
-import { onRouteCurrentChallenge } from '../../routes/Challenges/redux';
 import {
   openDropdown,
   closeDropdown,
@@ -58,14 +56,12 @@ const navLinkPropType = PropTypes.shape({
 
 const propTypes = {
   children: PropTypes.any,
-  clickOnMap: PropTypes.func.isRequired,
   closeDropdown: PropTypes.func.isRequired,
   isDropdownOpen: PropTypes.bool,
   isInNav: PropTypes.bool,
   isSignedIn: PropTypes.bool,
   navLinks: PropTypes.arrayOf(navLinkPropType),
   openDropdown: PropTypes.func.isRequired,
-  shouldShowMapButton: PropTypes.bool,
   showLoading: PropTypes.bool
 };
 
@@ -125,8 +121,6 @@ class NavLinks extends PureComponent {
 
   render() {
     const {
-      shouldShowMapButton,
-      clickOnMap,
       showLoading,
       isSignedIn,
       navLinks,
@@ -136,20 +130,6 @@ class NavLinks extends PureComponent {
     return (
       <Nav id='nav-links' navbar={ true } pullRight={ true }>
         { children }
-        {
-          shouldShowMapButton ?
-            <NoPropsPassThrough>
-              <li>
-                <Link
-                  onClick={ clickOnMap }
-                  to={ onRouteCurrentChallenge() }
-                  >
-                  Map
-                </Link>
-              </li>
-            </NoPropsPassThrough> :
-            null
-        }
         {
           navLinks.map(
             this.renderLink.bind(this, isInNav)
diff --git a/common/app/Nav/components/NavLogo.jsx b/common/app/Nav/components/NavLogo.jsx
index 3ead758437..31a1d811f5 100644
--- a/common/app/Nav/components/NavLogo.jsx
+++ b/common/app/Nav/components/NavLogo.jsx
@@ -4,9 +4,7 @@ import { NavbarBrand } from 'react-bootstrap';
 import Media from 'react-media';
 
 const fCClogo = 'https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg';
-// TODO @freecodecamp-team: place this glyph in S3 like above, PR in /assets
-const fCCglyph = 'https://raw.githubusercontent.com/freeCodeCamp/assets/' +
-'3b9cafc312802199ebba8b31fb1ed9b466a3efbb/assets/logos/FFCFire.png';
+const fCCglyph = 'https://s3.amazonaws.com/freecodecamp/FFCFire.png';
 
 const propTypes = {
   clickOnLogo: PropTypes.func.isRequired
@@ -16,7 +14,7 @@ function NavLogo({ clickOnLogo }) {
   return (
     <NavbarBrand>
       <a
-        href='/challenges/current-challenge'
+        href='/'
         onClick={ clickOnLogo }
         >
         <Media query='(min-width: 735px)'>
diff --git a/common/app/Nav/links.json b/common/app/Nav/links.json
index bfebcc7ad9..a268239541 100644
--- a/common/app/Nav/links.json
+++ b/common/app/Nav/links.json
@@ -1,43 +1,12 @@
 [
   {
-    "content": "Community",
-    "isDropdown": true,
-    "links": [
-      {
-        "content": "Chat",
-        "link": "https://gitter.im/freecodecamp/home",
-        "target": "_blank"
-      },
-      {
-        "content": "Forum",
-        "link": "https://forum.freecodecamp.org/",
-        "target": "_blank"
-      },
-      {
-        "content": "Medium",
-        "link": "https://medium.freecodecamp.org",
-        "target": "_blank"
-      },
-      {
-        "content": "YouTube",
-        "link": "https://youtube.com/freecodecamp",
-        "target": "_blank"
-      },
-      {
-        "content": "In your city",
-        "link": "https://forum.freecodecamp.org/t/free-code-camp-city-based-local-groups/19574",
-        "target": "_blank"
-      },
-      {
-        "content": "About",
-        "link": "https://www.freecodecamp.org/about",
-        "target": "_blank"
-      }
-    ]
+    "content": "Learn",
+    "link": "https://learn.freecodecamp.org",
+    "target": "_blank"
   },
   {
-    "content": "Donate",
-    "link": "https://www.freecodecamp.org/donate",
+    "content": "Forum",
+    "link": "https://forum.freecodecamp.org/",
     "target": "_blank"
   }
-]
+]
\ No newline at end of file
diff --git a/common/app/Nav/navPropTypes.js b/common/app/Nav/navPropTypes.js
index 6b945f8490..309c69ecac 100644
--- a/common/app/Nav/navPropTypes.js
+++ b/common/app/Nav/navPropTypes.js
@@ -1,8 +1,5 @@
 import PropTypes from 'prop-types';
 
 export default {
-  clickOnLogo: PropTypes.func.isRequired,
-  clickOnMap: PropTypes.func.isRequired,
-  panes: PropTypes.array,
-  shouldShowMapButton: PropTypes.bool
+  clickOnLogo: PropTypes.func.isRequired
 };
diff --git a/common/app/Nav/redux/index.js b/common/app/Nav/redux/index.js
index 0233add11b..6a354b8b31 100644
--- a/common/app/Nav/redux/index.js
+++ b/common/app/Nav/redux/index.js
@@ -6,13 +6,10 @@ import {
   handleActions
 } from 'berkeleys-redux-utils';
 
-import loadCurrentChallengeEpic from './load-current-challenge-epic.js';
 import ns from '../ns.json';
 import { createEventMetaCreator } from '../../analytics/index';
 
-export const epics = [
-  loadCurrentChallengeEpic
-];
+export const epics = [];
 
 export const types = createTypes([
   'clickOnLogo',
diff --git a/common/app/Nav/redux/load-current-challenge-epic.js b/common/app/Nav/redux/load-current-challenge-epic.js
deleted file mode 100644
index 456d5f401f..0000000000
--- a/common/app/Nav/redux/load-current-challenge-epic.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import _ from 'lodash';
-import { ofType } from 'redux-epic';
-
-import { types } from './';
-import {
-  userSelector,
-  firstChallengeSelector,
-  challengeSelector
-} from '../../redux';
-import { onRouteChallenges } from '../../routes/Challenges/redux';
-import { entitiesSelector } from '../../entities';
-import { langSelector, pathnameSelector } from '../../Router/redux';
-
-export default function loadCurrentChallengeEpic(actions, { getState }) {
-  return actions::ofType(types.clickOnLogo, types.clickOnMap)
-    .debounce(500)
-    .map(getState)
-    .map(state => {
-      let finalChallenge;
-      const lang = langSelector(state);
-      const { id: currentlyLoadedChallengeId } = challengeSelector(state);
-      const {
-        challenge: challengeMap,
-        challengeIdToName
-      } = entitiesSelector(state);
-      const pathname = pathnameSelector(state);
-      const firstChallenge = firstChallengeSelector(state);
-      const { currentChallengeId } = userSelector(state);
-      const isOnAChallenge = (/^\/[^\/]{2,6}\/challenges/).test(pathname);
-
-      if (!currentChallengeId) {
-        finalChallenge = firstChallenge;
-      } else {
-        finalChallenge = challengeMap[
-          challengeIdToName[ currentChallengeId ]
-        ];
-      }
-      return {
-        ..._.pick(finalChallenge, ['id', 'block', 'dashedName']),
-        lang,
-        isOnAChallenge,
-        currentlyLoadedChallengeId
-      };
-    })
-    .filter(({
-      id,
-      isOnAChallenge,
-      currentlyLoadedChallengeId
-    }) => (
-      // data might not be there yet, filter out for now
-      !!id &&
-      // are we already on that challenge? if not load challenge
-      (!isOnAChallenge || id !== currentlyLoadedChallengeId)
-      // don't reload if the challenge is already loaded.
-      // This may change to toast to avoid user confusion
-    ))
-    .map(onRouteChallenges);
-}
diff --git a/common/app/Panes/Divider.jsx b/common/app/Panes/Divider.jsx
deleted file mode 100644
index 81787bb0f5..0000000000
--- a/common/app/Panes/Divider.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-
-import { dividerClicked } from './redux';
-
-const mapStateToProps = null;
-function mapDispatchToProps(dispatch, { name }) {
-  const dispatchers = {
-    dividerClicked: () => dispatch(dividerClicked(name))
-  };
-  return () => dispatchers;
-}
-
-const propTypes = {
-  dividerClicked: PropTypes.func.isRequired,
-  left: PropTypes.number.isRequired,
-  name: PropTypes.string.isRequired
-};
-
-export function Divider({ left, dividerClicked }) {
-  const style = {
-    borderLeft: '1px solid rgb(204, 204, 204)',
-    bottom: 0,
-    cursor: 'col-resize',
-    height: '100%',
-    left: left + '%',
-    marginLeft: '0px',
-    position: 'absolute',
-    right: 'auto',
-    top: 0,
-    width: '8px',
-    zIndex: 100
-  };
-  // use onMouseDown as onClick does not fire
-  // until onMouseUp
-  // note(berks): do we need touch support?
-  return (
-    <div
-      onMouseDown={ dividerClicked }
-      style={ style }
-    />
-  );
-}
-Divider.displayName = 'Divider';
-Divider.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Divider);
diff --git a/common/app/Panes/Pane.jsx b/common/app/Panes/Pane.jsx
deleted file mode 100644
index 93629d0512..0000000000
--- a/common/app/Panes/Pane.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-
-const mapStateToProps = null;
-const mapDispatchToProps = null;
-const propTypes = {
-  children: PropTypes.element,
-  left: PropTypes.number.isRequired,
-  right: PropTypes.number.isRequired
-};
-
-export function Pane({
-  children,
-  left,
-  right
-}) {
-  const style = {
-    bottom: 0,
-    left: left + '%',
-    overflowX: 'hidden',
-    overflowY: 'auto',
-    position: 'absolute',
-    right: right + '%',
-    top: 0,
-    paddingLeft: '0px',
-    paddingRight: '0px'
-  };
-  return (
-    <div style={ style }>
-      { children }
-    </div>
-  );
-}
-Pane.displayName = 'Pane';
-Pane.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Pane);
diff --git a/common/app/Panes/Panes.jsx b/common/app/Panes/Panes.jsx
deleted file mode 100644
index 27523ac80d..0000000000
--- a/common/app/Panes/Panes.jsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-
-import {
-  panesSelector,
-  panesByNameSelector,
-  panesMounted,
-  widthSelector
-} from './redux';
-import Pane from './Pane.jsx';
-import Divider from './Divider.jsx';
-import { fetchRandomQuote } from './quotes';
-
-const mapStateToProps = createSelector(
-  panesSelector,
-  panesByNameSelector,
-  widthSelector,
-  (panes, panesByName) => {
-    let lastDividerPosition = 0;
-    return {
-      panes: panes
-        .map(({ name }) => panesByName[name])
-        .filter(({ isHidden })=> !isHidden)
-        .map((pane, index, { length: numOfPanes }) => {
-          const dividerLeft = pane.dividerLeft || 0;
-          const left = lastDividerPosition;
-          lastDividerPosition = dividerLeft;
-          return {
-            ...pane,
-            left: index === 0 ? 0 : left,
-            right: index + 1 === numOfPanes ? 0 : 100 - dividerLeft
-          };
-        }, {})
-    };
-  }
-);
-
-const mapDispatchToProps = { panesMounted };
-
-const propTypes = {
-  panes: PropTypes.array,
-  panesMounted: PropTypes.func.isRequired,
-  render: PropTypes.func.isRequired
-};
-
-let quoteObj = fetchRandomQuote();
-
-export class Panes extends PureComponent {
-  componentDidMount() {
-    this.props.panesMounted();
-  }
-  componentDidUpdate(prevProps) {
-    if (prevProps.panes.length === 0 && this.props.panes.length === 1) {
-      const currentQuote = quoteObj.quote;
-      let newQuoteObj = fetchRandomQuote();
-      while (currentQuote === newQuoteObj.quote) {
-        newQuoteObj = fetchRandomQuote();
-      }
-      quoteObj = newQuoteObj;
-    }
-  }
-
-  renderPanes() {
-    const {
-      render,
-      panes
-    } = this.props;
-    if (panes.length > 0) {
-      return panes.map(({ name, left, right, dividerLeft }) => {
-        const divider = dividerLeft ?
-          (
-            <Divider
-              key={ name + 'divider' }
-              left={ dividerLeft }
-              name={ name }
-            />
-          ) :
-          null;
-
-        return [
-          <Pane
-            key={ name }
-            left={ left }
-            right={ right }
-            >
-            { render(name) }
-          </Pane>,
-          divider
-        ];
-      }).reduce((panes, pane) => panes.concat(pane), [])
-        .filter(Boolean);
-    } else {
-      return this.renderQuote();
-    }
-  }
-
-  renderQuote() {
-    return (
-      <div className='outer-flex-container'>
-        <div className='quote-container'>
-          <h2 className='quote-style'>&ldquo;{quoteObj.quote}&rdquo;</h2>
-          <h2 className='author-style'><i>&mdash;{quoteObj.author}</i></h2>
-        </div>
-      </div>
-    );
-  }
-
-  render() {
-    return (
-      <div className='outer-style'>
-        <div className='inner-style'>
-          { this.renderPanes() }
-        </div>
-      </div>
-    );
-  }
-}
-
-Panes.displayName = 'Panes';
-Panes.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Panes);
diff --git a/common/app/Panes/index.js b/common/app/Panes/index.js
deleted file mode 100644
index 2d89e14578..0000000000
--- a/common/app/Panes/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default from './Panes.jsx';
diff --git a/common/app/Panes/ns.json b/common/app/Panes/ns.json
deleted file mode 100644
index 23b82c1253..0000000000
--- a/common/app/Panes/ns.json
+++ /dev/null
@@ -1 +0,0 @@
-"panes"
diff --git a/common/app/Panes/panes.less b/common/app/Panes/panes.less
deleted file mode 100644
index 2b8def5907..0000000000
--- a/common/app/Panes/panes.less
+++ /dev/null
@@ -1,42 +0,0 @@
-.outer-style {
-  position: relative;
-  height: 100%;
-  width: 100%;
-}
-
-.inner-style {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-}
-
-.outer-flex-container {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  width: 40%;
-  margin: auto;
-}
-
-.quote-container {
-  color: #006400;
-  margin: auto;
-}
-
-.quote-style {
-  margin: auto;
-  line-height: 150%;
-}
-
-.author-style {
-  text-align: center;
-  margin: 10px 0 0 0;
-}
-
-.night {
-  .quote-container {
-    color: @night-text-color;
-  }
-}
diff --git a/common/app/Panes/quotes.js b/common/app/Panes/quotes.js
deleted file mode 100644
index ef9b8f3a5f..0000000000
--- a/common/app/Panes/quotes.js
+++ /dev/null
@@ -1,71 +0,0 @@
-const quotes = [
-  {
-    quote: 'Never, never, never, never, never, never give up.',
-    author: 'Winston Churchill'
-  },
-  {
-    quote: 'The pessimist sees difficulty in every opportunity. ' +
-      'The optimist sees opportunity in every difficulty.',
-    author: 'Winston Churchill'
-  },
-  {
-    quote: 'Twenty years from now you will be more disappointed by the ' +
-      'things that you didn\'t do than by the ones you did do. So throw ' +
-      'off the bowlines. Sail away from the safe harbor. Catch the trade ' +
-      'winds in your sails.',
-    author: 'Mark Twain'
-  },
-  {
-    quote: 'The secret of getting ahead is getting started.',
-    author: 'Mark Twain'
-  },
-  {
-    quote: 'Change your life today. Don’t gamble on the future, act now, ' +
-      'without delay.',
-    author: 'Simone de Beauvoir'
-  },
-  {
-    quote: 'A person who never made a mistake never tried anything new.',
-    author: 'Albert Einstein'
-  },
-  {
-    quote: 'Life is like riding a bicycle. To keep your balance, you must ' +
-      'keep moving.',
-    author: 'Albert Einstein'
-  },
-  {
-    quote: 'Nothing will work unless you do.',
-    author: 'Maya Angelou'
-  },
-  {
-    quote: 'The most difficult thing is the decision to act, the rest is ' +
-      'merely tenacity.',
-    author: 'Amelia Earhart'
-  },
-  {
-    quote: 'When you reach for the stars, you may not quite get them, but ' +
-      'you won\'t come up with a handful of mud, either.',
-    author: 'Leo Burnett'
-  },
-  {
-    quote: 'The only person you are destined to become is the person you ' +
-      'decide to be.',
-    author: 'Ralph Waldo Emerson'
-  },
-  {
-    quote: 'You must do the things you think you cannot do.',
-    author: 'Eleanor Roosevelt'
-  },
-  {
-    quote: 'You are never too old to set another goal or to dream a new dream.',
-    author: 'C.S. Lewis'
-  },
-  {
-    quote: 'Believe you can and you\'re halfway there.',
-    author: 'Theodore Roosevelt'
-  }
-];
-
-export function fetchRandomQuote() {
-  return quotes[Math.floor(Math.random() * quotes.length)];
-}
diff --git a/common/app/Panes/redux/divider-epic.js b/common/app/Panes/redux/divider-epic.js
deleted file mode 100644
index 130c472588..0000000000
--- a/common/app/Panes/redux/divider-epic.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import 'rx-dom';
-import { Observable, Scheduler } from 'rx';
-import { combineEpics, ofType } from 'redux-epic';
-
-import {
-  types,
-
-  mouseReleased,
-  dividerMoved,
-
-  pressedDividerSelector
-} from './';
-
-export function dividerReleasedEpic(actions, _, { document }) {
-  return actions::ofType(types.dividerClicked)
-    .switchMap(() => Observable.fromEvent(document, 'mouseup')
-      .map(() => mouseReleased())
-      // allow mouse up on divider to go first
-      .delay(1)
-      .takeUntil(actions::ofType(types.mouseReleased))
-    );
-}
-
-export function dividerMovedEpic(actions, { getState }, { document }) {
-  return actions::ofType(types.dividerClicked)
-    .switchMap(() => Observable.fromEvent(document, 'mousemove')
-      // prevent mouse drags from highlighting text
-      .do(e => e.preventDefault())
-      .map(({ clientX }) => clientX)
-      .throttle(1, Scheduler.requestAnimationFrame)
-      .filter(() => {
-        const divider = pressedDividerSelector(getState());
-        return !!divider || divider === 0;
-      })
-      .map(dividerMoved)
-      .takeUntil(actions::ofType(types.mouseReleased))
-    );
-}
-
-export default combineEpics(dividerReleasedEpic, dividerMovedEpic);
diff --git a/common/app/Panes/redux/index.js b/common/app/Panes/redux/index.js
deleted file mode 100644
index f338ddcfff..0000000000
--- a/common/app/Panes/redux/index.js
+++ /dev/null
@@ -1,213 +0,0 @@
-import _ from 'lodash';
-import {
-  composeReducers,
-  createAction,
-  createTypes,
-  handleActions
-} from 'berkeleys-redux-utils';
-
-import * as utils from './utils.js';
-import windowEpic from './window-epic.js';
-import dividerEpic from './divider-epic.js';
-import ns from '../ns.json';
-
-export const epics = [
-  windowEpic,
-  dividerEpic
-];
-
-export const types = createTypes([
-  'panesMapUpdated',
-  'panesMounted',
-  'panesUpdated',
-  'panesWillMount',
-  'panesWillUnmount',
-  'updateSize',
-
-  'dividerClicked',
-  'dividerMoved',
-  'mouseReleased',
-  'windowResized'
-], ns);
-
-export const panesMapUpdated = createAction(
-  types.panesMapUpdated,
-  null,
-  (type, panesMap) => ({ trigger: type, panesMap })
-);
-export const panesMounted = createAction(types.panesMounted);
-export const panesUpdated = createAction(types.panesUpdated);
-export const panesWillMount = createAction(types.panesWillMount);
-export const panesWillUnmount = createAction(types.panesWillUnmount);
-
-export const dividerClicked = createAction(types.dividerClicked);
-export const dividerMoved = createAction(types.dividerMoved);
-export const mouseReleased = createAction(types.mouseReleased);
-export const windowResized = createAction(types.windowResized);
-
-const defaultState = {
-  width: 800,
-  panes: [],
-  panesByName: {},
-  panesMap: {},
-  pressedDivider: null
-};
-export const getNS = state => state[ns];
-
-export const panesSelector = state => getNS(state).panes;
-export const panesByNameSelector = state => getNS(state).panesByName;
-export const pressedDividerSelector =
-  state => getNS(state).pressedDivider;
-export const widthSelector = state => getNS(state).width;
-export const panesMapSelector = state => getNS(state).panesMap;
-
-export default function createPanesAspects({ createPanesMap }) {
-  createPanesMap = utils.normalizePanesMapCreator(createPanesMap);
-
-  function middleware({ getState }) {
-    return next => action => {
-      let finalAction = action;
-      const panesMap = panesMapSelector(getState());
-      if (utils.isPanesAction(action, panesMap)) {
-        finalAction = {
-          ...action,
-          meta: {
-            ...action.meta,
-            isPaneAction: true,
-            paneName: panesMap[action.type]
-          }
-        };
-      }
-      const result = next(finalAction);
-      const nextPanesMap = createPanesMap(getState(), action);
-      if (nextPanesMap) {
-        utils.checkForTypeKeys(nextPanesMap);
-        next(panesMapUpdated(action.type, nextPanesMap));
-      }
-      return result;
-    };
-  }
-
-  const reducer = composeReducers(
-    ns,
-    handleActions(
-      () => ({
-        [types.dividerClicked]: (state, { payload: name }) => ({
-          ...state,
-          pressedDivider: name
-        }),
-        [types.dividerMoved]: (state, { payload: clientX }) => {
-          const {
-            panes,
-            panesByName,
-            pressedDivider: paneName,
-            width
-          } = state;
-          const dividerBuffer = (200 / width) * 100;
-          const paneIndex =
-            _.findIndex(state.panes, ({ name }) => paneName === name);
-          const currentPane = panesByName[paneName];
-          const rightPane = utils.getPane(panesByName, panes, paneIndex + 1);
-          const leftPane = utils.getPane(panesByName, panes, paneIndex - 1);
-          const rightBound = utils.getRightBound(rightPane, dividerBuffer);
-          const leftBound = utils.getLeftBound(leftPane, dividerBuffer);
-          const newPosition = _.clamp(
-            (clientX / width) * 100,
-            leftBound,
-            rightBound
-          );
-          return {
-            ...state,
-            panesByName: {
-              ...state.panesByName,
-              [currentPane.name]: {
-                ...currentPane,
-                dividerLeft: newPosition
-              }
-            }
-          };
-        },
-        [types.mouseReleased]: state => ({ ...state, pressedDivider: null }),
-        [types.windowResized]: (state, { payload: { width } }) => ({
-          ...state,
-          width
-        }),
-        // used to clear bin buttons
-        [types.panesWillUnmount]: state => ({
-          ...state,
-          panes: [],
-          panesByName: {},
-          pressedDivider: null
-        })
-      }),
-      defaultState
-    ),
-    function metaReducer(state = defaultState, action) {
-      if (action.meta && action.meta.panesMap) {
-        const panesMap = action.meta.panesMap;
-        const panes = _.map(panesMap, (name, type) => ({ name, type }));
-        const numOfPanes = Object.keys(panes).length;
-        if (_.isEqual(state.panes, panes)) {
-          return state;
-        }
-        return {
-          ...state,
-          panesMap,
-          panes,
-          panesByName: panes.reduce((panes, { name }, index) => {
-            const dividerLeft = utils.getDividerLeft(numOfPanes, index);
-            panes[name] = {
-              name,
-              dividerLeft,
-              isHidden: false
-            };
-            return panes;
-          }, {})
-        };
-      }
-      if (action.meta && action.meta.isPaneAction) {
-        const name = action.meta.paneName;
-        const oldPane = state.panesByName[name];
-        const pane = {
-          ...oldPane,
-          isHidden: !oldPane.isHidden
-        };
-        const panesByName = {
-          ...state.panesByName,
-          [name]: pane
-        };
-        const numOfPanes = state.panes.reduce((sum, { name }) => {
-          return panesByName[name].isHidden ? sum : sum + 1;
-        }, 0);
-        let numOfHidden = 0;
-        return {
-          ...state,
-          panesByName: state.panes.reduce(
-            (panesByName, { name }, index) => {
-              if (!panesByName[name].isHidden) {
-                const dividerLeft = utils.getDividerLeft(
-                  numOfPanes,
-                  index - numOfHidden
-                );
-                panesByName[name] = {
-                  ...panesByName[name],
-                  dividerLeft
-                };
-              } else {
-                numOfHidden = numOfHidden + 1;
-              }
-              return panesByName;
-            },
-            panesByName
-          )
-        };
-      }
-      return state;
-    }
-  );
-
-  return {
-    reducer,
-    middleware
-  };
-}
diff --git a/common/app/Panes/redux/utils.js b/common/app/Panes/redux/utils.js
deleted file mode 100644
index e29533d4b7..0000000000
--- a/common/app/Panes/redux/utils.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import _ from 'lodash';
-import invariant from 'invariant';
-
-export function isPanesAction({ type } = {}, panesMap) {
-  return !!panesMap[type];
-}
-
-export function getDividerLeft(numOfPanes, index) {
-  let dividerLeft = null;
-  if (numOfPanes === 2 && numOfPanes !== index + 1) {
-    dividerLeft = 33;
-  } else if (numOfPanes > 1 && numOfPanes !== index + 1) {
-    dividerLeft = (100 / numOfPanes) * (index + 1);
-  }
-  return dividerLeft;
-}
-
-export function checkForTypeKeys(panesMap) {
-  _.forEach(panesMap, (_, actionType) => {
-    invariant(
-      actionType !== 'undefined',
-      `action type for ${panesMap[actionType]} is undefined`
-    );
-  });
-  return panesMap;
-}
-
-export const getPane = (panesByName, panes, index) => _.get(
-  panesByName,
-  getPaneName(panes, index),
-  null
-);
-
-export const getPaneName = (panes, index) => _.get(
-  panes,
-  [index, 'name'],
-  ''
-);
-
-export const getRightBound = (pane, buffer) =>
-    ((pane && !pane.isHidden && pane.dividerLeft) || 100) - buffer;
-export const getLeftBound = (pane, buffer) =>
-    ((pane && !pane.isHidden && pane.dividerLeft) || 0) + buffer;
-
-export function normalizePanesMapCreator(createPanesMap) {
-  invariant(
-    _.isFunction(createPanesMap),
-    'createPanesMap should be a function but got %s',
-    createPanesMap
-  );
-  const panesMap = createPanesMap({}, { type: '@@panes/test' });
-  if (typeof panesMap === 'function') {
-    return normalizePanesMapCreator(panesMap);
-  }
-  invariant(
-    !panesMap,
-    'panesMap test should return undefined or null on test action but got %s',
-    panesMap
-  );
-  return createPanesMap;
-}
-
diff --git a/common/app/Panes/redux/window-epic.js b/common/app/Panes/redux/window-epic.js
deleted file mode 100644
index 40df25aa47..0000000000
--- a/common/app/Panes/redux/window-epic.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Observable } from 'rx';
-import { ofType } from 'redux-epic';
-
-import {
-  types,
-  windowResized
-} from './';
-
-export default function windowEpic(actions, _, { window }) {
-  return actions::ofType(types.panesMounted)
-    .switchMap(() => {
-      return Observable.fromEvent(window, 'resize', () => windowResized({
-        width: window.innerWidth
-      }))
-        .startWith(windowResized({
-          width: window.innerWidth
-        }));
-    });
-}
diff --git a/common/app/Router/Link.jsx b/common/app/Router/Link.jsx
index cdbef8268b..df29e53cbf 100644
--- a/common/app/Router/Link.jsx
+++ b/common/app/Router/Link.jsx
@@ -5,18 +5,16 @@ import { createSelector } from 'reselect';
 
 import toUrl from './to-url.js';
 import createHandler from './handle-press.js';
-import { routesMapSelector, langSelector } from './redux';
+import { routesMapSelector } from './redux';
 
 const mapStateToProps = createSelector(
-  langSelector,
   routesMapSelector,
-  (lang, routesMap) => ({ lang, routesMap })
+  routesMap => ({ routesMap })
 );
 
 const propTypes = {
   children: PropTypes.node,
   dispatch: PropTypes.func,
-  lang: PropTypes.string,
   onClick: PropTypes.func,
   redirect: PropTypes.bool,
   replace: PropTypes.bool,
@@ -31,7 +29,6 @@ export const Link = (
   {
     children,
     dispatch,
-    lang,
     onClick,
     redirect,
     replace,
@@ -42,7 +39,7 @@ export const Link = (
     to
   }
 ) => {
-  const url = toUrl(to, routesMap, lang);
+  const url = toUrl(to, routesMap);
   const handler = createHandler(
     url,
     routesMap,
diff --git a/common/app/Router/redux/add-lang-enhancer.js b/common/app/Router/redux/add-lang-enhancer.js
deleted file mode 100644
index ebd47f6819..0000000000
--- a/common/app/Router/redux/add-lang-enhancer.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { langSelector } from './';
-
-// This enhancers sole purpose is to add the lang prop to route actions so that
-// they do not need to be explicitly added when using a RFR route action.
-export default function addLangToRouteEnhancer(routesMap) {
-  return createStore => (...args) => {
-    const store = createStore(...args);
-
-    return {
-      ...store,
-      dispatch(action) {
-        if (
-          routesMap[action.type] &&
-          (!action.payload || !action.payload.lang)
-        ) {
-          action = {
-            ...action,
-            payload: {
-              ...action.payload,
-              lang: langSelector(store.getState()) || 'en'
-            }
-          };
-        }
-        return store.dispatch(action);
-      }
-    };
-  };
-}
diff --git a/common/app/Router/redux/index.js b/common/app/Router/redux/index.js
index be8b951eb5..9cae6f2f53 100644
--- a/common/app/Router/redux/index.js
+++ b/common/app/Router/redux/index.js
@@ -3,7 +3,6 @@ import { selectLocationState } from 'redux-first-router';
 export const paramsSelector = state => selectLocationState(state).payload || {};
 export const locationTypeSelector =
   state => selectLocationState(state).type || '';
-export const langSelector = state => paramsSelector(state).lang || 'en';
 export const routesMapSelector = state =>
   selectLocationState(state).routesMap || {};
 export const pathnameSelector = state => selectLocationState(state).pathname;
diff --git a/common/app/Router/to-url.js b/common/app/Router/to-url.js
index b436859b8c..37a5a4d210 100644
--- a/common/app/Router/to-url.js
+++ b/common/app/Router/to-url.js
@@ -1,11 +1,8 @@
 import { actionToPath, getOptions } from 'redux-first-router';
 
-import { addLang } from '../utils/lang.js';
-
-
-export default (to, routesMap, lang = 'en') => {
+export default (to, routesMap) => {
   if (to && typeof to === 'string') {
-    return addLang(to, lang);
+    return to;
   }
 
   if (typeof to === 'object') {
@@ -17,8 +14,7 @@ export default (to, routesMap, lang = 'en') => {
         {
           ...action,
           payload: {
-            ...payload,
-            lang: payload.lang || lang
+            ...payload
           }
         },
         routesMap,
diff --git a/common/app/Toasts/Toasts.jsx b/common/app/Toasts/Toasts.jsx
index d81f813afc..f9e4b3a2d5 100644
--- a/common/app/Toasts/Toasts.jsx
+++ b/common/app/Toasts/Toasts.jsx
@@ -5,15 +5,8 @@ import { createSelector } from 'reselect';
 import { NotificationStack } from 'react-notification';
 
 import { removeToast } from './redux';
-import {
-  submitChallenge,
-  clickOnReset
-} from '../routes/Challenges/redux';
 
-const registeredActions = {
-  submitChallenge,
-  clickOnReset
-};
+const registeredActions = {};
 const mapStateToProps = state => ({ toasts: state.toasts });
 // we use styles here to overwrite those built into the library
 // but there are some styles applied using
diff --git a/common/app/create-app.jsx b/common/app/create-app.jsx
index 563691c700..97e5df1669 100644
--- a/common/app/create-app.jsx
+++ b/common/app/create-app.jsx
@@ -7,12 +7,8 @@ import { combineReducers } from 'berkeleys-redux-utils';
 import { createEpic } from 'redux-epic';
 import appReducer from './reducer.js';
 import routesMap from './routes-map.js';
-import createPanesMap from './create-panes-map.js';
-import createPanesAspects from './Panes/redux';
-import addLangToRoutesEnhancer from './Router/redux/add-lang-enhancer.js';
 import epics from './epics';
 
-import { onBeforeChange } from './utils/redux-first-router.js';
 import servicesCreator from '../utils/services-creator';
 
 const debug = createDebugger('fcc:app:createApp');
@@ -50,21 +46,14 @@ export default function createApp({
     reducer: routesReducer,
     middleware: routesMiddleware,
     enhancer: routesEnhancer
-  } = connectRoutes(history, routesMap, { onBeforeChange });
+  } = connectRoutes(history, routesMap);
 
   routesReducer.toString = () => 'location';
 
-  const {
-    reducer: panesReducer,
-    middleware: panesMiddleware
-  } = createPanesAspects({ createPanesMap });
-
   const enhancer = compose(
-    addLangToRoutesEnhancer(routesMap),
     routesEnhancer,
     applyMiddleware(
       routesMiddleware,
-      panesMiddleware,
       epicMiddleware,
       ...sideMiddlewares
     ),
@@ -75,7 +64,6 @@ export default function createApp({
 
   const reducer = combineReducers(
     appReducer,
-    panesReducer,
     routesReducer
   );
 
@@ -95,7 +83,6 @@ export default function createApp({
         debug('hot reloading reducers');
         store.replaceReducer(combineReducers(
           require('./reducer.js').default,
-          panesReducer,
           routesReducer
         ));
       });
diff --git a/common/app/create-panes-map.js b/common/app/create-panes-map.js
deleted file mode 100644
index 79ade7fe31..0000000000
--- a/common/app/create-panes-map.js
+++ /dev/null
@@ -1 +0,0 @@
-export { createPanesMap as default } from './routes/';
diff --git a/common/app/entities/index.js b/common/app/entities/index.js
index f9a80f6d5c..7e08d898e5 100644
--- a/common/app/entities/index.js
+++ b/common/app/entities/index.js
@@ -1,7 +1,6 @@
-import { findIndex, property, merge, union } from 'lodash';
+import { findIndex, property, merge } from 'lodash';
 import uuid from 'uuid/v4';
 import {
-  combineActions,
   composeReducers,
   createAction,
   createTypes,
@@ -9,8 +8,7 @@ import {
 } from 'berkeleys-redux-utils';
 
 import { themes } from '../../utils/themes';
-import { usernameSelector, types as app } from '../redux';
-import { types as challenges } from '../routes/Challenges/redux';
+import { usernameSelector } from '../redux';
 import { types as map } from '../Map/redux';
 import legacyProjects from '../../utils/legacyProjectData';
 
@@ -204,36 +202,8 @@ export default composeReducers(
   },
   handleActions(
     () => ({
-      [
-        combineActions(
-          app.fetchNewBlock.complete,
-          map.fetchMapUi.complete
-        )
-      ]: (state, { payload: { entities } }) => merge({}, state, entities),
-      [app.fetchNewBlock.complete]: (
-        state,
-        { payload: { entities: { block } } }
-      ) => ({
-        ...state,
-        fullBlocks: union(state.fullBlocks, [ Object.keys(block)[0] ])
-      }),
-      [types.resetFullBlocks]: state => ({ ...state, fullBlocks: [] }),
-      [
-        challenges.submitChallenge.complete
-      ]: (state, { payload: { username, points, challengeInfo } }) => ({
-        ...state,
-        user: {
-          ...state.user,
-          [username]: {
-            ...state.user[username],
-            points,
-            challengeMap: {
-              ...state.user[username].challengeMap,
-              [challengeInfo.id]: challengeInfo
-            }
-          }
-        }
-      }),
+      [map.fetchMapUi.complete]: (state, { payload: { entities } }) =>
+        merge({}, state, entities),
       [types.addPortfolioItem]: (state, { payload: username }) => ({
         ...state,
         user: {
@@ -324,22 +294,6 @@ export default composeReducers(
             languageTag
           }
         }
-      }),
-      [types.updateUserCurrentChallenge]:
-      (
-        state,
-        {
-          payload: { username, currentChallengeId }
-        }
-      ) => ({
-        ...state,
-        user: {
-          ...state.user,
-          [username]: {
-            ...state.user[username],
-            currentChallengeId
-          }
-        }
       })
     }),
     defaultState
diff --git a/common/app/epics.js b/common/app/epics.js
index 2ca7984b2d..6f11f8f087 100644
--- a/common/app/epics.js
+++ b/common/app/epics.js
@@ -1,17 +1,13 @@
 import { epics as app } from './redux';
-import { epics as challenge } from './routes/Challenges/redux';
 import { epics as flash } from './Flash/redux';
 import { epics as map } from './Map/redux';
 import { epics as nav } from './Nav/redux';
-import { epics as panes } from './Panes/redux';
 import { epics as settings } from './routes/Settings/redux';
 
 export default [
   ...app,
-  ...challenge,
   ...flash,
   ...map,
   ...nav,
-  ...panes,
   ...settings
 ];
diff --git a/common/app/files/index.js b/common/app/files/index.js
deleted file mode 100644
index 24a3b5ee01..0000000000
--- a/common/app/files/index.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import _ from 'lodash';
-import {
-  addNS,
-  createTypes
-} from 'berkeleys-redux-utils';
-
-import { createPoly, setContent } from '../../utils/polyvinyl.js';
-
-const ns = 'files';
-
-export const types = createTypes([
-  'updateFile',
-  'createFiles'
-], ns);
-
-export const updateFileMetaCreator = (key, content)=> ({
-  file: { type: types.updateFile, payload: { key, content } }
-});
-export const createFilesMetaCreator = payload => ({
-  file: { type: types.createFiles, payload }
-});
-
-export const filesSelector = state => state[ns];
-export const createFileSelector = keySelector => (state, props) => {
-  const files = filesSelector(state);
-  return files[keySelector(state, props)] || {};
-};
-
-const getFileAction = _.property('meta.file.type');
-const getFilePayload = _.property('meta.file.payload');
-
-export default addNS(
-  ns,
-  function reducer(state = {}, action) {
-    if (getFileAction(action)) {
-      if (getFileAction(action) === types.updateFile) {
-        const { key, content } = getFilePayload(action);
-        return {
-          ...state,
-          [key]: setContent(content, state[key])
-        };
-      }
-      if (getFileAction(action) === types.createFiles) {
-        const files = getFilePayload(action);
-        return _.reduce(files, (files, file) => {
-          files[file.key] = createPoly(file);
-          return files;
-        }, {});
-      }
-    }
-    return state;
-  }
-);
diff --git a/common/app/index.less b/common/app/index.less
index e213ce7f79..67c084f054 100644
--- a/common/app/index.less
+++ b/common/app/index.less
@@ -1,6 +1,4 @@
 &{ @import "./app.less"; }
-&{ @import "./Map/map.less"; }
 &{ @import "./Nav/nav.less"; }
 &{ @import "./Flash/flash.less"; }
 &{ @import "./routes/index.less"; }
-&{ @import "./Panes/panes.less"; }
diff --git a/common/app/reducer.js b/common/app/reducer.js
index 6a8fd5d101..9555f1095a 100644
--- a/common/app/reducer.js
+++ b/common/app/reducer.js
@@ -2,14 +2,14 @@ import { combineReducers } from 'berkeleys-redux-utils';
 
 import app from './redux';
 import entities from './entities';
-import form from './redux-form-reducer';
+import { reducer as form } from 'redux-form';
 import map from './Map/redux';
 import nav from './Nav/redux';
 import routes from './routes/redux';
 import toasts from './Toasts/redux';
-import files from './files';
 import flash from './Flash/redux';
 
+form.toString = () => 'form';
 
 export default combineReducers(
   app,
@@ -18,7 +18,6 @@ export default combineReducers(
   nav,
   routes,
   toasts,
-  files,
   flash,
   form
 );
diff --git a/common/app/redux-form-reducer.js b/common/app/redux-form-reducer.js
deleted file mode 100644
index 18a037fdb1..0000000000
--- a/common/app/redux-form-reducer.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { composeReducers } from 'berkeleys-redux-utils';
-import { reducer as formReducer } from 'redux-form';
-
-import {
-  projectNormalizer,
-  types as challenge
-} from './routes/Challenges/redux';
-
-const normailizedFormReducer = formReducer.normalize({ ...projectNormalizer });
-
-const pluggedInFormReducer = formReducer.plugin({
-  NewFrontEndProject: (state, action) => {
-    if (action.type === challenge.moveToNextChallenge) {
-      return {
-        ...state,
-        solution: {}
-      };
-    }
-    return state;
-  },
-  NewBackEndProject: (state, action) => {
-    if (action.type === challenge.moveToNextChallenge) {
-      return {
-        ...state,
-        solution: {},
-        githubLink: {}
-      };
-    }
-    return state;
-  }
-});
-
-export default composeReducers(
-  'form',
-  normailizedFormReducer,
-  pluggedInFormReducer
-);
diff --git a/common/app/redux/fetch-challenges-epic.js b/common/app/redux/fetch-challenges-epic.js
deleted file mode 100644
index c31c937ce6..0000000000
--- a/common/app/redux/fetch-challenges-epic.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import { Observable } from 'rx';
-import { combineEpics, ofType } from 'redux-epic';
-import _ from 'lodash';
-import debug from 'debug';
-
-import {
-  types,
-
-  createErrorObservable,
-  delayedRedirect,
-
-  fetchChallengeCompleted,
-  fetchNewBlockComplete,
-  challengeSelector,
-  nextChallengeSelector
-} from './';
-import {
-  isChallengeLoaded,
-  fullBlocksSelector
-} from '../entities';
-
-import { shapeChallenges } from './utils';
-import { types as challenge } from '../routes/Challenges/redux';
-import { langSelector, paramsSelector } from '../Router/redux';
-
-const isDev = debug.enabled('fcc:*');
-
-function fetchChallengeEpic(actions, { getState }, { services }) {
-  return actions::ofType(challenge.onRouteChallenges)
-    .filter(({ payload }) => !isChallengeLoaded(getState(), payload))
-    .flatMapLatest(({ payload: params }) => {
-      const options = {
-        service: 'challenge',
-        params
-      };
-      return services.readService$(options)
-        .retry(3)
-        .map(({ entities, ...rest }) => ({
-          entities: shapeChallenges(entities, isDev),
-          ...rest
-        }))
-        .flatMap(({ entities, result, redirect } = {}) => {
-          const actions = [
-            fetchChallengeCompleted({
-              entities,
-              currentChallenge: result.challenge,
-              challenge: entities.challenge[result.challenge],
-              result
-            }),
-            redirect ? delayedRedirect(redirect) : null
-          ];
-          return Observable.from(actions).filter(Boolean);
-        })
-        .catch(createErrorObservable);
-    });
-}
-
-export function fetchChallengesForBlockEpic(
-  actions,
-  { getState },
-  { services }
-) {
-  const onAppMount = actions::ofType(types.appMounted)
-    .map(() => {
-      const {
-        block = 'basic-html-and-html5'
-      } = challengeSelector(getState());
-      return block;
-    });
-  const onNewChallenge = actions::ofType(challenge.moveToNextChallenge)
-    .map(() => {
-      const {
-        isNewBlock,
-        isNewSuperBlock,
-        nextChallenge
-      } = nextChallengeSelector(getState());
-      const isNewBlockRequired = isNewBlock || isNewSuperBlock && nextChallenge;
-      return isNewBlockRequired ? nextChallenge.block : null;
-    });
-  const onBlockSelect = actions::ofType(types.fetchNewBlock.start)
-    .map(({ payload }) => payload);
-
-  return Observable.merge(onAppMount, onNewChallenge, onBlockSelect)
-    .filter(block => {
-      const fullBlocks = fullBlocksSelector(getState());
-      return block && !fullBlocks.includes(block);
-    })
-    .flatMapLatest(blockName => {
-      const lang = langSelector(getState());
-      const options = {
-        params: { lang, blockName },
-        service: 'challenge'
-      };
-      return services.readService$(options)
-        .retry(3)
-        .map(newBlockData => {
-          const { dashedName } = paramsSelector(getState());
-          const { entities: { challenge } } = newBlockData;
-          const currentChallengeInNewBlock = _.pickBy(
-            challenge,
-            newChallenge => newChallenge.dashedName === dashedName
-          );
-          return fetchNewBlockComplete({
-            ...newBlockData,
-            meta: {
-              challenge: currentChallengeInNewBlock
-            }
-          });
-        })
-        .catch(createErrorObservable);
-    });
- }
-
-
-export default combineEpics(
-  fetchChallengeEpic,
-  fetchChallengesForBlockEpic
-);
diff --git a/common/app/redux/index.js b/common/app/redux/index.js
index fce54dfa29..96a2521112 100644
--- a/common/app/redux/index.js
+++ b/common/app/redux/index.js
@@ -8,41 +8,25 @@ import {
   handleActions
 } from 'berkeleys-redux-utils';
 import { createSelector } from 'reselect';
-import debug from 'debug';
 
 import fetchUserEpic from './fetch-user-epic.js';
-import updateMyCurrentChallengeEpic from './update-my-challenge-epic.js';
-import fetchChallengesEpic from './fetch-challenges-epic.js';
 import nightModeEpic from './night-mode-epic.js';
 
 import {
   updateThemeMetacreator,
-  entitiesSelector,
-  fullBlocksSelector
+  entitiesSelector
 } from '../entities';
 import { utils } from '../Flash/redux';
 import { paramsSelector } from '../Router/redux';
-import { types as challenges } from '../routes/Challenges/redux';
 import { types as map } from '../Map/redux';
-import {
-  createCurrentChallengeMeta,
-  challengeToFilesMetaCreator,
-  getFirstChallengeOfNextBlock,
-  getFirstChallengeOfNextSuperBlock,
-  getNextChallenge
-} from '../routes/Challenges/utils';
 
 import ns from '../ns.json';
 
 import { themes, invertTheme } from '../../utils/themes.js';
 
-const isDev = debug.enabled('fcc:*');
-
 export const epics = [
-  fetchChallengesEpic,
   fetchUserEpic,
-  nightModeEpic,
-  updateMyCurrentChallengeEpic
+  nightModeEpic
 ];
 
 export const types = createTypes([
@@ -52,9 +36,6 @@ export const types = createTypes([
   'analytics',
   'updateTitle',
 
-  createAsyncTypes('fetchChallenge'),
-  createAsyncTypes('fetchChallenges'),
-  createAsyncTypes('fetchNewBlock'),
   createAsyncTypes('fetchOtherUser'),
   createAsyncTypes('fetchUser'),
   'showSignIn',
@@ -107,29 +88,6 @@ export function createEventMetaCreator({
 
 export const onRouteHome = createAction(types.onRouteHome);
 export const appMounted = createAction(types.appMounted);
-export const fetchChallenge = createAction(
-  '' + types.fetchChallenge,
-  (dashedName, block) => ({ dashedName, block })
-);
-export const fetchChallengeCompleted = createAction(
-  types.fetchChallenge.complete,
-  null,
-  meta => ({
-    ...meta,
-    ...challengeToFilesMetaCreator(meta.challenge)
-  })
-);
-export const fetchChallenges = createAction('' + types.fetchChallenges);
-export const fetchChallengesCompleted = createAction(
-  types.fetchChallenges.complete
-);
-
-export const fetchNewBlock = createAction(types.fetchNewBlock.start);
-export const fetchNewBlockComplete = createAction(
-  types.fetchNewBlock.complete,
-  ({ entities }) => ({ entities }),
-  ({ meta: { challenge } }) => ({ ...createCurrentChallengeMeta(challenge) })
-);
 
 // updateTitle(title: String) => Action
 export const updateTitle = createAction(types.updateTitle);
@@ -202,8 +160,6 @@ const defaultState = {
   isSignInAttempted: false,
   user: '',
   csrfToken: '',
-  // eventually this should be only in the user object
-  currentChallenge: '',
   superBlocks: []
 };
 
@@ -211,8 +167,6 @@ export const getNS = state => state[ns];
 export const csrfSelector = state => getNS(state).csrfToken;
 export const titleSelector = state => getNS(state).title;
 
-export const currentChallengeSelector = state => getNS(state).currentChallenge;
-export const superBlocksSelector = state => getNS(state).superBlocks;
 export const signInLoadingSelector = state => !getNS(state).isSignInAttempted;
 
 export const usernameSelector = state => getNS(state).user || '';
@@ -235,92 +189,6 @@ export const themeSelector = flow(
 
 export const isSignedInSelector = state => !!userSelector(state).username;
 
-export const challengeSelector = state => {
-  const challengeName = currentChallengeSelector(state);
-  const challengeMap = entitiesSelector(state).challenge || {};
-  return challengeMap[challengeName] || firstChallengeSelector(state);
-};
-
-export const isCurrentBlockCompleteSelector = state => {
-  const { block } = paramsSelector(state);
-  const fullBlocks = fullBlocksSelector(state);
-  return fullBlocks.includes(block);
-};
-
-export const previousSolutionSelector = state => {
-  const { id } = challengeSelector(state);
-  const { challengeMap = {} } = userSelector(state);
-  return challengeMap[id];
-};
-
-export const firstChallengeSelector = createSelector(
-  entitiesSelector,
-  superBlocksSelector,
-  (
-    {
-      challenge: challengeMap,
-      block: blockMap,
-      superBlock: superBlockMap
-    },
-    superBlocks
-  ) => {
-    if (
-      !challengeMap ||
-      !blockMap ||
-      !superBlockMap ||
-      !superBlocks
-    ) {
-      return {};
-    }
-    try {
-      return challengeMap[
-        blockMap[
-          superBlockMap[
-            superBlocks[0]
-          ].blocks[0]
-        ].challenges[0]
-      ];
-    } catch (err) {
-      console.error(err);
-      return {};
-    }
-  }
-);
-
-export const nextChallengeSelector = state => {
-  let nextChallenge = {};
-  let isNewBlock = false;
-  let isNewSuperBlock = false;
-  const challenge = currentChallengeSelector(state);
-  const superBlocks = superBlocksSelector(state);
-  const entities = entitiesSelector(state);
-  nextChallenge = getNextChallenge(challenge, entities, { isDev });
-  // block completed.
-  if (!nextChallenge) {
-    isNewBlock = true;
-    nextChallenge = getFirstChallengeOfNextBlock(
-      challenge,
-      entities,
-      { isDev }
-    );
-  }
-  // superBlock completed
-  if (!nextChallenge) {
-    isNewSuperBlock = true;
-    nextChallenge = getFirstChallengeOfNextSuperBlock(
-      challenge,
-      entities,
-      superBlocks,
-      { isDev }
-    );
-  }
-  return {
-    nextChallenge,
-    isNewBlock,
-    isNewSuperBlock
-  };
-};
-
 export default handleActions(
   () => ({
     [types.updateTitle]: (state, { payload = 'Learn To Code' }) => ({
@@ -332,28 +200,16 @@ export default handleActions(
       ...state,
       user
     }),
-    [combineActions(
-      types.fetchChallenge.complete,
-      map.fetchMapUi.complete
-    )]: (state, { payload }) => ({
+    [map.fetchMapUi.complete]: (state, { payload }) => ({
       ...state,
       superBlocks: payload.result.superBlocks
     }),
-    [challenges.onRouteChallenges]: (state, { payload: { dashedName } }) => ({
-      ...state,
-      currentChallenge: dashedName
-    }),
     [
       combineActions(types.showSignIn, types.fetchUser.complete)
     ]: state => ({
       ...state,
       isSignInAttempted: true
     }),
-
-    [types.challengeSaved]: (state, { payload: { points = 0 } }) => ({
-      ...state,
-      points
-    }),
     [types.delayedRedirect]: (state, { payload }) => ({
       ...state,
       delayedRedirect: payload
diff --git a/common/app/redux/update-my-challenge-epic.js b/common/app/redux/update-my-challenge-epic.js
deleted file mode 100644
index ad00a10331..0000000000
--- a/common/app/redux/update-my-challenge-epic.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Observable } from 'rx';
-import { ofType } from 'redux-epic';
-import debug from 'debug';
-
-import {
-  types,
-  createErrorObservable,
-
-  challengeSelector,
-  csrfSelector,
-  userSelector
-} from './';
-import { updateUserCurrentChallenge } from '../entities';
-import { postJSON$ } from '../../utils/ajax-stream';
-import { types as challenges } from '../routes/Challenges/redux';
-
-const log = debug('fcc:app:redux:up-my-challenge-epic');
-export default function updateMyCurrentChallengeEpic(actions, { getState }) {
-  const updateChallenge = actions::ofType(types.appMounted)
-    .flatMapLatest(() => actions::ofType(challenges.onRouteChallenges))
-    .map(() => {
-      const state = getState();
-      // username is never defined SSR
-      const { username } = userSelector(state);
-      const { id } = challengeSelector(state);
-      const csrf = csrfSelector(state);
-      return {
-        username,
-        csrf,
-        currentChallengeId: id
-      };
-    })
-    .filter(({ username }) => !!username)
-    .distinctUntilChanged(x => x.currentChallengeId);
-  const optimistic = updateChallenge.map(updateUserCurrentChallenge);
-  const ajaxUpdate = updateChallenge
-    .debounce(250)
-    .flatMapLatest(({ csrf, currentChallengeId }) => {
-      return postJSON$(
-        '/update-my-current-challenge',
-        {
-          currentChallengeId,
-          _csrf: csrf
-        }
-      )
-        .map(({ message }) => log(message))
-        .ignoreElements()
-        .catch(createErrorObservable);
-    });
-  return Observable.merge(optimistic, ajaxUpdate);
-}
diff --git a/common/app/redux/utils.js b/common/app/redux/utils.js
index b7e4aefaa8..87fdb21b91 100644
--- a/common/app/redux/utils.js
+++ b/common/app/redux/utils.js
@@ -1,52 +1,7 @@
 import flowRight from 'lodash/flowRight';
 import { createNameIdMap } from '../../utils/map.js';
-import { partial } from 'lodash';
-
-export function filterComingSoonBetaChallenge(
-  isDev = false,
-  { isComingSoon, isBeta }
-) {
-  return !(isComingSoon || isBeta) ||
-    isDev;
-}
-
-export function filterComingSoonBetaFromEntities(
-  { challenge: challengeMap, block: blockMap = {}, ...rest },
-  isDev = false
-) {
-  const filter = partial(filterComingSoonBetaChallenge, isDev);
-  return {
-    ...rest,
-    block: Object.keys(blockMap)
-      .map(dashedName => {
-        const block = blockMap[dashedName];
-
-        const filteredChallenges = block.challenges
-          .map(dashedName => challengeMap[dashedName])
-          .filter(filter)
-          .map(challenge => challenge.dashedName);
-
-        return {
-          ...block,
-          challenges: [ ...filteredChallenges ]
-        };
-      })
-      .reduce((blockMap, block) => {
-        blockMap[block.dashedName] = block;
-        return blockMap;
-      }, {}),
-    challenge: Object.keys(challengeMap)
-      .map(dashedName => challengeMap[dashedName])
-      .filter(filter)
-      .reduce((challengeMap, challenge) => {
-        challengeMap[challenge.dashedName] = challenge;
-        return challengeMap;
-      }, {})
-  };
-}
 
 export const shapeChallenges = flowRight(
-  filterComingSoonBetaFromEntities,
   entities => ({
     ...entities,
     ...createNameIdMap(entities)
diff --git a/common/app/redux/utils.test.js b/common/app/redux/utils.test.js
deleted file mode 100644
index 9ad1ff3672..0000000000
--- a/common/app/redux/utils.test.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import test from 'tape';
-import {
-  filterComingSoonBetaChallenge,
-  filterComingSoonBetaFromEntities
-} from './utils.js';
-
-
-test.test('filterComingSoonBetaChallenge', t => {
-  t.plan(4);
-  t.test('should return true when not coming-soon/beta', t => {
-    let isDev;
-    t.ok(filterComingSoonBetaChallenge(isDev, {}));
-    t.ok(filterComingSoonBetaChallenge(true, {}));
-    t.end();
-  });
-  t.test('should return false when isComingSoon', t => {
-    let isDev;
-    t.notOk(filterComingSoonBetaChallenge(isDev, { isComingSoon: true }));
-    t.end();
-  });
-  t.test('should return false when isBeta', t => {
-    let isDev;
-    t.notOk(filterComingSoonBetaChallenge(isDev, { isBeta: true }));
-    t.end();
-  });
-  t.test('should always return true when in dev', t => {
-    let isDev = true;
-    t.ok(filterComingSoonBetaChallenge(isDev, { isBeta: true }));
-    t.ok(filterComingSoonBetaChallenge(isDev, { isComingSoon: true }));
-    t.ok(filterComingSoonBetaChallenge(
-      isDev,
-      { isBeta: true, isCompleted: true }
-    ));
-    t.end();
-  });
-});
-test.test('filterComingSoonBetaFromEntities', t => {
-  t.plan(2);
-  t.test('should filter isBeta|coming-soon by default', t => {
-    t.plan(4);
-    const normalChallenge = { dashedName: 'normal-challenge' };
-    const entities = {
-      challenge: {
-        'coming-soon': {
-          isComingSoon: true
-        },
-        'is-beta': {
-          isBeta: true
-        },
-        [normalChallenge.dashedName]: normalChallenge
-      },
-      block: {
-        'coming-soon': {
-          dashedName: 'coming-soon',
-          challenges: ['coming-soon']
-        },
-        'is-beta': {
-          dashedName: 'is-beta',
-          challenges: ['is-beta']
-        },
-        normal: {
-          dashedName: 'normal',
-          challenges: [normalChallenge.dashedName]
-        }
-      }
-    };
-
-    const actual = filterComingSoonBetaFromEntities(entities);
-    t.isEqual(
-      Object.keys(actual.challenge).length,
-      1,
-      'did not filter the correct amount of challenges'
-    );
-    t.isEqual(
-      actual.challenge[normalChallenge.dashedName],
-      normalChallenge,
-      'did not return the correct challenge'
-    );
-
-    const challengesFromBlocks = [];
-    Object.keys(actual.block)
-      .forEach(block => {
-        const challenges = actual.block[block].challenges;
-        challenges.forEach(challenge => challengesFromBlocks.push(challenge));
-      });
-    t.isEqual(
-      challengesFromBlocks.length,
-      1,
-      'did not filter the correct amount of challenges from blocks'
-    );
-    t.isEqual(
-      challengesFromBlocks[0],
-      normalChallenge.dashedName,
-      'did not return the correct challenge from blocks'
-    );
-  });
-  t.test('should not filter isBeta|coming-soon when isDev', t => {
-    t.plan(2);
-    const normalChallenge = { dashedName: 'normal-challenge' };
-    const entities = {
-      challenge: {
-        'coming-soon': {
-          dashedName: 'coming-soon',
-          isComingSoon: true
-        },
-        'is-beta': {
-          dashedName: 'is-beta',
-          isBeta: true
-        },
-        'is-both': {
-          dashedName: 'is-both',
-          isBeta: true
-        },
-        [normalChallenge.dashedName]: normalChallenge
-      },
-      block: {
-        'coming-soon': {
-          dashedName: 'coming-soon',
-          challenges: ['coming-soon']
-        },
-        'is-beta': {
-          dashedName: 'is-beta',
-          challenges: ['is-beta']
-        },
-        'is-both': {
-          dashedName: 'is-both',
-          challenges: ['is-both']
-        },
-        normal: {
-          dashedName: 'normal',
-          challenges: [normalChallenge.dashedName]
-        }
-      }
-    };
-    const actual = filterComingSoonBetaFromEntities(entities, true);
-    t.isEqual(
-      Object.keys(actual.challenge).length,
-      4,
-      'filtered challenges'
-    );
-    let challengesFromBlocksCount = 0;
-    Object.keys(actual.block)
-      .forEach(block => {
-        challengesFromBlocksCount += actual.block[block].challenges.length;
-      });
-    t.isEqual(
-      challengesFromBlocksCount,
-      4,
-      'filtered challenges from blocks'
-    );
-  });
-});
diff --git a/common/app/routes-map.js b/common/app/routes-map.js
index ecbaac00f7..be99909c26 100644
--- a/common/app/routes-map.js
+++ b/common/app/routes-map.js
@@ -2,18 +2,16 @@ import reduce from 'lodash/reduce';
 import { types } from './redux';
 import routes from './routes';
 
-const base = '/:lang';
-
 export default {
   ...reduce(routes, (routes, route, type) => {
     let newRoute;
     if (typeof route === 'string') {
-      newRoute = base + route;
+      newRoute = route;
     } else {
-      newRoute = { ...route, path: base + route.path };
+      newRoute = { ...route, path: route.path };
     }
     routes[type] = newRoute;
     return routes;
   }, {}),
-  [types.routeOnHome]: base
+  [types.routeOnHome]: '/'
 };
diff --git a/common/app/routes/Challenges/Challenge-Description.jsx b/common/app/routes/Challenges/Challenge-Description.jsx
deleted file mode 100644
index f05bb4dc5f..0000000000
--- a/common/app/routes/Challenges/Challenge-Description.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { Col, Row } from 'react-bootstrap';
-
-import ns from './ns.json';
-import { isCurrentBlockCompleteSelector } from '../../redux';
-import { SkeletonSprite } from '../../helperComponents';
-
-const mapStateToProps = createSelector(
-  isCurrentBlockCompleteSelector,
-  blockComplete => ({
-    showLoading: !blockComplete
-  })
-);
-
-const propTypes = {
-  children: PropTypes.array,
-  showLoading: PropTypes.bool
-};
-
-function ChallengeDescription({ children, showLoading }) {
-  return (
-    <Row>
-      <Col
-        className={ `${ns}-instructions` }
-        xs={ 12 }
-        >
-        {
-          showLoading ?
-            children
-              .map((_, i) => (
-                <div
-                  key={ '' + i + 'description' }
-                  style={{ height: '36px', margin: '9px 0px' }}
-                  >
-                  <SkeletonSprite />
-                </div>
-                )) :
-            children
-        }
-      </Col>
-    </Row>
-  );
-}
-
-ChallengeDescription.displayName = 'ChallengeDescription';
-ChallengeDescription.propTypes = propTypes;
-
-export default connect(mapStateToProps)(ChallengeDescription);
diff --git a/common/app/routes/Challenges/Challenge-Title.jsx b/common/app/routes/Challenges/Challenge-Title.jsx
deleted file mode 100644
index e45937f8cc..0000000000
--- a/common/app/routes/Challenges/Challenge-Title.jsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-
-import ns from './ns.json';
-import { isCurrentBlockCompleteSelector } from '../../redux';
-import { SkeletonSprite } from '../../helperComponents';
-
-const mapStateToProps = createSelector(
-  isCurrentBlockCompleteSelector,
-  blockComplete => ({
-    showLoading: !blockComplete
-  })
-);
-const propTypes = {
-  children: PropTypes.string,
-  isCompleted: PropTypes.bool,
-  showLoading: PropTypes.bool
-};
-
-function ChallengeTitle({ children, isCompleted, showLoading }) {
-  let icon = null;
-  if (showLoading) {
-    return (
-      <h4 style={{ height: '35px', marginBottom: '9px' }}>
-        <SkeletonSprite />
-        <hr />
-      </h4>
-      );
-  }
-  if (isCompleted) {
-    icon = (
-      <i
-        className='ion-checkmark-circled text-primary'
-        title='Completed'
-      />
-    );
-  }
-  return (
-    <h4 className={ `text-center ${ns}-title` }>
-      { children || 'Happy Coding!' }
-      { icon }
-      <hr />
-    </h4>
-  );
-}
-
-ChallengeTitle.displayName = 'ChallengeTitle';
-ChallengeTitle.propTypes = propTypes;
-
-export default connect(mapStateToProps)(ChallengeTitle);
diff --git a/common/app/routes/Challenges/Child-Container.jsx b/common/app/routes/Challenges/Child-Container.jsx
deleted file mode 100644
index 736dd2c156..0000000000
--- a/common/app/routes/Challenges/Child-Container.jsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import CompletionModal from './Completion-Modal.jsx';
-import AppChildContainer from '../../Child-Container.jsx';
-
-const propTypes = {
-  children: PropTypes.node
-};
-
-function ChildContainer(props) {
-  const { children, ...restProps } = props;
-  return (
-    <AppChildContainer { ...restProps }>
-      { children }
-      <CompletionModal />
-    </AppChildContainer>
-  );
-}
-
-ChildContainer.propTypes = propTypes;
-
-export default ChildContainer;
diff --git a/common/app/routes/Challenges/Code-Mirror-Skeleton.jsx b/common/app/routes/Challenges/Code-Mirror-Skeleton.jsx
deleted file mode 100644
index a2d51ac7de..0000000000
--- a/common/app/routes/Challenges/Code-Mirror-Skeleton.jsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { SkeletonSprite } from '../../helperComponents';
-
-const propTypes = {
-  content: PropTypes.string
-};
-
-export default class CodeMirrorSkeleton extends PureComponent {
-
-
-  render() {
-    const {
-      content
-    } = this.props;
-    const editorLines = (content || '').split('\n');
-    return (
-      <div className='ReactCodeMirror'>
-        <div className='CodeMirror cm-s-monokai CodeMirror-wrap'>
-        <div className='CodeMirror-scrollbar-filler' />
-        <div className='CodeMirror-gutter-filler' />
-          <div className='CodeMirror-scroll'>
-            <div
-              className='CodeMirror-sizer'
-              style={
-                {
-                  height: (editorLines.length * 18) + 'px',
-                  overflow: 'hidden'
-                }
-              }
-              >
-              <SkeletonSprite />
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
-}
-
-CodeMirrorSkeleton.displayName = 'CodeMirrorSkeleton';
-CodeMirrorSkeleton.propTypes = propTypes;
diff --git a/common/app/routes/Challenges/Completion-Modal.jsx b/common/app/routes/Challenges/Completion-Modal.jsx
deleted file mode 100644
index 6ef24ea35d..0000000000
--- a/common/app/routes/Challenges/Completion-Modal.jsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import noop from 'lodash/noop';
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { Button, Modal } from 'react-bootstrap';
-import FontAwesome from 'react-fontawesome';
-
-import ns from './ns.json';
-import {
-  closeChallengeModal,
-  submitChallenge,
-
-  checkForNextBlock,
-
-  challengeModalSelector,
-  successMessageSelector
-} from './redux';
-
-const mapStateToProps = createSelector(
-  challengeModalSelector,
-  successMessageSelector,
-  (isOpen, message) => ({
-    isOpen,
-    message
-  })
-);
-
-const mapDispatchToProps = function(dispatch) {
-  const dispatchers = {
-    close: () => dispatch(closeChallengeModal()),
-    handleKeypress: (e) => {
-      if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
-        dispatch(submitChallenge());
-      }
-    },
-    submitChallenge: () => {
-        dispatch(submitChallenge());
-    },
-    checkForNextBlock: () => dispatch(checkForNextBlock())
-  };
-  return () => dispatchers;
-};
-
-const propTypes = {
-  checkForNextBlock: PropTypes.func.isRequired,
-  close: PropTypes.func.isRequired,
-  handleKeypress: PropTypes.func.isRequired,
-  isOpen: PropTypes.bool,
-  message: PropTypes.string,
-  submitChallenge: PropTypes.func.isRequired
-};
-
-export class CompletionModal extends PureComponent {
-  componentDidUpdate() {
-    if (this.props.isOpen) {
-      this.props.checkForNextBlock();
-    }
-  }
-  render() {
-    const {
-      close,
-      isOpen,
-      submitChallenge,
-      handleKeypress,
-      message
-    } = this.props;
-    return (
-      <Modal
-        animation={ false }
-        dialogClassName={ `${ns}-success-modal` }
-        keyboard={ true }
-        onHide={ close }
-        onKeyDown={ isOpen ? handleKeypress : noop }
-        show={ isOpen }
-        >
-        <Modal.Header
-          className={ `${ns}-list-header` }
-          closeButton={ true }
-          >
-          <Modal.Title>{ message }</Modal.Title>
-        </Modal.Header>
-        <Modal.Body>
-          <div className='text-center'>
-            <div className='row'>
-              <div>
-                <FontAwesome
-                  className='completion-icon text-primary'
-                  name='check-circle'
-                />
-              </div>
-            </div>
-          </div>
-        </Modal.Body>
-        <Modal.Footer>
-          <Button
-            block={ true }
-            bsSize='large'
-            bsStyle='primary'
-            onClick={ submitChallenge }
-            >
-            Submit and go to next challenge (Ctrl + Enter)
-          </Button>
-        </Modal.Footer>
-      </Modal>
-    );
-  }
-}
-
-CompletionModal.displayName = 'CompletionModal';
-CompletionModal.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(CompletionModal);
diff --git a/common/app/routes/Challenges/Help-Modal.jsx b/common/app/routes/Challenges/Help-Modal.jsx
deleted file mode 100644
index 5339be2b49..0000000000
--- a/common/app/routes/Challenges/Help-Modal.jsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { Button, Modal } from 'react-bootstrap';
-
-import ns from './ns.json';
-import {
-  createQuestion,
-  closeHelpModal,
-  helpModalSelector
-} from './redux';
-import { RSA } from '../../../utils/constantStrings.json';
-
-const mapStateToProps = state => ({ isOpen: helpModalSelector(state) });
-const mapDispatchToProps = { createQuestion, closeHelpModal };
-
-const propTypes = {
-  closeHelpModal: PropTypes.func.isRequired,
-  createQuestion: PropTypes.func.isRequired,
-  isOpen: PropTypes.bool
-};
-
-export class HelpModal extends PureComponent {
-  render() {
-    const {
-      isOpen,
-      closeHelpModal,
-      createQuestion
-    } = this.props;
-    return (
-      <Modal
-        show={ isOpen }
-        >
-        <Modal.Header className={ `${ns}-list-header` }>
-          Ask for help?
-          <span
-            className='close closing-x'
-            onClick={ closeHelpModal }
-            >
-            ×
-          </span>
-        </Modal.Header>
-        <Modal.Body className='text-center'>
-          <h3 className={`${ns}-help-modal-heading`}>
-            If you've already tried the&nbsp;
-            <a href={ RSA } target='_blank' title='Read, search, ask'>
-              Read-Search-Ask</a>&nbsp; method, then you can ask for help
-              on the freeCodeCamp forum.
-          </h3>
-          <Button
-            block={ true }
-            bsSize='lg'
-            bsStyle='primary'
-            onClick={ createQuestion }
-            >
-            Create a help post on the forum
-          </Button>
-          <Button
-            block={ true }
-            bsSize='lg'
-            bsStyle='primary'
-            onClick={ closeHelpModal }
-            >
-            Cancel
-          </Button>
-        </Modal.Body>
-      </Modal>
-    );
-  }
-}
-
-HelpModal.displayName = 'HelpModal';
-HelpModal.propTypes = propTypes;
-
-export default connect(mapStateToProps, mapDispatchToProps)(HelpModal);
diff --git a/common/app/routes/Challenges/Output.jsx b/common/app/routes/Challenges/Output.jsx
deleted file mode 100644
index d73d0cef48..0000000000
--- a/common/app/routes/Challenges/Output.jsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import NoSSR from 'react-no-ssr';
-import Codemirror from 'react-codemirror';
-
-import ns from './ns.json';
-import CodeMirrorSkeleton from './Code-Mirror-Skeleton.jsx';
-import { themeSelector } from '../../redux';
-
-const defaultOptions = {
-  lineNumbers: false,
-  lineWrapping: true,
-  mode: 'javascript',
-  readOnly: 'nocursor'
-};
-
-const mapStateToProps = state => ({ theme: themeSelector(state) });
-
-const propTypes = {
-  defaultOutput: PropTypes.string,
-  output: PropTypes.string,
-  theme: PropTypes.string
-};
-
-export class Output extends PureComponent {
-  render() {
-    const { output, defaultOutput } = this.props;
-    const cmTheme = this.props.theme === 'default' ? 'default' : 'dracula';
-    return (
-      <div className={ `${ns}-log` }>
-        <NoSSR onSSR={ <CodeMirrorSkeleton content={ output } /> }>
-          <Codemirror
-            options={{ ...defaultOptions, theme: cmTheme }}
-            value={ output || defaultOutput }
-          />
-        </NoSSR>
-      </div>
-    );
-  }
-}
-
-Output.displayName = 'Output';
-Output.propTypes = propTypes;
-
-export default connect(mapStateToProps)(Output);
diff --git a/common/app/routes/Challenges/Preview.jsx b/common/app/routes/Challenges/Preview.jsx
deleted file mode 100644
index f47f6fb0c7..0000000000
--- a/common/app/routes/Challenges/Preview.jsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-
-import ns from './ns.json';
-
-const mainId = 'fcc-main-frame';
-
-const Preview = () => {
-  return (
-    <div className={ `${ns}-preview` }>
-      <iframe
-        className={ `${ns}-preview-frame` }
-        id={ mainId }
-      />
-    </div>
-  );
-};
-
-Preview.displayName = 'Preview';
-
-export default Preview;
diff --git a/common/app/routes/Challenges/Show.jsx b/common/app/routes/Challenges/Show.jsx
deleted file mode 100644
index 2d65d87adb..0000000000
--- a/common/app/routes/Challenges/Show.jsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-
-import { challengeMetaSelector, updateSuccessMessage } from './redux';
-
-import Classic from './views/classic';
-import Step from './views/step';
-import Project from './views/project';
-import BackEnd from './views/backend';
-import Quiz from './views/quiz';
-import Modern from './views/Modern';
-import NotFound from '../../NotFound';
-
-import { fullBlocksSelector } from '../../entities';
-import {
-  fetchChallenge,
-  challengeSelector,
-  updateTitle
-} from '../../redux';
-import { makeToast } from '../../Toasts/redux';
-import { paramsSelector } from '../../Router/redux';
-import { randomCompliment } from '../../utils/get-words';
-
-const views = {
-  backend: BackEnd,
-  classic: Classic,
-  modern: Modern,
-  project: Project,
-  quiz: Quiz,
-  step: Step,
-  invalid: NotFound
-};
-
-const mapDispatchToProps = {
-  fetchChallenge,
-  makeToast,
-  updateTitle,
-  updateSuccessMessage
-};
-
-const mapStateToProps = createSelector(
-  challengeSelector,
-  challengeMetaSelector,
-  paramsSelector,
-  fullBlocksSelector,
-  (
-    { dashedName, isTranslated },
-    { viewType, title },
-    params,
-    blocks
-  ) => ({
-    blocks,
-    challenge: dashedName,
-    isTranslated,
-    params,
-    title,
-    viewType
-  })
-);
-
-const link = 'http://forum.freecodecamp.org/t/' +
-  'guidelines-for-translating-free-code-camp' +
-  '-to-any-language/19111';
-const helpUsTranslate = <a href={ link } target='_blank'>Help Us</a>;
-const propTypes = {
-  isTranslated: PropTypes.bool,
-  makeToast: PropTypes.func.isRequired,
-  params: PropTypes.shape({
-    block: PropTypes.string,
-    dashedName: PropTypes.string,
-    lang: PropTypes.string.isRequired
-  }),
-  showLoading: PropTypes.bool,
-  title: PropTypes.string,
-  updateSuccessMessage: PropTypes.func.isRequired,
-  updateTitle: PropTypes.func.isRequired,
-  viewType: PropTypes.string
-};
-
-export class Show extends PureComponent {
-
-  isNotTranslated({ isTranslated, params: { lang } }) {
-    return lang !== 'en' && !isTranslated;
-  }
-
-  makeTranslateToast() {
-    this.props.makeToast({
-      message: 'We haven\'t translated this challenge yet.',
-      action: helpUsTranslate,
-      timeout: 15000
-    });
-  }
-
-  componentDidMount() {
-    this.props.updateTitle(this.props.title);
-    this.props.updateSuccessMessage(randomCompliment());
-    if (this.isNotTranslated(this.props)) {
-      this.makeTranslateToast();
-    }
-  }
-
-  componentWillReceiveProps(nextProps) {
-    if (this.props.title !== nextProps.title) {
-      this.props.updateTitle(nextProps.title);
-    }
-    const { params: { dashedName } } = nextProps;
-    if (this.props.params.dashedName !== dashedName) {
-      this.props.updateSuccessMessage(randomCompliment());
-      if (this.isNotTranslated(nextProps)) {
-        this.makeTranslateToast();
-      }
-    }
-  }
-
-  render() {
-    const { viewType } = this.props;
-    const View = views[viewType] || Classic;
-    return <View />;
-  }
-}
-
-Show.displayName = 'Show(ChallengeView)';
-Show.propTypes = propTypes;
-
-export default connect(mapStateToProps, mapDispatchToProps)(Show);
diff --git a/common/app/routes/Challenges/Side-Panel.jsx b/common/app/routes/Challenges/Side-Panel.jsx
deleted file mode 100644
index b69e48ba09..0000000000
--- a/common/app/routes/Challenges/Side-Panel.jsx
+++ /dev/null
@@ -1,182 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import ReactDom from 'react-dom';
-import { createSelector } from 'reselect';
-import { connect } from 'react-redux';
-
-import ns from './ns.json';
-
-import HelpModal from './Help-Modal.jsx';
-import ToolPanel from './Tool-Panel.jsx';
-import ChallengeTitle from './Challenge-Title.jsx';
-import ChallengeDescription from './Challenge-Description.jsx';
-import TestSuite from './Test-Suite.jsx';
-import Output from './Output.jsx';
-import {
-  openHelpModal,
-  updateHint,
-  executeChallenge,
-  unlockUntrustedCode,
-
-  challengeMetaSelector,
-  testsSelector,
-  outputSelector,
-  hintIndexSelector,
-  codeLockedSelector,
-  guideURLSelector
-} from './redux';
-
-import { descriptionRegex } from './utils';
-import { challengeSelector } from '../../redux';
-import { makeToast } from '../../Toasts/redux';
-
-const mapDispatchToProps = {
-  makeToast,
-  executeChallenge,
-  updateHint,
-  openHelpModal,
-  unlockUntrustedCode
-};
-const mapStateToProps = createSelector(
-  challengeSelector,
-  challengeMetaSelector,
-  testsSelector,
-  outputSelector,
-  hintIndexSelector,
-  codeLockedSelector,
-  guideURLSelector,
-  (
-    { description },
-    { title },
-    tests,
-    output,
-    hintIndex,
-    isCodeLocked,
-    guideUrl
-  ) => ({
-    title,
-    guideUrl,
-    description,
-    tests,
-    output,
-    isCodeLocked
-  })
-);
-const propTypes = {
-  description: PropTypes.arrayOf(PropTypes.string),
-  executeChallenge: PropTypes.func,
-  guideUrl: PropTypes.string,
-  hint: PropTypes.string,
-  isCodeLocked: PropTypes.bool,
-  makeToast: PropTypes.func,
-  openHelpModal: PropTypes.func,
-  output: PropTypes.string,
-  tests: PropTypes.arrayOf(PropTypes.object),
-  title: PropTypes.string,
-  unlockUntrustedCode: PropTypes.func,
-  updateHint: PropTypes.func
-};
-
-export class SidePanel extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.bindTopDiv = this.bindTopDiv.bind(this);
-  }
-
-  componentWillUpdate(nextProps) {
-    const { title } = this.props;
-    if (title !== nextProps.title) {
-      const node = ReactDom.findDOMNode(this.descriptionTop);
-      setTimeout(() => { node.scrollIntoView({ behavior: 'smooth'}); }, 0);
-    }
-  }
-
-  bindTopDiv(node) {
-    this.descriptionTop = node;
-  }
-
-  renderDescription(description = [ 'Happy Coding!' ]) {
-    return description.map((line, index) => {
-      if (descriptionRegex.test(line)) {
-        return (
-          <div
-            dangerouslySetInnerHTML={{ __html: line }}
-            key={ line.slice(-6) + index }
-          />
-        );
-      }
-      return (
-        <p
-          className='wrappable'
-          dangerouslySetInnerHTML= {{ __html: line }}
-          key={ line.slice(-6) + index }
-        />
-      );
-    });
-  }
-
-  render() {
-    const {
-      title,
-      description,
-      tests = [],
-      output,
-      hint,
-      executeChallenge,
-      updateHint,
-      makeToast,
-      openHelpModal,
-      isCodeLocked,
-      unlockUntrustedCode,
-      guideUrl
-    } = this.props;
-    return (
-      <div
-        className={ `${ns}-instructions-panel` }
-        ref='panel'
-        role='complementary'
-        >
-        <div ref={ this.bindTopDiv } />
-        <div>
-          <ChallengeTitle>
-            { title }
-          </ChallengeTitle>
-          <ChallengeDescription>
-            { this.renderDescription(description) }
-          </ChallengeDescription>
-        </div>
-        <ToolPanel
-          executeChallenge={ executeChallenge }
-          guideUrl={ guideUrl }
-          hint={ hint }
-          isCodeLocked={ isCodeLocked }
-          makeToast={ makeToast }
-          openHelpModal={ openHelpModal }
-          unlockUntrustedCode={ unlockUntrustedCode }
-          updateHint={ updateHint }
-        />
-        <HelpModal />
-        <Output
-          defaultOutput={
-`/**
-  * Your output will go here.
-  * Any console.log() statements
-  * will appear in here as well.
-  */`
-          }
-          output={ output }
-        />
-        <br />
-        <TestSuite tests={ tests } />
-      </div>
-    );
-  }
-}
-
-SidePanel.displayName = 'SidePanel';
-SidePanel.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(SidePanel);
diff --git a/common/app/routes/Challenges/Solution-Input.jsx b/common/app/routes/Challenges/Solution-Input.jsx
deleted file mode 100644
index c6be18f8dc..0000000000
--- a/common/app/routes/Challenges/Solution-Input.jsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { HelpBlock, FormGroup, FormControl } from 'react-bootstrap';
-import { getValidationState, DOMOnlyProps } from '../../utils/form';
-
-const propTypes = {
-  placeholder: PropTypes.string,
-  solution: PropTypes.object
-};
-
-export default function SolutionInput({ solution, placeholder }) {
-  const validationState = getValidationState(solution);
-
-  return (
-    <FormGroup
-      controlId='solution'
-      validationState={
-        (validationState && validationState.includes('warning')) ?
-          'warning' :
-          validationState
-      }
-      >
-      <FormControl
-        name='solution'
-        placeholder={ placeholder }
-        type='url'
-        { ...DOMOnlyProps(solution) }
-      />
-      {
-        validationState === 'error' &&
-          <HelpBlock>Make sure you provide a proper URL.</HelpBlock>
-      }
-      {
-        validationState === 'glitch-warning' &&
-          <HelpBlock>
-            Make sure you have entered a shareable URL
-            (e.g. "https://green-camper.glitch.me", not
-            "https://glitch.com/#!/edit/green-camper".)
-          </HelpBlock>
-      }
-    </FormGroup>
-  );
-}
-
-SolutionInput.displayName = 'SolutionInput';
-SolutionInput.propTypes = propTypes;
diff --git a/common/app/routes/Challenges/Test-Suite.jsx b/common/app/routes/Challenges/Test-Suite.jsx
deleted file mode 100644
index 7f713963d1..0000000000
--- a/common/app/routes/Challenges/Test-Suite.jsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'classnames';
-import { Col, Row } from 'react-bootstrap';
-
-import ns from './ns.json';
-
-const propTypes = {
-  tests: PropTypes.arrayOf(PropTypes.object)
-};
-
-function getAccessibleText(err, pass, text) {
-  let accessibleText = 'Waiting';
-
-  // Determine test status (i.e. icon)
-  if (err) {
-    accessibleText = 'Error';
-  } else if (pass) {
-    accessibleText = 'Pass';
-  }
-
-  // Append the text itself
-  return accessibleText + ' - ' + text;
-}
-
-export default class TestSuite extends PureComponent {
-  renderTests(tests = []) {
-    // err && pass > invalid state
-    // err && !pass > failed tests
-    // !err && pass > passed tests
-    // !err && !pass > in-progress
-    return tests.map(({ err, pass = false, text = '' }, index)=> {
-      const iconClass = classnames({
-        'big-icon': true,
-        'ion-close-circled error-icon': err && !pass,
-        'ion-checkmark-circled success-icon': !err && pass,
-        'ion-refresh refresh-icon': !err && !pass
-      });
-      return (
-        <Row
-          aria-label={ getAccessibleText(err, pass, text) }
-          key={ text.slice(-6) + index }
-          tabIndex='0'
-          >
-          <Col
-            className='text-center'
-            xs={ 2 }
-            >
-            <i
-              aria-hidden='true'
-              className={ iconClass }
-            />
-          </Col>
-          <Col
-            aria-hidden='true'
-            className='test-output'
-            dangerouslySetInnerHTML={{ __html: text }}
-            xs={ 10 }
-          />
-        </Row>
-      );
-    });
-  }
-
-  render() {
-    const { tests } = this.props;
-    return (
-      <div
-        className={ `${ns}-test-suite` }
-        style={{ marginTop: '10px' }}
-        >
-        { this.renderTests(tests) }
-        <div className='big-spacer' />
-      </div>
-    );
-  }
-}
-
-TestSuite.displayName = 'TestSuite';
-TestSuite.propTypes = propTypes;
diff --git a/common/app/routes/Challenges/Tool-Panel.jsx b/common/app/routes/Challenges/Tool-Panel.jsx
deleted file mode 100644
index 77e63ebb9d..0000000000
--- a/common/app/routes/Challenges/Tool-Panel.jsx
+++ /dev/null
@@ -1,179 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { Button, Tooltip, OverlayTrigger } from 'react-bootstrap';
-import { isCurrentBlockCompleteSelector } from '../../redux';
-
-const mapStateToProps = createSelector(
-  isCurrentBlockCompleteSelector,
-  blockComplete => ({
-    isDisabled: !blockComplete
-  })
-);
-
-const unlockWarning = (
-  <Tooltip id='tooltip'>
-    <h4>
-      <strong>Careful!</strong> Only run code you trust.
-    </h4>
-  </Tooltip>
-);
-
-const propTypes = {
-  executeChallenge: PropTypes.func.isRequired,
-  guideUrl: PropTypes.string,
-  hint: PropTypes.string,
-  isCodeLocked: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  makeToast: PropTypes.func.isRequired,
-  openHelpModal: PropTypes.func.isRequired,
-  unlockUntrustedCode: PropTypes.func.isRequired,
-  updateHint: PropTypes.func.isRequired
-};
-
-class ToolPanel extends PureComponent {
-  constructor(...props) {
-    super(...props);
-    this.makeHint = this.makeHint.bind(this);
-    this.makeReset = this.makeReset.bind(this);
-  }
-  makeHint() {
-    this.props.makeToast({
-      message: this.props.hint,
-      timeout: 4000
-    });
-    this.props.updateHint();
-  }
-
-  makeReset() {
-    this.props.makeToast({
-      message: 'This will restore your code editor to its original state.',
-      action: 'clear my code',
-      actionCreator: 'clickOnReset',
-      timeout: 4000
-    });
-  }
-
-  renderHint(hint, makeHint, isDisabled) {
-    if (!hint) {
-      return null;
-    }
-    return (
-      <Button
-        block={ true }
-        bsStyle='primary'
-        className='btn-big'
-        disabled={ isDisabled }
-        onClick={ makeHint }
-        >
-        Hint
-      </Button>
-    );
-  }
-
-  renderExecute(
-    isCodeLocked,
-    executeChallenge,
-    unlockUntrustedCode,
-    isDisabled
-  ) {
-    if (isCodeLocked) {
-      return (
-        <OverlayTrigger
-          overlay={ unlockWarning }
-          placement='right'
-          >
-          <Button
-            block={ true }
-            bsStyle='primary'
-            className='btn-big'
-            disabled={ isDisabled }
-            onClick={ unlockUntrustedCode }
-            >
-            I trust this code. Unlock it.
-          </Button>
-        </OverlayTrigger>
-      );
-    }
-    return (
-      <Button
-        block={ true }
-        bsStyle='primary'
-        className='btn-big'
-        disabled={ isDisabled }
-        onClick={ executeChallenge }
-        >
-        Run tests (ctrl + enter)
-      </Button>
-    );
-  }
-
-  render() {
-    const {
-      executeChallenge,
-      guideUrl,
-      hint,
-      isCodeLocked,
-      isDisabled,
-      openHelpModal,
-      unlockUntrustedCode
-    } = this.props;
-
-    return (
-      <div>
-        { this.renderHint(hint, this.makeHintm, isDisabled) }
-        {
-          this.renderExecute(
-            isCodeLocked,
-            executeChallenge,
-            unlockUntrustedCode,
-            isDisabled
-          )
-        }
-        <div className='button-spacer' />
-          <Button
-            block={ true }
-            bsStyle='primary'
-            className='btn-big'
-            disabled={ isDisabled }
-            onClick={ this.makeReset }
-            >
-          Reset your code
-          </Button>
-          <div className='button-spacer' />
-          {
-            guideUrl &&
-              <div>
-                <Button
-                  block={ true }
-                  bsStyle='primary'
-                  className='btn-big'
-                  disabled={ isDisabled }
-                  href={ guideUrl }
-                  target='_blank'
-                  >
-                  Get a hint
-                </Button>
-                <div className='button-spacer' />
-              </div>
-          }
-          <Button
-            block={ true }
-            bsStyle='primary'
-            className='btn-big'
-            disabled={ isDisabled }
-            onClick={ openHelpModal }
-            >
-            Ask for help on the forum
-          </Button>
-        <div className='button-spacer' />
-      </div>
-    );
-  }
-}
-
-ToolPanel.displayName = 'ToolPanel';
-ToolPanel.propTypes = propTypes;
-
-export default connect(mapStateToProps)(ToolPanel);
diff --git a/common/app/routes/Challenges/challenges.less b/common/app/routes/Challenges/challenges.less
deleted file mode 100644
index 2a70198e69..0000000000
--- a/common/app/routes/Challenges/challenges.less
+++ /dev/null
@@ -1,201 +0,0 @@
-// should be the same as the filename and ./ns.json
-@ns: challenges;
-
-// challenge panes are bound to the pane size which in turn is
-// bound to the total height minus navbar height
-.max-element-height() {
-  height: 100%;
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
-.@{ns}-title {
-  margin-top: 0;
-  i {
-    margin-left: 5px;
-    line-height: 20px;
-  }
-}
-
-.@{ns}-grayed-out-test-output {
-  color: @gray-light;
-}
-
-.@{ns}-test-suite {
-  margin-top: 10px;
-  & .row {
-    margin: 14px 0 0 0;
-  }
-
-  .big-icon {
-    font-size: 30px;
-    vertical-align: top;
-  }
-
-  .error-icon {
-    color: @brand-danger;
-    top: 50%;
-  }
-
-  .success-icon {
-    color: @brand-primary;
-  }
-
-  .refresh-icon {
-    color: @icon-gray;
-  }
-}
-
-.@{ns}-instructions-panel {
-  padding: 0 14px 0 14px;
-}
-
-.@{ns}-instructions {
-  margin-bottom: 5px;
-  h4 {
-    margin-bottom: 0;
-  }
-  blockquote {
-    font-size: 90%;
-    font-family: @font-family-monospace !important;
-    color: @code-color;
-    background-color: #fffbe5;
-    border-radius: @border-radius-base;
-    border: 1px solid @pre-border-color;
-    white-space: pre;
-    padding: 5px 10px;
-    margin-bottom: 10px;
-    margin-top: -5px;
-    overflow: auto;
-  }
-  dfn {
-    font-family: @font-family-monospace;
-    color: @code-color;
-    background-color: @code-bg;
-    border-radius: @border-radius-base;
-    padding: 1px 5px;
-  }
-  & a, #MDN-links a {
-    color: #31708f;
-  }
-  & a::after, #MDN-links a::after {
-    font-size: 70%;
-    font-family: FontAwesome;
-    content: " \f08e";
-  }
-  ol {
-    font-size: 16px;
-  }
-}
-
-.@{ns}-log {
-  border: 1px solid @brand-primary;
-  margin: 24px 0 0 0;
-}
-
-.night {
-  .@{ns}-instructions blockquote {
-    background-color: #242424;
-    border-color: #515151;
-    color: #ABABAB
-  }
-  .@{ns}-instructions dfn {
-    background-color: #242424;
-    color: #02a902;
-  }
-  .@{ns}-editor .CodeMirror {
-    background-color:@night-body-bg;
-    color:#ABABAB;
-    &-gutters {
-      background-color:@night-body-bg;
-      color:#ABABAB;
-    }
-    .cm-bracket, .cm-tag {
-      color:#5CAFD6;
-    }
-    .cm-property, .cm-string {
-      color:#B5753A;
-    }
-    .cm-keyword, .cm-attribute {
-      color:#9BBBDC;
-    }
-    &-line {
-      caret-color:#ABABAB;
-    }
-  }
-  .@{ns}-log {
-    border: none;
-  }
-  .refresh-icon {
-    color: @icon-light-gray;
-  }
-  .@{ns}-preview {
-    background-color: #FCFCFC;
-  }
-}
-
-.@{ns}-test-output {
-  font-size: 15px;
-  font-family: "Ubuntu Mono";
-  margin-top: 8px;
-  line-height:20px;
-  word-wrap: break-word;
-}
-
-.@{ns}-success-modal {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  height: 50vh;
-
-  .modal-title {
-    color: @gray-lighter;
-  }
-
-  .modal-header {
-    background-color: @brand-primary;
-    margin-bottom: 0;
-
-    .close {
-      color: #eee;
-      font-size: 4rem;
-      opacity: 0.6;
-      transition: all 300ms ease-out;
-      margin-top: 0;
-      padding-left: 0;
-
-      &:hover {
-        opacity: 1;
-      }
-    }
-  }
-
-  .modal-body {
-    padding: 35px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-
-    .fa {
-      margin-right: 0;
-    }
-  }
-}
-
-.@{ns}-preview {
-  .max-element-height();
-  width: 100%;
-  overflow-y: hidden;
-}
-
-.@{ns}-preview-frame {
-  .max-element-height();
-  border: none;
-  width: 100%;
-}
-
-.@{ns}-help-modal-heading > a {
-  font-size: inherit;
-}
-
-&{ @import "./views/index.less"; }
diff --git a/common/app/routes/Challenges/index.js b/common/app/routes/Challenges/index.js
deleted file mode 100644
index 00edf41575..0000000000
--- a/common/app/routes/Challenges/index.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import _ from 'lodash';
-import { isLocationAction, redirect } from 'redux-first-router';
-
-import { types, challengeMetaSelector } from './redux';
-import { mapStateToPanes as backendPanesMap } from './views/backend';
-import { mapStateToPanes as classicPanesMap } from './views/classic';
-import { mapStateToPanes as stepPanesMap } from './views/step';
-import { mapStateToPanes as projectPanesMap } from './views/project';
-import { mapStateToPanes as quizPanesMap } from './views/quiz';
-import { mapStateToPanes as modernPanesMap } from './views/Modern';
-import { types as app } from '../../redux';
-import { locationTypeSelector } from '../../Router/redux';
-
-export const routes = {
-  [types.onRouteChallengeRoot]: {
-    path: '/challenges',
-    thunk: (dispatch) =>
-      dispatch(redirect({ type: types.onRouteCurrentChallenge }))
-  },
-  [types.onRouteChallenges]: '/challenges/:block/:dashedName',
-  [types.onRouteCurrentChallenge]: '/challenges/current-challenge'
-};
-
-export function createPanesMap() {
-  const viewMap = {
-    [backendPanesMap]: backendPanesMap,
-    [classicPanesMap]: classicPanesMap,
-    [stepPanesMap]: stepPanesMap,
-    [projectPanesMap]: projectPanesMap,
-    [quizPanesMap]: quizPanesMap,
-    [modernPanesMap]: modernPanesMap
-  };
-  return (state, action) => {
-    // if a location action has dispatched then we must update the panesmap
-    if (isLocationAction(action)) {
-      let finalPanesMap = {};
-      // if we are on this route,
-      // then we must figure out the currect view we are on
-      // this depends on the type of challenge
-      if (action.type === types.onRouteChallenges) {
-        // location matches a panes route
-        const meta = challengeMetaSelector(state);
-        // if challenge data has not been fetched yet (as in the case of SSR)
-        // then we will get a pojo factory
-        const mapStateToPanes = viewMap[meta.viewType] || _.stubObject;
-        finalPanesMap = mapStateToPanes(state);
-      }
-      return finalPanesMap;
-    }
-    // This should normally happen during SSR
-    // here we are ensured that the challenge data has been fetched
-    // now we can select the appropriate panes map factory
-    if (
-      action.type === app.fetchChallenge.complete &&
-      locationTypeSelector(state) === types.onRouteChallenges
-    ) {
-      const meta = challengeMetaSelector(state);
-      const mapStateToPanes = viewMap[meta.viewType] || _.stubObject;
-      return mapStateToPanes(state);
-    }
-    return null;
-  };
-}
-
-export { default } from './Show.jsx';
diff --git a/common/app/routes/Challenges/ns.json b/common/app/routes/Challenges/ns.json
deleted file mode 100644
index fbbd505dfe..0000000000
--- a/common/app/routes/Challenges/ns.json
+++ /dev/null
@@ -1 +0,0 @@
-"challenges"
diff --git a/common/app/routes/Challenges/rechallenge/builders.js b/common/app/routes/Challenges/rechallenge/builders.js
deleted file mode 100644
index c38c1a6f30..0000000000
--- a/common/app/routes/Challenges/rechallenge/builders.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import _ from 'lodash';
-import { Observable } from 'rx';
-import cond from 'lodash/cond';
-import flow from 'lodash/flow';
-import identity from 'lodash/identity';
-import matchesProperty from 'lodash/matchesProperty';
-import partial from 'lodash/partial';
-import stubTrue from 'lodash/stubTrue';
-
-import {
-  fetchScript,
-  fetchLink
-} from '../utils/fetch-and-cache.js';
-import {
-  compileHeadTail,
-  setExt,
-  transformContents
-} from '../../../../utils/polyvinyl';
-
-const htmlCatch = '\n<!--fcc-->\n';
-const jsCatch = '\n;/*fcc*/\n';
-const loopProtector = `
-  window.loopProtect = parent.loopProtect;
-  window.__err = null;
-  window.loopProtect.hit = function(line) {
-    window.__err = new Error(
-      'Potential infinite loop at line ' +
-      line +
-      '. To disable loop protection, write:' +
-      ' // noprotect as the first' +
-      ' line. Beware that if you do have an infinite loop in your code' +
-      ' this will crash your browser.'
-    );
-  };
-`;
-const defaultTemplate = ({ source }) => `
-  <body style='margin:8px;'>
-    <!-- fcc-start-source -->
-      ${source}
-    <!-- fcc-end-source -->
-  </body>
-`;
-
-const wrapInScript = partial(transformContents, (content) => (
-  `${htmlCatch}<script>${loopProtector}${content}${jsCatch}</script>`
-));
-const wrapInStyle = partial(transformContents, (content) => (
-  `${htmlCatch}<style>${content}</style>`
-));
-const setExtToHTML = partial(setExt, 'html');
-const padContentWithJsCatch = partial(compileHeadTail, jsCatch);
-const padContentWithHTMLCatch = partial(compileHeadTail, htmlCatch);
-
-export const jsToHtml = cond([
-  [
-    matchesProperty('ext', 'js'),
-    flow(padContentWithJsCatch, wrapInScript, setExtToHTML)
-  ],
-  [ stubTrue, identity ]
-]);
-
-export const cssToHtml = cond([
-  [
-    matchesProperty('ext', 'css'),
-    flow(padContentWithHTMLCatch, wrapInStyle, setExtToHTML)
-  ],
-  [ stubTrue, identity ]
-]);
-
-// FileStream::concactHtml(
-//   required: [ ...Object ],
-//   template: String
-// ) => Observable[{ build: String, sources: Dictionary }]
-export function concactHtml(required, template) {
-  const createBody = template ? _.template(template) : defaultTemplate;
-  const source = this.shareReplay();
-  const sourceMap = source
-    .flatMap(files => files.reduce((sources, file) => {
-      sources[file.name] = file.source || file.contents;
-      return sources;
-    }, {}));
-
-  const head = Observable.from(required)
-    .flatMap(required => {
-      if (required.src) {
-        return fetchScript(required);
-      }
-      if (required.link) {
-        return fetchLink(required);
-      }
-      return Observable.just('');
-    })
-    .reduce((head, required) => head + required, '')
-    .map(head => `<head>${head}</head>`);
-
-  const body = source
-    .flatMap(file => file.reduce((body, file) => {
-      return body + file.contents + file.tail + htmlCatch;
-    }, ''))
-    .map(source => ({ source }))
-    .map(createBody);
-
-  return Observable
-    .combineLatest(
-      head,
-      body,
-      fetchScript({
-        src: '/js/frame-runner.js',
-        crossDomain: false,
-        cacheBreaker: true
-      }),
-      sourceMap,
-      (head, body, frameRunner, sources) => ({
-        build: head + body + frameRunner,
-        sources
-      })
-    );
-}
diff --git a/common/app/routes/Challenges/rechallenge/throwers.js b/common/app/routes/Challenges/rechallenge/throwers.js
deleted file mode 100644
index 76eaf7bb14..0000000000
--- a/common/app/routes/Challenges/rechallenge/throwers.js
+++ /dev/null
@@ -1,124 +0,0 @@
-import { Observable } from 'rx';
-import cond from 'lodash/cond';
-import identity from 'lodash/identity';
-import stubTrue from 'lodash/stubTrue';
-import conforms from 'lodash/conforms';
-
-import castToObservable from '../../../utils/cast-to-observable.js';
-
-const HTML$JSReg = /html|js/;
-
-const testHTMLJS = conforms({ ext: (ext) => HTML$JSReg.test(ext) });
-// const testJS = matchesProperty('ext', 'js');
-const passToNext = [ stubTrue, identity ];
-
-// Detect if a JS multi-line comment is left open
-const throwIfOpenComments = cond([
-  [
-    testHTMLJS,
-    function _checkForComments({ contents }) {
-      const openingComments = contents.match(/\/\*/gi);
-      const closingComments = contents.match(/\*\//gi);
-      if (
-        openingComments &&
-        (!closingComments || openingComments.length > closingComments.length)
-      ) {
-        throw new SyntaxError('Unfinished multi-line comment');
-      }
-    }
-  ],
-  passToNext
-]);
-
-
-// Nested dollar sign calls breaks browsers
-const nestedJQCallReg = /\$\s*?\(\s*?\$\s*?\)/gi;
-const throwIfNestedJquery = cond([
-  [
-    testHTMLJS,
-    function({ contents }) {
-      if (nestedJQCallReg.test(contents)) {
-        throw new SyntaxError('Nested jQuery calls breaks browsers');
-      }
-    }
-  ],
-  passToNext
-]);
-
-const functionReg = /function/g;
-const functionCallReg = /function\s*?\(|function\s+\w+\s*?\(/gi;
-// lonely function keywords breaks browsers
-const ThrowIfUnfinishedFunction = cond([
-
-  [
-    testHTMLJS,
-    function({ contents }) {
-      if (
-        functionReg.test(contents) &&
-        !functionCallReg.test(contents)
-      ) {
-        throw new SyntaxError(
-          'Unsafe or unfinished function declaration'
-        );
-      }
-    }
-  ],
-  passToNext
-]);
-
-
-// console call stops tests scripts from running
-const unsafeConsoleCallReg = /if\s\(null\)\sconsole\.log\(1\);/gi;
-const throwIfUnsafeConsoleCall = cond([
-  [
-    testHTMLJS,
-    function({ contents }) {
-      if (unsafeConsoleCallReg.test(contents)) {
-        throw new SyntaxError(
-          '`if (null) console.log(1)` detected. This will break tests'
-        );
-      }
-    }
-  ],
-  passToNext
-]);
-
-// Code with the URL hyperdev.com should not be allowed to run,
-const goMixReg = /glitch\.(com|me)/gi;
-const throwIfGomixDetected = cond([
-  [
-    testHTMLJS,
-    function({ contents }) {
-      if (goMixReg.test(contents)) {
-        throw new Error('Glitch.com or Glitch.me should not be in the code');
-      }
-    }
-  ],
-  passToNext
-]);
-
-const validators = [
-  throwIfOpenComments,
-  throwIfGomixDetected,
-  throwIfNestedJquery,
-  ThrowIfUnfinishedFunction,
-  throwIfUnsafeConsoleCall
-];
-
-export default function validate(file) {
-  return validators.reduce((obs, validator) => obs.flatMap(file => {
-    try {
-      return castToObservable(validator(file));
-    } catch (err) {
-      return Observable.throw(err);
-    }
-  }), Observable.of(file))
-    // if no error has occurred map to the original file
-    .map(() => file)
-    // if err add it to the file
-    // and return file
-    .catch(err => {
-      file.error = err;
-      return Observable.just(file);
-    });
-}
diff --git a/common/app/routes/Challenges/rechallenge/transformers.js b/common/app/routes/Challenges/rechallenge/transformers.js
deleted file mode 100644
index 82c55e5141..0000000000
--- a/common/app/routes/Challenges/rechallenge/transformers.js
+++ /dev/null
@@ -1,162 +0,0 @@
-import {
-  attempt,
-  cond,
-  flow,
-  identity,
-  isError,
-  matchesProperty,
-  overEvery,
-  overSome,
-  partial,
-  stubTrue
-} from 'lodash';
-
-import * as babel from 'babel-core';
-import presetEs2015 from 'babel-preset-es2015';
-import presetReact from 'babel-preset-react';
-import { Observable } from 'rx';
-
-import * as vinyl from '../../../../utils/polyvinyl.js';
-import castToObservable from '../../../utils/cast-to-observable.js';
-
-const babelOptions = { presets: [ presetEs2015, presetReact ] };
-const babelTransformCode = code => babel.transform(code, babelOptions).code;
-function loopProtectHit(line) {
-  var err = 'Exiting potential infinite loop at line ' +
-    line +
-    '. To disable loop protection, write: \n\/\/ noprotect\nas the first ' +
-    'line. Beware that if you do have an infinite loop in your code, ' +
-    'this will crash your browser.';
-  throw new Error(err);
-}
-
-// const sourceReg =
-//  /(<!-- fcc-start-source -->)([\s\S]*?)(?=<!-- fcc-end-source -->)/g;
-const console$logReg = /(?:\b)console(\.log\S+)/g;
-const NBSPReg = new RegExp(String.fromCharCode(160), 'g');
-
-const isJS = matchesProperty('ext', 'js');
-const testHTMLJS = overSome(isJS, matchesProperty('ext', 'html'));
-export const testJS$JSX = overSome(isJS, matchesProperty('ext', 'jsx'));
-
-// work around the absence of multi-flile editing
-// this can be replaced with `matchesProperty('ext', 'sass')`
-// when the time comes
-const testSASS = file => (/type='text\/sass'/i).test(file.contents);
-// This can be done in the transformer when we have multi-file editing
-const browserSassCompiler = `
-  <script>
-    var styleTags = [ ...document.querySelectorAll('style') ];
-    [].slice.call(styleTags, 1).forEach(
-      function compileSass(tag) {
-        var scss = tag.innerHTML;
-        Sass.compile(scss, function(result) {
-          tag.type = 'text/css';
-          tag.innerHTML = result.text;
-        });
-      }
-    )
-  </script>
-`;
-// if shouldProxyConsole then we change instances of console log
-// to `window.__console.log`
-// this let's us tap into logging into the console.
-// currently we only do this to the main window and not the test window
-export const proxyLoggerTransformer = partial(
-  vinyl.transformHeadTailAndContents,
-  source => (
-      source.replace(console$logReg, (match, methodCall) => {
-      return 'window.__console' + methodCall;
-  })),
-);
-
-const addLoopProtect = partial(
-  vinyl.transformContents,
-  contents => {
-    /* eslint-disable import/no-unresolved */
-    const loopProtect = require('loop-protect');
-    /* eslint-enable import/no-unresolved */
-    loopProtect.hit = loopProtectHit;
-    return loopProtect(contents);
-  }
-);
-
-export const addLoopProtectHtmlJsJsx = cond([
-  [
-    overEvery(
-      testHTMLJS,
-      partial(
-        vinyl.testContents,
-        contents => contents.toLowerCase().includes('<script>')
-      )
-    ),
-    addLoopProtect
-  ],
-  [ testJS$JSX, addLoopProtect ],
-  [ stubTrue, identity ]
-]);
-
-export const replaceNBSP = cond([
-  [
-    testHTMLJS,
-    partial(
-      vinyl.transformContents,
-      contents => contents.replace(NBSPReg, ' ')
-    )
-  ],
-  [ stubTrue, identity ]
-]);
-
-function tryTransform(wrap = identity) {
-  return function transformWrappedPoly(source) {
-    const result = attempt(wrap, source);
-    if (isError(result)) {
-      const friendlyError = `${result}`
-        .match(/[\w\W]+?\n/)[0]
-        .replace(' unknown:', '');
-      throw new Error(friendlyError);
-    }
-    return result;
-  };
-}
-
-export const babelTransformer = cond([
-  [
-    testJS$JSX,
-    flow(
-      partial(
-        vinyl.transformHeadTailAndContents,
-        tryTransform(babelTransformCode)
-      ),
-      partial(vinyl.setExt, 'js')
-    )
-  ],
-  [ stubTrue, identity ]
-]);
-
-export const sassTransformer = cond([
-  [
-    testSASS,
-    partial(
-      vinyl.appendToTail,
-      browserSassCompiler
-    )
-  ],
-  [ stubTrue, identity ]
-]);
-
-export const _transformers = [
-  addLoopProtectHtmlJsJsx,
-  replaceNBSP,
-  babelTransformer,
-  sassTransformer
-];
-
-export function applyTransformers(file, transformers = _transformers) {
-  return transformers.reduce(
-    (obs, transformer) => {
-      return obs.flatMap(file => castToObservable(transformer(file)));
-    },
-    Observable.of(file)
-  );
-}
diff --git a/common/app/routes/Challenges/redux/challenge-epic.js b/common/app/routes/Challenges/redux/challenge-epic.js
deleted file mode 100644
index a0a9056c4d..0000000000
--- a/common/app/routes/Challenges/redux/challenge-epic.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import _ from 'lodash';
-import { Observable } from 'rx';
-import { combineEpics, ofType } from 'redux-epic';
-
-import {
-  types,
-
-  challengeUpdated,
-  onRouteChallenges,
-  onRouteCurrentChallenge
-} from './';
-
-import {
-  createErrorObservable,
-  challengeSelector,
-  nextChallengeSelector
-} from '../../../redux';
-import { langSelector } from '../../../Router/redux';
-import { makeToast } from '../../../Toasts/redux';
-
-// When we change challenge, update the current challenge
-// UI data.
-export function challengeUpdatedEpic(actions, { getState }) {
-  return actions::ofType(types.onRouteChallenges)
-    // prevent subsequent onRouteChallenges to cause UI to refresh
-    .distinctUntilChanged(({ payload: { dashedName }}) => dashedName)
-    .map(() => challengeSelector(getState()))
-    //  if the challenge isn't loaded in the current state,
-    //  this will be an empty object
-    //  We wait instead for the fetchChallenge.complete to complete the UI state
-    .filter(({ dashedName }) => !!dashedName)
-    // send the challenge to update UI and trigger main iframe to update
-    // use unary to prevent index from being passed to func
-    .map(_.unary(challengeUpdated));
-}
-
-// used to reset users code on request
-export function resetChallengeEpic(actions, { getState }) {
-  return actions::ofType(types.clickOnReset)
-    .map(_.flow(getState, challengeSelector, challengeUpdated));
-}
-
-export function nextChallengeEpic(actions, { getState }) {
-  return actions::ofType(types.moveToNextChallenge)
-    .flatMap(() => {
-      const state = getState();
-      const lang = langSelector(state);
-      const { nextChallenge } = nextChallengeSelector(state);
-      if (!nextChallenge) {
-        return createErrorObservable(
-            new Error('Next Challenge could not be found')
-          );
-      }
-      if (nextChallenge.isLocked) {
-        return Observable.of(
-          makeToast({
-            message: 'The next challenge has not been unlocked. ' +
-            'Please revisit the required (*) challenges ' +
-            'that have not been passed yet. ',
-            timeout: 15000
-          }),
-          onRouteCurrentChallenge()
-        );
-      }
-      return Observable.of(
-        // normally we wouldn't need to add the lang as
-        // addLangToRoutesEnhancer should add langs for us, but the way
-        // enhancers/middlewares and RFR orders things this action will not
-        // see addLangToRoutesEnhancer and cause RFR to render NotFound
-        onRouteChallenges({ lang, ...nextChallenge }),
-        makeToast({ message: 'Your next challenge has arrived.' })
-      );
-    });
-}
-
-export default combineEpics(
-  challengeUpdatedEpic,
-  nextChallengeEpic,
-  resetChallengeEpic
-);
diff --git a/common/app/routes/Challenges/redux/code-storage-epic.js b/common/app/routes/Challenges/redux/code-storage-epic.js
deleted file mode 100644
index 8cbf242263..0000000000
--- a/common/app/routes/Challenges/redux/code-storage-epic.js
+++ /dev/null
@@ -1,196 +0,0 @@
-import { Observable } from 'rx';
-import { combineEpics, ofType } from 'redux-epic';
-import store from 'store';
-
-import {
-  types,
-  storedCodeFound,
-  noStoredCodeFound,
-  previousSolutionFound,
-
-  keySelector,
-  codeLockedSelector
-} from './';
-import { removeCodeUri, getCodeUri } from '../utils/code-uri.js';
-
-import {
-  types as app,
-  challengeSelector,
-  previousSolutionSelector
-} from '../../../redux';
-import { filesSelector } from '../../../files';
-import { makeToast } from '../../../Toasts/redux';
-import { setContent, isPoly } from '../../../../utils/polyvinyl.js';
-
-const legacyPrefixes = [
-  'Bonfire: ',
-  'Waypoint: ',
-  'Zipline: ',
-  'Basejump: ',
-  'Checkpoint: '
-];
-const legacyPostfix = 'Val';
-
-function getCode(id) {
-  if (store.has(id)) {
-    return store.get(id);
-  }
-  return null;
-}
-
-function getLegacyCode(legacy) {
-  const key = legacy + legacyPostfix;
-  let code = null;
-  if (store.has(key)) {
-    code = '' + store.get(key);
-    store.remove(key);
-    return code;
-  }
-  return legacyPrefixes.reduce((code, prefix) => {
-    if (code) {
-      return code;
-    }
-    return store.get(prefix + key);
-  }, null);
-}
-
-function legacyToFile(code, files, key) {
-  if (isPoly(files)) {
-    return { [key]: setContent(code, files[key]) };
-  }
-  return false;
-  }
-
-function clearCodeEpic(actions, { getState }) {
-  return actions::ofType(
-    types.submitChallenge.complete,
-    types.clickOnReset
-  )
-    .do(() => {
-      const { id } = challengeSelector(getState());
-      store.remove(id);
-    })
-    .ignoreElements();
-}
-
-function saveCodeEpic(actions, { getState }) {
-  return actions::ofType(types.executeChallenge)
-    // do not save challenge if code is locked
-    .filter(() => !codeLockedSelector(getState()))
-    .do(() => {
-      const { id } = challengeSelector(getState());
-      const files = filesSelector(getState());
-      store.set(id, files);
-    })
-    .ignoreElements();
-}
-
-function loadCodeEpic(actions, { getState }, { window, location }) {
-  return Observable.merge(
-      actions::ofType(app.appMounted),
-      actions::ofType(types.onRouteChallenges)
-        .distinctUntilChanged(({ payload: { dashedName } }) => dashedName)
-    )
-    // make sure we are not SSR
-    .filter(() => !!window)
-    .flatMap(() => {
-      let finalFiles;
-      const state = getState();
-      const challenge = challengeSelector(state);
-      const key = keySelector(state);
-      const files = filesSelector(state);
-      const {
-        id,
-        name: legacyKey
-      } = challenge;
-      const codeUriFound = getCodeUri(
-        location,
-        window.decodeURIComponent
-      );
-      if (codeUriFound) {
-        finalFiles = legacyToFile(codeUriFound, files, key);
-        removeCodeUri(location, window.history);
-        return Observable.of(
-          makeToast({
-            message: 'I found code in the URI. Loading now.'
-          }),
-          storedCodeFound(challenge, finalFiles)
-        );
-      }
-
-      const codeFound = getCode(id);
-      if (codeFound && isPoly(codeFound)) {
-        finalFiles = codeFound;
-      } else {
-        const legacyCode = getLegacyCode(legacyKey);
-        if (legacyCode) {
-          finalFiles = legacyToFile(legacyCode, files, key);
-        }
-      }
-
-      if (finalFiles) {
-        return Observable.of(
-          makeToast({
-            message: 'I found some saved work. Loading now.'
-          }),
-          storedCodeFound(challenge, finalFiles)
-        );
-      }
-
-      if (previousSolutionSelector(getState())) {
-        const userChallenge = previousSolutionSelector(getState());
-        if (userChallenge.files) {
-          finalFiles = userChallenge.files;
-        } else if (userChallenge.solution) {
-          finalFiles = legacyToFile(userChallenge.solution, files, key);
-        }
-        if (finalFiles) {
-          return Observable.of(
-            makeToast({
-              message: 'I found a previous solved solution. Loading now.'
-            }),
-            previousSolutionFound(challenge, finalFiles)
-          );
-        }
-      }
-
-      return Observable.of(noStoredCodeFound());
-    });
-}
-
-function findPreviousSolutionEpic(actions, { getState }) {
-  return Observable.combineLatest(
-    actions::ofType(types.noStoredCodeFound),
-    actions::ofType(app.fetchUser.complete)
-  )
-    .map(() => previousSolutionSelector(getState()))
-    .filter(Boolean)
-    .flatMap(userChallenge => {
-      const challenge = challengeSelector(getState());
-      let finalFiles;
-      if (userChallenge.files) {
-        finalFiles = userChallenge.files;
-      } else if (userChallenge.solution) {
-        const files = filesSelector(getState());
-        const key = keySelector(getState());
-        finalFiles = legacyToFile(userChallenge.solution, files, key);
-      }
-      if (finalFiles) {
-        return Observable.of(
-          makeToast({
-            message: 'I found a previous solved solution. Loading now.'
-          }),
-          previousSolutionFound(challenge, finalFiles)
-        );
-      }
-      return Observable.empty();
-    });
-}
-
-
-export default combineEpics(
-  saveCodeEpic,
-  loadCodeEpic,
-  clearCodeEpic,
-  findPreviousSolutionEpic
-);
diff --git a/common/app/routes/Challenges/redux/completion-epic.js b/common/app/routes/Challenges/redux/completion-epic.js
deleted file mode 100644
index 8c84d4467d..0000000000
--- a/common/app/routes/Challenges/redux/completion-epic.js
+++ /dev/null
@@ -1,175 +0,0 @@
-import { Observable } from 'rx';
-import { ofType } from 'redux-epic';
-
-import {
-  backendFormValuesSelector,
-  frontendProjectFormValuesSelector,
-  backendProjectFormValuesSelector,
-  challengeMetaSelector,
-  moveToNextChallenge,
-  submitChallengeComplete,
-  testsSelector,
-  types,
-  closeChallengeModal
-} from './';
-
-import {
-  challengeSelector,
-  createErrorObservable,
-  csrfSelector,
-  userSelector
-} from '../../../redux';
-import { filesSelector } from '../../../files';
-import { backEndProject } from '../../../utils/challengeTypes.js';
-import { makeToast } from '../../../Toasts/redux';
-import { postJSON$ } from '../../../../utils/ajax-stream.js';
-
-function postChallenge(url, username, _csrf, challengeInfo) {
-  return Observable.if(
-    () => !!username,
-    Observable.defer(() => {
-      const body = { ...challengeInfo, _csrf };
-      const saveChallenge = postJSON$(url, body)
-        .retry(3)
-        .map(({ points, lastUpdated, completedDate }) =>
-          submitChallengeComplete(
-            username,
-            points,
-            { ...challengeInfo, lastUpdated, completedDate }
-          )
-        )
-        .catch(createErrorObservable);
-      const challengeCompleted = Observable.of(moveToNextChallenge());
-      return Observable.merge(saveChallenge, challengeCompleted)
-        .startWith({ type: types.submitChallenge.start });
-    }),
-    Observable.of(moveToNextChallenge())
-  );
-}
-
-function submitModern(type, state) {
-  const tests = testsSelector(state);
-  if (tests.length > 0 && tests.every(test => test.pass && !test.err)) {
-    if (type === types.checkChallenge) {
-      return Observable.empty();
-    }
-
-    if (type === types.submitChallenge.toString()) {
-      const { id } = challengeSelector(state);
-      const files = filesSelector(state);
-      const { username } = userSelector(state);
-      const csrfToken = csrfSelector(state);
-      return postChallenge(
-        '/modern-challenge-completed',
-        username,
-        csrfToken,
-        { id, files }
-      );
-    }
-  }
-  return Observable.just(
-    makeToast({ message: 'Keep trying.' })
-  );
-}
-
-function submitProject(type, state) {
-  if (type === types.checkChallenge) {
-    return Observable.empty();
-  }
-  const {
-    solution: frontEndSolution = ''
-  } = frontendProjectFormValuesSelector(state);
-  const {
-    solution: backendSolution = '',
-    githubLink = ''
-  } = backendProjectFormValuesSelector(state);
-  const solution = frontEndSolution ? frontEndSolution : backendSolution;
-  const { id, challengeType } = challengeSelector(state);
-  const { username } = userSelector(state);
-  const csrfToken = csrfSelector(state);
-  const challengeInfo = { id, challengeType, solution };
-  if (challengeType === backEndProject) {
-    challengeInfo.githubLink = githubLink;
-  }
-  return Observable.merge(
-    postChallenge(
-      '/project-completed',
-      username,
-      csrfToken,
-      challengeInfo
-    ),
-    Observable.of(
-      closeChallengeModal()
-    )
-  );
-}
-
-function submitSimpleChallenge(type, state) {
-  const { id } = challengeSelector(state);
-  const { username } = userSelector(state);
-  const csrfToken = csrfSelector(state);
-  const challengeInfo = { id };
-  return postChallenge(
-    '/challenge-completed',
-    username,
-    csrfToken,
-    challengeInfo
-  );
-}
-
-function submitBackendChallenge(type, state) {
-  const tests = testsSelector(state);
-  if (
-    type === types.checkChallenge &&
-    tests.length > 0 &&
-    tests.every(test => test.pass && !test.err)
-  ) {
-    /*
-    return Observable.of(
-      makeToast({
-        message: `${randomCompliment()} Go to your next challenge.`,
-        action: 'Submit',
-        actionCreator: 'submitChallenge',
-        timeout: 10000
-      })
-    );
-    */
-    return Observable.empty();
-  }
-  if (type === types.submitChallenge.toString()) {
-    const { id } = challengeSelector(state);
-    const { username } = userSelector(state);
-    const csrfToken = csrfSelector(state);
-    const { solution } = backendFormValuesSelector(state);
-    const challengeInfo = { id, solution };
-    return postChallenge(
-      '/backend-challenge-completed',
-      username,
-      csrfToken,
-      challengeInfo
-    );
-  }
-  return Observable.just(
-    makeToast({ message: 'Keep trying.' })
-  );
-}
-
-const submitters = {
-  tests: submitModern,
-  backend: submitBackendChallenge,
-  step: submitSimpleChallenge,
-  video: submitSimpleChallenge,
-  quiz: submitSimpleChallenge,
-  'project.frontEnd': submitProject,
-  'project.backEnd': submitProject
-};
-
-export default function completionEpic(actions, { getState }) {
-  return actions::ofType(types.checkChallenge, types.submitChallenge.toString())
-    .flatMap(({ type, payload }) => {
-      const state = getState();
-      const { submitType } = challengeMetaSelector(state);
-      const submitter = submitters[submitType] || (() => Observable.empty());
-      return submitter(type, state, payload);
-    });
-}
diff --git a/common/app/routes/Challenges/redux/execute-challenge-epic.js b/common/app/routes/Challenges/redux/execute-challenge-epic.js
deleted file mode 100644
index 3b9278d886..0000000000
--- a/common/app/routes/Challenges/redux/execute-challenge-epic.js
+++ /dev/null
@@ -1,125 +0,0 @@
-import _ from 'lodash';
-import { Observable, Subject } from 'rx';
-import { combineEpics, ofType } from 'redux-epic';
-
-import {
-  types,
-
-  initOutput,
-  updateOutput,
-  updateTests,
-  checkChallenge,
-
-  codeLockedSelector,
-  showPreviewSelector,
-  testsSelector,
-  disableJSOnError
-} from './';
-import {
-  buildFromFiles,
-  buildBackendChallenge
-} from '../utils/build.js';
-import {
-  runTestsInTestFrame,
-  createTestFramer,
-  createMainFramer
-} from '../utils/frame.js';
-import {
-  createErrorObservable,
-
-  challengeSelector,
-  doActionOnError
-} from '../../../redux';
-
-import { backend } from '../../../utils/challengeTypes';
-
-const executeDebounceTimeout = 750;
-export function updateMainEpic(actions, { getState }, { document }) {
-  return Observable.of(document)
-    // if document is not defined then none of this epic will run
-    // this prevents issues during SSR
-    .filter(Boolean)
-    .flatMapLatest(() => {
-      const proxyLogger = new Subject();
-      const frameMain = createMainFramer(document, getState, proxyLogger);
-      const buildAndFrameMain = actions::ofType(
-        types.unlockUntrustedCode,
-        types.modernEditorUpdated,
-        types.classicEditorUpdated,
-        types.executeChallenge,
-        types.challengeUpdated
-      )
-        .debounce(executeDebounceTimeout)
-        // if isCodeLocked do not run challenges
-        .filter(() => (
-          !codeLockedSelector(getState()) &&
-          showPreviewSelector(getState())
-        ))
-        .flatMapLatest(() => buildFromFiles(getState(), true)
-          .map(frameMain)
-          .ignoreElements()
-          .catch(doActionOnError(() => disableJSOnError()))
-        );
-      return Observable.merge(buildAndFrameMain, proxyLogger.map(updateOutput));
-    });
-}
-
-export function executeChallengeEpic(actions, { getState }, { document }) {
-  return Observable.of(document)
-    // if document is not defined then none of this epic will run
-    // this prevents issues during SSR
-    .filter(Boolean)
-    .flatMapLatest(() => {
-      const frameReady = new Subject();
-      const frameTests = createTestFramer(document, getState, frameReady);
-      const challengeResults = frameReady
-        .pluck('checkChallengePayload')
-        .map(checkChallengePayload => ({
-          checkChallengePayload,
-          tests: testsSelector(getState())
-        }))
-        .flatMap(({ checkChallengePayload, tests }) => {
-          const postTests = Observable.of(
-            updateOutput('// tests completed'),
-            checkChallenge(checkChallengePayload)
-          ).delay(250);
-          // run the tests within the test iframe
-          return runTestsInTestFrame(document, tests)
-            .flatMap(tests => {
-              return Observable.from(tests)
-                .map(({ message }) => message)
-                // make sure that the test message is a non empty string
-                .filter(_.overEvery(_.isString, Boolean))
-                .map(updateOutput)
-                .concat(Observable.of(updateTests(tests)));
-            })
-            .concat(postTests);
-        });
-      const buildAndFrameChallenge = actions::ofType(types.executeChallenge)
-        .debounce(executeDebounceTimeout)
-        // if isCodeLocked do not run challenges
-        .filter(() => !codeLockedSelector(getState()))
-        .flatMapLatest(() => {
-          const state = getState();
-          const { challengeType } = challengeSelector(state);
-          if (challengeType === backend) {
-            return buildBackendChallenge(state)
-              .do(frameTests)
-              .ignoreElements()
-              .startWith(initOutput('// running test'))
-              .catch(createErrorObservable);
-          }
-          return buildFromFiles(state, false)
-            .do(frameTests)
-            .ignoreElements()
-            .startWith(initOutput('// running test'))
-            .catch(createErrorObservable);
-        });
-      return Observable.merge(
-        buildAndFrameChallenge,
-        challengeResults
-      );
-    });
-}
-
-export default combineEpics(executeChallengeEpic, updateMainEpic);
diff --git a/common/app/routes/Challenges/redux/index.js b/common/app/routes/Challenges/redux/index.js
deleted file mode 100644
index 08a6ec6e8e..0000000000
--- a/common/app/routes/Challenges/redux/index.js
+++ /dev/null
@@ -1,351 +0,0 @@
-import _ from 'lodash';
-import {
-  combineActions,
-  combineReducers,
-  createAction,
-  createAsyncTypes,
-  createTypes,
-  handleActions
-} from 'berkeleys-redux-utils';
-import { createSelector } from 'reselect';
-import noop from 'lodash/noop';
-import { getValues } from 'redux-form';
-
-import modalEpic from './modal-epic';
-import completionEpic from './completion-epic.js';
-import challengeEpic from './challenge-epic.js';
-import executeChallengeEpic from './execute-challenge-epic.js';
-import codeStorageEpic from './code-storage-epic.js';
-
-import ns from '../ns.json';
-import stepReducer, { epics as stepEpics } from '../views/step/redux';
-import quizReducer from '../views/quiz/redux';
-import projectReducer from '../views/project/redux';
-
-import {
-  createTests,
-  loggerToStr,
-  submitTypes,
-  viewTypes,
-  getFileKey,
-
-  challengeToFilesMetaCreator
-} from '../utils';
-import {
-  types as app,
-  challengeSelector
-} from '../../../redux';
-import { html, modern } from '../../../utils/challengeTypes.js';
-import blockNameify from '../../../utils/blockNameify.js';
-import { updateFileMetaCreator } from '../../../files';
-
-// this is not great but is ok until we move to a different form type
-export projectNormalizer from '../views/project/redux';
-
-export const epics = [
-  modalEpic,
-  challengeEpic,
-  codeStorageEpic,
-  completionEpic,
-  executeChallengeEpic,
-  ...stepEpics
-];
-
-export const types = createTypes([
-  'onRouteChallengeRoot',
-  'onRouteChallenges',
-  'onRouteCurrentChallenge',
-  // challenges
-  // |- classic
-  'classicEditorUpdated',
-  'challengeUpdated',
-  'clickOnReset',
-  'updateHint',
-  'unlockUntrustedCode',
-  'closeChallengeModal',
-  'openChallengeModal',
-  'updateSuccessMessage',
-  // |- modern
-  'modernEditorUpdated',
-
-  // rechallenge
-  'executeChallenge',
-  'updateOutput',
-  'initOutput',
-  'updateTests',
-  'checkChallenge',
-  createAsyncTypes('submitChallenge'),
-  'moveToNextChallenge',
-  'disableJSOnError',
-  'checkForNextBlock',
-
-  // help
-  'openHelpModal',
-  'closeHelpModal',
-  'createQuestion',
-
-  // panes
-  'toggleClassicEditor',
-  'toggleMain',
-  'toggleMap',
-  'togglePreview',
-  'toggleSidePanel',
-  'toggleStep',
-  'toggleModernEditor',
-
-  // code storage
-  'storedCodeFound',
-  'noStoredCodeFound',
-  'previousSolutionFound'
-], ns);
-
-// routes
-export const onRouteChallenges = createAction(types.onRouteChallenges);
-export const onRouteCurrentChallenge =
-  createAction(types.onRouteCurrentChallenge);
-
-// classic
-export const classicEditorUpdated = createAction(
-  types.classicEditorUpdated,
-  null,
-  updateFileMetaCreator
-);
-// modern
-export const modernEditorUpdated = createAction(
-  types.modernEditorUpdated,
-  null,
-  updateFileMetaCreator
-);
-// challenges
-export const closeChallengeModal = createAction(types.closeChallengeModal);
-export const openChallengeModal = createAction(types.openChallengeModal);
-export const updateHint = createAction(types.updateHint);
-export const unlockUntrustedCode = createAction(
-  types.unlockUntrustedCode,
-  _.noop
-);
-export const updateSuccessMessage = createAction(types.updateSuccessMessage);
-export const challengeUpdated = createAction(
-  types.challengeUpdated,
-  challenge => ({ challenge }),
-  challengeToFilesMetaCreator
-);
-export const clickOnReset = createAction(types.clickOnReset);
-
-// rechallenge
-export const executeChallenge = createAction(
-  types.executeChallenge,
-  noop,
-);
-
-export const updateTests = createAction(types.updateTests);
-
-export const initOutput = createAction(types.initOutput, loggerToStr);
-export const updateOutput = createAction(types.updateOutput, loggerToStr);
-
-export const checkChallenge = createAction(types.checkChallenge);
-
-export const submitChallenge = createAction(types.submitChallenge);
-export const submitChallengeComplete = createAction(
-  types.submitChallenge.complete,
-  (username, points, challengeInfo) => ({ username, points, challengeInfo })
-);
-
-export const moveToNextChallenge = createAction(types.moveToNextChallenge);
-export const checkForNextBlock = createAction(types.checkForNextBlock);
-
-export const disableJSOnError = createAction(types.disableJSOnError);
-
-// help
-export const openHelpModal = createAction(types.openHelpModal);
-export const closeHelpModal = createAction(types.closeHelpModal);
-export const createQuestion = createAction(types.createQuestion);
-
-// code storage
-export const storedCodeFound = createAction(
-  types.storedCodeFound,
-  null,
-  challengeToFilesMetaCreator,
-);
-export const noStoredCodeFound = createAction(types.noStoredCodeFound);
-export const previousSolutionFound = createAction(
-  types.previousSolutionFound,
-  null,
-  challengeToFilesMetaCreator
-);
-
-const initialUiState = {
-  output: null,
-  isChallengeModalOpen: false,
-  isBugOpen: false,
-  isHelpOpen: false,
-  successMessage: 'Happy Coding!'
-};
-
-const initialState = {
-  isCodeLocked: false,
-  isJSEnabled: true,
-  id: '',
-  challenge: '',
-  helpChatRoom: 'Help',
-  // old code storage key
-  legacyKey: '',
-  // map
-  superBlocks: [],
-  // misc
-  ...initialUiState
-};
-
-export const getNS = state => state[ns];
-export const keySelector = state => getNS(state).key;
-export const testsSelector = state => getNS(state).tests;
-
-export const outputSelector = state => getNS(state).output;
-export const successMessageSelector = state => getNS(state).successMessage;
-export const hintIndexSelector = state => getNS(state).hintIndex;
-export const codeLockedSelector = state => getNS(state).isCodeLocked;
-export const isCodeLockedSelector = state => getNS(state).isCodeLocked;
-export const isJSEnabledSelector = state => getNS(state).isJSEnabled;
-export const chatRoomSelector = state => getNS(state).helpChatRoom;
-export const challengeModalSelector =
-  state => getNS(state).isChallengeModalOpen;
-
-export const helpModalSelector = state => getNS(state).isHelpOpen;
-export const guideURLSelector = state =>
-  `https://guide.freecodecamp.org/certificates/${getNS(state).challenge}`;
-
-export const challengeRequiredSelector = state =>
-  challengeSelector(state).required || [];
-export const challengeMetaSelector = createSelector(
-  // use closure to get around circular deps
-  (...args) => challengeSelector(...args),
-  challenge => {
-    if (!challenge.id) {
-      const viewType = 'invalid';
-      return {
-        viewType
-      };
-    }
-    const challengeType = challenge && challenge.challengeType;
-    const type = challenge && challenge.type;
-    const viewType = viewTypes[type] || viewTypes[challengeType] || 'classic';
-    const blockName = blockNameify(challenge.block);
-    const title = blockName && challenge.title ?
-      `${blockName}: ${challenge.title}` :
-      challenge.title;
-    return {
-      type,
-      title,
-      viewType,
-      submitType:
-        submitTypes[challengeType] ||
-        submitTypes[challenge && challenge.type] ||
-        'tests',
-      showPreview: (
-        challengeType === html ||
-        challengeType === modern
-      ),
-      mode: challenge && challengeType === html ?
-        'text/html' :
-        'javascript'
-    };
-  }
-);
-
-export const showPreviewSelector = state =>
-  !!challengeMetaSelector(state).showPreview;
-export const challengeTypeSelector = state =>
-  challengeMetaSelector(state).type || '';
-export const challengeTemplateSelector = state =>
-  challengeSelector(state).template || null;
-
-export const backendFormValuesSelector = state =>
-  getValues(state.form.BackEndChallenge);
-export const frontendProjectFormValuesSelector = state =>
-  getValues(state.form.NewFrontEndProject) || {};
-export const backendProjectFormValuesSelector = state =>
-  getValues(state.form.NewBackEndProject) || {};
-
-export default combineReducers(
-  handleActions(
-    () => ({
-      [
-        combineActions(
-          types.challengeUpdated,
-          app.fetchChallenge.complete
-        )
-      ]: (state, { payload: { challenge } }) => {
-        return {
-          ...state,
-          ...initialUiState,
-          id: challenge.id,
-          challenge: challenge.dashedName,
-          key: getFileKey(challenge),
-          tests: createTests(challenge),
-          helpChatRoom: challenge.helpRoom || 'Help'
-        };
-      },
-      [types.updateTests]: (state, { payload: tests }) => ({
-        ...state,
-        tests,
-        isChallengeModalOpen: (
-          tests.length > 0 &&
-          tests.every(test => test.pass && !test.err)
-        )
-      }),
-      [types.openChallengeModal]: state => ({
-        ...state,
-        isChallengeModalOpen: true
-      }),
-      [types.closeChallengeModal]: state => ({
-        ...state,
-        isChallengeModalOpen: false
-      }),
-      [types.updateSuccessMessage]: (state, { payload }) => ({
-        ...state,
-        successMessage: payload
-      }),
-      [types.storedCodeFound]: state => ({
-        ...state,
-        isJSEnabled: false,
-        isCodeLocked: true
-      }),
-      [types.unlockUntrustedCode]: state => ({
-        ...state,
-        isCodeLocked: false
-      }),
-      [types.executeChallenge]: state => ({
-        ...state,
-        isJSEnabled: true,
-        tests: state.tests.map(test => ({ ...test, err: false, pass: false }))
-      }),
-      [
-        combineActions(
-          types.classicEditorUpdated,
-          types.disableJSOnError,
-          types.modernEditorUpdated
-        )
-      ]: state => ({
-        ...state,
-        isJSEnabled: false
-      }),
-
-      // classic/modern
-      [types.initOutput]: (state, { payload: output }) => ({
-        ...state,
-        output
-      }),
-      [types.updateOutput]: (state, { payload: output }) => ({
-        ...state,
-        output: (state.output || '') + output
-      }),
-      [types.openHelpModal]: state => ({ ...state, isHelpOpen: true }),
-      [types.closeHelpModal]: state => ({ ...state, isHelpOpen: false })
-    }),
-    initialState,
-    ns
-  ),
-  stepReducer,
-  quizReducer,
-  projectReducer
-);
diff --git a/common/app/routes/Challenges/redux/modal-epic.js b/common/app/routes/Challenges/redux/modal-epic.js
deleted file mode 100644
index a26f74b009..0000000000
--- a/common/app/routes/Challenges/redux/modal-epic.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import { ofType } from 'redux-epic';
-import {
-  types,
-  closeHelpModal
-} from '../redux';
-
-import { filesSelector } from '../../../files';
-import { currentChallengeSelector } from '../../../redux';
-
-function filesToMarkdown(files = {}) {
-  const moreThenOneFile = Object.keys(files).length > 1;
-  return Object.keys(files).reduce((fileString, key) => {
-    const file = files[key];
-    if (!file) {
-      return fileString;
-    }
-    const fileName = moreThenOneFile ? `\\ file: ${file.contents}` : '';
-    const fileType = file.ext;
-    return fileString +
-      '\`\`\`' +
-      fileType +
-      '\n' +
-      fileName +
-      '\n' +
-      file.contents +
-      '\n' +
-      '\`\`\`\n\n';
-  }, '\n');
-}
-
-export function createQuestionEpic(actions, { getState }, { window }) {
-  return actions::ofType(types.createQuestion).map(() => {
-    const state = getState();
-    const files = filesSelector(state);
-    const challengeName = currentChallengeSelector(state);
-    const {
-      navigator: { userAgent },
-      location: { href }
-    } = window;
-    const textMessage = [
-      '**Tell us what\'s happening:**\n\n\n\n',
-      '**Your code so far**\n',
-      filesToMarkdown(files),
-      '**Your browser information:**\n\n',
-      'User Agent is: <code>',
-      userAgent,
-      '</code>.\n\n',
-      '**Link to the challenge:**\n',
-      href
-    ].join('');
-
-    window.open(
-      'https://forum.freecodecamp.org/new-topic'
-      + '?category=help'
-      + '&title=' + window.encodeURIComponent(challengeName)
-      + '&body=' + window.encodeURIComponent(textMessage),
-      '_blank'
-    );
-
-    return closeHelpModal();
-  });
-}
-
-export default createQuestionEpic;
diff --git a/common/app/routes/Challenges/utils/build.js b/common/app/routes/Challenges/utils/build.js
deleted file mode 100644
index 61a196abf5..0000000000
--- a/common/app/routes/Challenges/utils/build.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import { Observable } from 'rx';
-import identity from 'lodash/identity';
-
-import { fetchScript } from './fetch-and-cache.js';
-import throwers from '../rechallenge/throwers';
-import {
-  backendFormValuesSelector,
-  challengeTemplateSelector,
-  challengeRequiredSelector,
-  isJSEnabledSelector
-} from '../redux';
-import {
-  applyTransformers,
-  proxyLoggerTransformer,
-  testJS$JSX
-} from '../rechallenge/transformers';
-import {
-  cssToHtml,
-  jsToHtml,
-  concactHtml
-} from '../rechallenge/builders.js';
-
-import { filesSelector } from '../../../files';
-
-import {
-  createFileStream,
-  pipe
-} from '../../../../utils/polyvinyl.js';
-
-
-const jQuery = {
-  src: 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js'
-};
-const frameRunner = {
-  src: '/js/frame-runner.js',
-  crossDomain: false,
-  cacheBreaker: true
-};
-const globalRequires = [
-  {
-    link: 'https://cdnjs.cloudflare.com/' +
-      'ajax/libs/normalize/4.2.0/normalize.min.css'
-  },
-  jQuery
-];
-
-function filterJSIfDisabled(state) {
-  const isJSEnabled = isJSEnabledSelector(state);
-  return file => {
-    if (testJS$JSX(file) && !isJSEnabled) {
-      return null;
-    }
-    return file;
-  };
-}
-
-export function buildFromFiles(state, shouldProxyConsole) {
-  const files = filesSelector(state);
-  const required = challengeRequiredSelector(state);
-  const finalRequires = [...globalRequires, ...required ];
-  const requiredFiles = Object.keys(files)
-    .map(key => files[key])
-    .filter(filterJSIfDisabled(state))
-    .filter(Boolean);
-  return createFileStream(requiredFiles)
-    ::pipe(throwers)
-    ::pipe(applyTransformers)
-    ::pipe(shouldProxyConsole ? proxyLoggerTransformer : identity)
-    ::pipe(jsToHtml)
-    ::pipe(cssToHtml)
-    ::concactHtml(finalRequires, challengeTemplateSelector(state));
-}
-
-export function buildBackendChallenge(state) {
-  const { solution: url } = backendFormValuesSelector(state);
-  return Observable.combineLatest(
-    fetchScript(frameRunner),
-    fetchScript(jQuery)
-  )
-    .map(([ frameRunner, jQuery ]) => ({
-      build: jQuery + frameRunner,
-      sources: { url },
-      checkChallengePayload: { solution: url }
-    }));
-}
diff --git a/common/app/routes/Challenges/utils/code-uri.js b/common/app/routes/Challenges/utils/code-uri.js
deleted file mode 100644
index c156d8a317..0000000000
--- a/common/app/routes/Challenges/utils/code-uri.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import _ from 'lodash';
-import { decodeFcc } from '../../../../utils/encode-decode';
-
-const queryRegex = /^(\?|#\?)/;
-export function legacyIsInQuery(query, decode) {
-  let decoded;
-  try {
-    decoded = decode(query);
-  } catch (err) {
-    return false;
-  }
-  if (!decoded || typeof decoded.split !== 'function') {
-    return false;
-  }
-  return decoded
-    .replace(queryRegex, '')
-    .split('&')
-    .reduce(function(found, param) {
-      var key = param.split('=')[0];
-      if (key === 'solution') {
-        return true;
-      }
-      return found;
-    }, false);
-}
-
-export function getKeyInQuery(query, keyToFind = '') {
-  return query
-    .split('&')
-    .reduce((oldValue, param) => {
-      const key = param.split('=')[0];
-      const value = param
-        .split('=')
-        .slice(1)
-        .join('=');
-
-      if (key === keyToFind) {
-        return value;
-      }
-      return oldValue;
-    }, null);
-}
-
-export function getLegacySolutionFromQuery(query = '', decode) {
-  return _.flow(
-    getKeyInQuery,
-    decode,
-    decodeFcc
-  )(query, 'solution');
-}
-
-export function getCodeUri(location, decodeURIComponent) {
-  let query;
-  if (
-    location.search &&
-    legacyIsInQuery(location.search, decodeURIComponent)
-  ) {
-    query = location.search.replace(/^\?/, '');
-  } else {
-    return null;
-  }
-
-  return getLegacySolutionFromQuery(query, decodeURIComponent);
-}
-
-export function removeCodeUri(location, history) {
-  if (
-    typeof location.href.split !== 'function' ||
-    typeof history.replaceState !== 'function'
-  ) {
-    return false;
-  }
-  history.replaceState(
-    history.state,
-    null,
-    location.href.split('?')[0]
-  );
-  return true;
-}
diff --git a/common/app/routes/Challenges/utils/fetch-and-cache.js b/common/app/routes/Challenges/utils/fetch-and-cache.js
deleted file mode 100644
index e1b23c8b15..0000000000
--- a/common/app/routes/Challenges/utils/fetch-and-cache.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import { Observable } from 'rx';
-import { ajax$ } from '../../../../utils/ajax-stream';
-
-// value used to break browser ajax caching
-const cacheBreakerValue = Math.random();
-
-export function _fetchScript(
-  {
-    src,
-    cacheBreaker = false,
-    crossDomain = true
-  } = {},
-) {
-  if (!src) {
-    throw new Error('No source provided for script');
-  }
-  if (this.cache.has(src)) {
-    return this.cache.get(src);
-  }
-  const url = cacheBreaker ?
-    `${src}?cacheBreaker=${cacheBreakerValue}` :
-    src;
-  const script = ajax$({ url, crossDomain })
-    .doOnNext(res => {
-      if (res.status !== 200) {
-        throw new Error('Request errror: ' + res.status);
-      }
-    })
-    .map(({ response }) => response)
-    .map(script => `<script>${script}</script>`)
-    .shareReplay();
-
-  this.cache.set(src, script);
-  return script;
-}
-export const fetchScript = _fetchScript.bind({ cache: new Map() });
-
-export function _fetchLink(
-  {
-    link: href,
-    raw = false,
-    crossDomain = true
-  } = {},
-) {
-  if (!href) {
-    return Observable.throw(new Error('No source provided for link'));
-  }
-  if (this.cache.has(href)) {
-    return this.cache.get(href);
-  }
-  // css files with `url(...` may not work in style tags
-  // so we put them in raw links
-  if (raw) {
-    const link = Observable.just(`<link href=${href} rel='stylesheet' />`)
-      .shareReplay();
-    this.cache.set(href, link);
-    return link;
-  }
-  const link = ajax$({ url: href, crossDomain })
-    .doOnNext(res => {
-      if (res.status !== 200) {
-        throw new Error('Request error: ' + res.status);
-      }
-    })
-    .map(({ response }) => response)
-    .map(script => `<style>${script}</style>`)
-    .catch(() => Observable.just(''))
-    .shareReplay();
-
-  this.cache.set(href, link);
-  return link;
-}
-
-export const fetchLink = _fetchLink.bind({ cache: new Map() });
diff --git a/common/app/routes/Challenges/utils/frame.js b/common/app/routes/Challenges/utils/frame.js
deleted file mode 100644
index 82b2375e4d..0000000000
--- a/common/app/routes/Challenges/utils/frame.js
+++ /dev/null
@@ -1,145 +0,0 @@
-import _ from 'lodash';
-import Rx, { Observable } from 'rx';
-import { ShallowWrapper, ReactWrapper } from 'enzyme';
-import Adapter15 from 'enzyme-adapter-react-15';
-import { isJSEnabledSelector } from '../redux';
-
-// we use two different frames to make them all essentially pure functions
-// main iframe is responsible rendering the preview and is where we proxy the
-// console.log
-const mainId = 'fcc-main-frame';
-// the test frame is responsible for running the assert tests
-const testId = 'fcc-test-frame';
-
-// base tag here will force relative links
-// within iframe to point to '/' instead of
-// append to the current challenge url
-// if an error occurs during initialization
-// the __err prop will be set
-// This is then picked up in client/frame-runner.js during
-// runTestsInTestFrame below
-const createHeader = (id = mainId) => `
-  <base href='/' target='_blank'/>
-  <script>
-    window.__frameId = '${id}';
-    window.onerror = function(msg, url, ln, col, err) {
-      window.__err = err;
-      return true;
-    };
-  </script>
-`;
-
-export const runTestsInTestFrame = (document, tests) => Observable.defer(() => {
-  const { contentDocument: frame } = document.getElementById(testId);
-  return frame.__runTests(tests);
-});
-
-const createFrame = (document, getState, id) => ctx => {
-  const isJSEnabled = isJSEnabledSelector(getState());
-  const frame = document.createElement('iframe');
-  frame.id = id;
-  if (!isJSEnabled) {
-    frame.sandbox = 'allow-same-origin';
-  }
-  return {
-    ...ctx,
-    element: frame
-  };
-};
-
-const hiddenFrameClassname = 'hide-test-frame';
-const mountFrame = document => ({ element, ...rest })=> {
-  const oldFrame = document.getElementById(element.id);
-  if (oldFrame) {
-    element.className = oldFrame.className || hiddenFrameClassname;
-    oldFrame.parentNode.replaceChild(element, oldFrame);
-  } else {
-    element.className = hiddenFrameClassname;
-    document.body.appendChild(element);
-  }
-  return {
-    ...rest,
-    element,
-    document: element.contentDocument,
-    window: element.contentWindow
-  };
-};
-
-const addDepsToDocument = ctx => {
-  ctx.document.Rx = Rx;
-
-  // using require here prevents nodejs issues as loop-protect
-  // is added to the window object by webpack and not available to
-  // us server side.
-  /* eslint-disable import/no-unresolved */
-  ctx.document.loopProtect = require('loop-protect');
-  /* eslint-enable import/no-unresolved */
-  return ctx;
-};
-
-const buildProxyConsole = proxyLogger => ctx => {
-  const oldLog = ctx.window.console.log.bind(ctx.window.console);
-  ctx.window.__console = {};
-  ctx.window.__console.log = function proxyConsole(...args) {
-    proxyLogger.onNext(args);
-    return oldLog(...args);
-  };
-  return ctx;
-};
-
-const writeTestDepsToDocument = frameReady => ctx => {
-  const {
-    document: tests,
-    sources,
-    checkChallengePayload
-  } = ctx;
-  // add enzyme
-  // TODO: do programatically
-  // TODO: webpack lazyload this
-  tests.Enzyme = {
-    shallow: (node, options) => new ShallowWrapper(node, null, {
-      ...options,
-      adapter: new Adapter15()
-    }),
-    mount: (node, options) => new ReactWrapper(node, null, {
-      ...options,
-      adapter: new Adapter15()
-    })
-  };
-  // default for classic challenges
-  // should not be used for modern
-  tests.__source = (sources && 'index' in sources) ? sources['index'] : '';
-  // provide the file name and get the original source
-  tests.__getUserInput = fileName => _.toString(sources[fileName]);
-  tests.__checkChallengePayload = checkChallengePayload;
-  tests.__frameReady = frameReady;
-  return ctx;
-};
-
-function writeToFrame(content, frame) {
-  frame.open();
-  frame.write(content);
-  frame.close();
-  return frame;
-}
-
-const writeContentToFrame = ctx => {
-  writeToFrame(createHeader(ctx.element.id) + ctx.build, ctx.document);
-  return ctx;
-};
-
-export const createMainFramer = (document, getState, proxyLogger) => _.flow(
-  createFrame(document, getState, mainId),
-  mountFrame(document),
-  addDepsToDocument,
-  buildProxyConsole(proxyLogger),
-  writeContentToFrame,
-);
-
-export const createTestFramer = (document, getState, frameReady) => _.flow(
-  createFrame(document, getState, testId),
-  mountFrame(document),
-  addDepsToDocument,
-  writeTestDepsToDocument(frameReady),
-  writeContentToFrame,
-);
diff --git a/common/app/routes/Challenges/utils/index.js b/common/app/routes/Challenges/utils/index.js
deleted file mode 100644
index 77ac2db08f..0000000000
--- a/common/app/routes/Challenges/utils/index.js
+++ /dev/null
@@ -1,348 +0,0 @@
-import _ from 'lodash';
-
-import * as challengeTypes from '../../../utils/challengeTypes.js';
-import { createPoly, updateFileFromSpec } from '../../../../utils/polyvinyl.js';
-import { decodeScriptTags } from '../../../../utils/encode-decode.js';
-import { createFilesMetaCreator } from '../../../files';
-
-// turn challengeType to file ext
-const pathsMap = {
-  [ challengeTypes.html ]: 'html',
-  [ challengeTypes.js ]: 'js',
-  [ challengeTypes.bonfire ]: 'js'
-};
-// determine the component to view for each challenge
-export const viewTypes = {
-  [ challengeTypes.html ]: 'classic',
-  [ challengeTypes.js ]: 'classic',
-  [ challengeTypes.bonfire ]: 'classic',
-  [ challengeTypes.frontEndProject ]: 'project',
-  [ challengeTypes.backEndProject ]: 'project',
-  [ challengeTypes.modern ]: 'modern',
-  [ challengeTypes.step ]: 'step',
-  [ challengeTypes.quiz ]: 'quiz',
-  [ challengeTypes.backend ]: 'backend'
-};
-
-// determine the type of submit function to use for the challenge on completion
-export const submitTypes = {
-  [ challengeTypes.html ]: 'tests',
-  [ challengeTypes.js ]: 'tests',
-  [ challengeTypes.bonfire ]: 'tests',
-  // requires just a single url
-  // like codepen.com/my-project
-  [ challengeTypes.frontEndProject ]: 'project.frontEnd',
-  // requires two urls
-  // a hosted URL where the app is running live
-  // project code url like GitHub
-  [ challengeTypes.backEndProject ]: 'project.backEnd',
-
-  [ challengeTypes.step ]: 'step',
-  [ challengeTypes.quiz ]: 'quiz',
-  [ challengeTypes.backend ]: 'backend',
-  [ challengeTypes.modern ]: 'tests'
-};
-
-// determines if a line in a challenge description
-// has html that should be rendered
-export const descriptionRegex = /\<blockquote|\<ol|\<h4|\<table/;
-
-export function arrayToString(seedData = ['']) {
-  seedData = Array.isArray(seedData) ? seedData : [seedData];
-  return seedData.reduce((seed, line) => '' + seed + line + '\n', '\n');
-}
-
-export function buildSeed({ challengeSeed = [] } = {}) {
-  return _.flow(
-    arrayToString,
-    decodeScriptTags
-  )(challengeSeed);
-}
-
-export function getFileKey({ challengeType }) {
-  return 'index' + (pathsMap[challengeType] || 'html');
-}
-
-export function getPreFile({ challengeType }) {
-  return {
-    name: 'index',
-    ext: pathsMap[challengeType] || 'html',
-    key: getFileKey({ challengeType })
-  };
-}
-
-export function challengeToFiles(challenge, files) {
-  const { challengeType } = challenge;
-  const previousWork = !!files;
-  files = files || challenge.files || {};
-  if (challengeType === challengeTypes.modern) {
-    return _.reduce(challenge.files, (_files, fileSpec) => {
-      const file = _.get(files, fileSpec.key);
-      _files[fileSpec.key] = updateFileFromSpec(fileSpec, file);
-      return _files;
-    }, {});
-  }
-  if (
-    challengeType !== challengeTypes.html &&
-    challengeType !== challengeTypes.js &&
-    challengeType !== challengeTypes.bonfire
-  ) {
-    return {};
-  }
-  // classic challenge to modern format
-  const preFile = getPreFile(challenge);
-  const contents = previousWork ?
-    // get previous contents
-    _.property([ preFile.key, 'contents' ])(files) :
-    // otherwise start fresh
-    buildSeed(challenge);
-  return {
-    [preFile.key]: createPoly({
-      ...files[preFile.key],
-      ...preFile,
-      contents,
-      // make sure head/tail are always fresh from fCC
-      head: arrayToString(challenge.head),
-      tail: arrayToString(challenge.tail)
-    })
-  };
-}
-
-export const challengeToFilesMetaCreator =
-_.flow(challengeToFiles, createFilesMetaCreator);
-
-// ({ dashedName: { Challenge } }) => ({ meta: Files }) || {}
-export function createCurrentChallengeMeta(challenge) {
-  if (_.isEmpty(challenge)) {
-    return {};
-  }
-  return challengeToFilesMetaCreator(_.values(challenge)[0]);
-}
-
-export function createTests({ tests = [] }) {
-  return tests
-    .map(test => {
-      if (typeof test === 'string') {
-        return {
-          text: ('' + test).split('message: ')
-            .pop().replace(/(\'\);(\s*\};)?)/g, ''),
-          testString: test
-        };
-      }
-      return test;
-    });
-}
-
-function logReplacer(value) {
-  if (Array.isArray(value)) {
-    const replaced = value.map(logReplacer);
-    return '[' + replaced.join(', ') + ']';
-  }
-  if (typeof value === 'string' && !(/^\/\//).test(value)) {
-    return '"' + value + '"';
-  }
-  if (typeof value === 'number' && isNaN(value)) {
-    return value.toString();
-  }
-  if (typeof value === 'undefined') {
-    return 'undefined';
-  }
-  if (value === null) {
-    return 'null';
-  }
-  if (typeof value === 'function') {
-    return value.name;
-  }
-  if (typeof value === 'object') {
-    return JSON.stringify(value, null, 2);
-  }
-
-  return value;
-}
-
-export function loggerToStr(args) {
-  args = Array.isArray(args) ? args : [args];
-  return args
-    .map(logReplacer)
-    .reduce((str, arg) => str + arg + '\n', '');
-}
-
-export function getNextChallenge(
-  current,
-  entities,
-  {
-    isDev = false,
-    skip = 0
-  } = {}
-) {
-  const { challenge: challengeMap, block: blockMap } = entities;
-  // find current challenge
-  // find current block
-  // find next challenge in block
-  const currentChallenge = challengeMap[current];
-  if (!currentChallenge) {
-    return null;
-  }
-  const block = blockMap[currentChallenge.block];
-  const index = block.challenges.indexOf(currentChallenge.dashedName);
-  // use next challenge name to find challenge in challenge map
-  const nextChallenge = challengeMap[
-    // grab next challenge name in current block
-    // skip is used to skip isComingSoon challenges
-    block.challenges[ index + 1 + skip ]
-  ];
-  if (
-    !isDev &&
-    nextChallenge &&
-    (nextChallenge.isComingSoon || nextChallenge.isBeta)
-  ) {
-    // if we find a next challenge and it is a coming soon
-    // recur with plus one to skip this challenge
-    return getNextChallenge(current, entities, { isDev, skip: skip + 1 });
-  }
-  return nextChallenge;
-}
-
-export function getFirstChallengeOfNextBlock(
-  current,
-  entities,
-  {
-    isDev = false,
-    skip = 0
-  } = {}
-) {
-  const {
-    challenge: challengeMap,
-    block: blockMap,
-    superBlock: SuperBlockMap
-  } = entities;
-  const currentChallenge = challengeMap[current];
-  if (!currentChallenge) {
-    return null;
-  }
-  const block = blockMap[currentChallenge.block];
-  if (!block) {
-    return null;
-  }
-  const superBlock = SuperBlockMap[block.superBlock];
-  if (!superBlock) {
-    return null;
-  }
-  // find index of current block
-  const index = superBlock.blocks.indexOf(block.dashedName);
-
-  // find next block name
-  // and pull block object from block map
-  const newBlock = blockMap[
-    superBlock.blocks[ index + 1 + skip ]
-  ];
-  if (!newBlock) {
-    return null;
-  }
-  // grab first challenge from next block
-  const nextChallenge = challengeMap[newBlock.challenges[0]];
-  if (isDev || !nextChallenge || !nextChallenge.isComingSoon) {
-    return nextChallenge;
-  }
-  // if first challenge is coming soon, find next challenge here
-  const nextChallenge2 = getNextChallenge(
-    nextChallenge.dashedName,
-    entities,
-    { isDev }
-  );
-  if (nextChallenge2) {
-    return nextChallenge2;
-  }
-  // whole block is coming soon
-  // skip this block
-  return getFirstChallengeOfNextBlock(
-    current,
-    entities,
-    { isDev, skip: skip + 1 }
-  );
-}
-
-export function getFirstChallengeOfNextSuperBlock(
-  current,
-  entities,
-  superBlocks,
-  {
-    isDev = false,
-    skip = 0
-  } = {}
-) {
-  const {
-    challenge: challengeMap,
-    block: blockMap,
-    superBlock: SuperBlockMap
-  } = entities;
-  const currentChallenge = challengeMap[current];
-  if (!currentChallenge) {
-    return null;
-  }
-  const block = blockMap[currentChallenge.block];
-  if (!block) {
-    return null;
-  }
-  const superBlock = SuperBlockMap[block.superBlock];
-  if (!superBlock) {
-    return null;
-  }
-  const index = superBlocks.indexOf(superBlock.dashedName);
-  const newSuperBlock = SuperBlockMap[superBlocks[ index + 1 + skip]];
-  if (!newSuperBlock) {
-    return null;
-  }
-  const newBlock = blockMap[
-    newSuperBlock.blocks[ 0 ]
-  ];
-  if (!newBlock) {
-    return null;
-  }
-  const nextChallenge = challengeMap[newBlock.challenges[0]];
-  if (isDev || !nextChallenge || !nextChallenge.isComingSoon) {
-    return nextChallenge;
-  }
-  // coming soon challenge, grab next
-  // non coming soon challenge in same block instead
-  const nextChallengeInBlock = getNextChallenge(
-    nextChallenge.dashedName,
-    entities,
-    { isDev }
-  );
-  if (nextChallengeInBlock) {
-    return nextChallengeInBlock;
-  }
-  // whole block is coming soon
-  // grab first challenge in next block in newSuperBlock instead
-  const challengeInNextBlock = getFirstChallengeOfNextBlock(
-    nextChallenge.dashedName,
-    entities,
-    { isDev }
-  );
-
-  if (challengeInNextBlock) {
-    return challengeInNextBlock;
-  }
-  // whole super block is coming soon
-  // skip this super block
-  return getFirstChallengeOfNextSuperBlock(
-    current,
-    entities,
-    superBlocks,
-    { isDev, skip: skip + 1 }
-  );
-}
-
-export function getCurrentBlockName(current, entities) {
-  const { challenge: challengeMap } = entities;
-  const challenge = challengeMap[current];
-  return challenge.block;
-}
-
-export function getCurrentSuperBlockName(current, entities) {
-  const { challenge: challengeMap, block: blockMap } = entities;
-  const challenge = challengeMap[current];
-  const block = blockMap[challenge.block];
-  return block.superBlock;
-}
diff --git a/common/app/routes/Challenges/utils/index.test.js b/common/app/routes/Challenges/utils/index.test.js
deleted file mode 100644
index 2aaa8c59c7..0000000000
--- a/common/app/routes/Challenges/utils/index.test.js
+++ /dev/null
@@ -1,848 +0,0 @@
-import test from 'tape';
-import {
-  getNextChallenge,
-  getFirstChallengeOfNextBlock,
-  getFirstChallengeOfNextSuperBlock
-} from './';
-
-test('getNextChallenge', t => {
-  t.plan(7);
-  t.test('should return falsey when current challenge is not found', t => {
-    t.plan(1);
-    const entities = {
-      challenge: {},
-      block: {}
-    };
-    t.notOk(
-      getNextChallenge('non-existent-challenge', entities),
-      'getNextChallenge did not return falsey when challenge is not found'
-    );
-  });
-  t.test('should return falsey when last challenge in block', t => {
-    t.plan(1);
-    const currentChallenge = {
-      dashedName: 'current-challenge',
-      block: 'current-block'
-    };
-    const nextChallenge = {
-      dashedName: 'next-challenge',
-      block: 'current-block'
-    };
-    const shouldBeNext = getNextChallenge(
-      'next-challenge',
-      {
-        challenge: {
-          'current-challenge': currentChallenge,
-          'next-challenge': nextChallenge
-        },
-        block: {
-          'current-block': {
-            challenges: [
-              'current-challenge',
-              'next-challenge'
-            ]
-          }
-        }
-      }
-    );
-    t.false(
-      shouldBeNext,
-      'getNextChallenge should return null or undefined'
-    );
-  });
-
-  t.test('should return next challenge when it exists', t => {
-    t.plan(1);
-    const currentChallenge = {
-      dashedName: 'current-challenge',
-      block: 'current-block'
-    };
-    const nextChallenge = {
-      dashedName: 'next-challenge',
-      block: 'current-block'
-    };
-    const shouldBeNext = getNextChallenge(
-      'current-challenge',
-      {
-        challenge: {
-          'current-challenge': currentChallenge,
-          'next-challenge': nextChallenge
-        },
-        block: {
-          'current-block': {
-            challenges: [
-              'current-challenge',
-              'next-challenge'
-            ]
-          }
-        }
-      }
-    );
-    t.isEqual(shouldBeNext, nextChallenge);
-  });
-  t.test('should skip isComingSoon challenge', t => {
-    t.plan(1);
-    const currentChallenge = {
-      dashedName: 'current-challenge',
-      block: 'current-block'
-    };
-    const comingSoon = {
-      dashedName: 'coming-soon',
-      isComingSoon: true,
-      block: 'current-block'
-    };
-    const nextChallenge = {
-      dashedName: 'next-challenge',
-      block: 'current-block'
-    };
-    const shouldBeNext = getNextChallenge(
-      'current-challenge',
-      {
-        challenge: {
-          'current-challenge': currentChallenge,
-          'next-challenge': nextChallenge,
-          'coming-soon': comingSoon,
-          'coming-soon2': comingSoon
-        },
-        block: {
-          'current-block': {
-            challenges: [
-              'current-challenge',
-              'coming-soon',
-              'coming-soon2',
-              'next-challenge'
-            ]
-          }
-        }
-      }
-    );
-    t.isEqual(shouldBeNext, nextChallenge);
-  });
-  t.test('should not skip isComingSoon challenge in dev', t => {
-    t.plan(1);
-    const currentChallenge = {
-      dashedName: 'current-challenge',
-      block: 'current-block'
-    };
-    const comingSoon = {
-      dashedName: 'coming-soon',
-      isComingSoon: true,
-      block: 'current-block'
-    };
-    const nextChallenge = {
-      dashedName: 'next-challenge',
-      block: 'current-block'
-    };
-    const entities = {
-      challenge: {
-        'current-challenge': currentChallenge,
-        'next-challenge': nextChallenge,
-        'coming-soon': comingSoon
-      },
-      block: {
-        'current-block': {
-          challenges: [
-            'current-challenge',
-            'coming-soon',
-            'next-challenge'
-          ]
-        }
-      }
-    };
-    t.isEqual(
-      getNextChallenge('current-challenge', entities, { isDev: true }),
-      comingSoon
-    );
-  });
-  t.test('should skip isBeta challenge', t => {
-    t.plan(1);
-    const currentChallenge = {
-      dashedName: 'current-challenge',
-      block: 'current-block'
-    };
-    const beta = {
-      dashedName: 'beta-challenge',
-      isBeta: true,
-      block: 'current-block'
-    };
-    const nextChallenge = {
-      dashedName: 'next-challenge',
-      block: 'current-block'
-    };
-    const shouldBeNext = getNextChallenge(
-      'current-challenge',
-      {
-        challenge: {
-          'current-challenge': currentChallenge,
-          'next-challenge': nextChallenge,
-          'beta-challenge': beta,
-          'beta-challenge2': beta
-        },
-        block: {
-          'current-block': {
-            challenges: [
-              'current-challenge',
-              'beta-challenge',
-              'beta-challenge2',
-              'next-challenge'
-            ]
-          }
-        }
-      }
-    );
-    t.isEqual(shouldBeNext, nextChallenge);
-  });
-  t.test('should not skip isBeta challenge if in dev', t => {
-    t.plan(1);
-    const currentChallenge = {
-      dashedName: 'current-challenge',
-      block: 'current-block'
-    };
-    const beta = {
-      dashedName: 'beta-challenge',
-      isBeta: true,
-      block: 'current-block'
-    };
-    const nextChallenge = {
-      dashedName: 'next-challenge',
-      block: 'current-block'
-    };
-    const entities = {
-      challenge: {
-        'current-challenge': currentChallenge,
-        'next-challenge': nextChallenge,
-        'beta-challenge': beta
-      },
-      block: {
-        'current-block': {
-          challenges: [
-            'current-challenge',
-            'beta-challenge',
-            'next-challenge'
-          ]
-        }
-      }
-    };
-    t.isEqual(
-      getNextChallenge('current-challenge', entities, { isDev: true }),
-      beta
-    );
-  });
-});
-
-test('getFirstChallengeOfNextBlock', t => {
-  t.plan(8);
-  t.test('should return falsey when current challenge is not found', t => {
-    t.plan(1);
-    const entities = {
-      challenge: {},
-      block: {}
-    };
-    t.notOk(
-      getFirstChallengeOfNextBlock('non-existent-challenge', entities),
-      `
-        gitFirstChallengeOfNextBlock returned true value for non-existent
-        challenge
-      `
-    );
-  });
-  t.test('should return falsey when current block is not found', t => {
-    t.plan(1);
-    const entities = {
-      challenge: {
-        'current-challenge': {
-          block: 'non-existent-block'
-        }
-      },
-      block: {}
-    };
-    t.notOk(
-      getFirstChallengeOfNextBlock('current-challenge', entities),
-      `
-        getFirstChallengeOfNextBlock did not returned true value block
-        did non exist
-      `
-    );
-  });
-  t.test('should return falsey if no current superBlock found', t => {
-    t.plan(1);
-    const entities = {
-      challenge: { 'current-challenge': { block: 'current-block' } },
-      block: {
-        'current-block': {
-          dashedName: 'current-block',
-          superBlock: 'current-super-block'
-        }
-      },
-      superBlock: {}
-    };
-    t.notOk(
-      getFirstChallengeOfNextBlock('current-challenge', entities),
-      `
-        getFirstChallengeOfNextBlock returned a true value
-        when superBlock is undefined
-      `
-    );
-  });
-  t.test('should return falsey when no next block found', t => {
-    t.plan(1);
-    const entities = {
-      challenge: { 'current-challenge': { block: 'current-block' } },
-      block: {
-        'current-block': {
-          dashedName: 'current-block',
-          superBlock: 'current-super-block'
-        }
-      },
-      superBlock: {
-        'current-super-block': {
-          blocks: [
-            'current-block',
-            'non-exitent-block'
-          ]
-        }
-      }
-    };
-    t.notOk(
-      getFirstChallengeOfNextBlock('current-challenge', entities),
-      `
-        getFirstChallengeOfNextBlock returned a value when next block
-        does not exist
-      `
-    );
-  });
-  t.test('should return first challenge of next block', t => {
-    t.plan(1);
-    const currentChallenge = {
-      dashedName: 'current-challenge',
-      block: 'current-block'
-    };
-    const firstChallenge = {
-      dashedName: 'first-challenge',
-      block: 'next-block'
-    };
-    const entities = {
-      challenge: {
-        [currentChallenge.dashedName]: currentChallenge,
-        [firstChallenge.dashedName]: firstChallenge
-      },
-      block: {
-        'current-block': {
-          dashedName: 'current-block',
-          superBlock: 'current-super-block'
-        },
-        'next-block': {
-          dashedName: 'next-block',
-          superBlock: 'current-super-block',
-          challenges: [ 'first-challenge' ]
-        }
-      },
-      superBlock: {
-        'current-super-block': {
-          dashedName: 'current-super-block',
-          blocks: [ 'current-block', 'next-block' ]
-        }
-      }
-    };
-    t.equal(
-      getFirstChallengeOfNextBlock(currentChallenge.dashedName, entities),
-      firstChallenge,
-      'getFirstChallengeOfNextBlock did not return the correct challenge'
-    );
-  });
-  t.test('should skip coming soon challenge of next block', t => {
-    t.plan(2);
-    const currentChallenge = {
-      dashedName: 'current-challenge',
-      block: 'current-block'
-    };
-    const firstChallenge = {
-      dashedName: 'first-challenge',
-      block: 'next-block'
-    };
-    const comingSoon = {
-      dashedName: 'coming-soon',
-      block: 'next-block',
-      isComingSoon: true
-    };
-    const comingSoon2 = {
-      dashedName: 'coming-soon2',
-      block: 'next-block',
-      isComingSoon: true
-    };
-    const entities = {
-      challenge: {
-        [currentChallenge.dashedName]: currentChallenge,
-        [firstChallenge.dashedName]: firstChallenge,
-        'coming-soon': comingSoon,
-        'coming-soon2': comingSoon2
-      },
-      block: {
-        'current-block': {
-          dashedName: 'current-block',
-          superBlock: 'current-super-block'
-        },
-        'next-block': {
-          dashedName: 'next-block',
-          superBlock: 'current-super-block',
-          challenges: [
-            'coming-soon',
-            'coming-soon2',
-            'first-challenge'
-          ]
-        }
-      },
-      superBlock: {
-        'current-super-block': {
-          dashedName: 'current-super-block',
-          blocks: [ 'current-block', 'next-block' ]
-        }
-      }
-    };
-    t.notEqual(
-      getFirstChallengeOfNextBlock(currentChallenge.dashedName, entities),
-      comingSoon,
-      'getFirstChallengeOfNextBlock returned isComingSoon challenge'
-    );
-    t.equal(
-      getFirstChallengeOfNextBlock(currentChallenge.dashedName, entities),
-      firstChallenge,
-      'getFirstChallengeOfNextBlock did not return the correct challenge'
-    );
-  });
-  t.test('should not skip coming soon in dev mode', t => {
-    t.plan(1);
-    const currentChallenge = {
-      dashedName: 'current-challenge',
-      block: 'current-block'
-    };
-    const firstChallenge = {
-      dashedName: 'first-challenge',
-      block: 'next-block'
-    };
-    const comingSoon = {
-      dashedName: 'coming-soon',
-      block: 'next-block',
-      isComingSoon: true
-    };
-    const entities = {
-      challenge: {
-        [currentChallenge.dashedName]: currentChallenge,
-        [firstChallenge.dashedName]: firstChallenge,
-        'coming-soon': comingSoon
-      },
-      block: {
-        'current-block': {
-          dashedName: 'current-block',
-          superBlock: 'current-super-block'
-        },
-        'next-block': {
-          dashedName: 'next-block',
-          superBlock: 'current-super-block',
-          challenges: [
-            'coming-soon',
-            'first-challenge'
-          ]
-        }
-      },
-      superBlock: {
-        'current-super-block': {
-          dashedName: 'current-super-block',
-          blocks: [ 'current-block', 'next-block' ]
-        }
-      }
-    };
-    t.equal(
-      getFirstChallengeOfNextBlock(
-        currentChallenge.dashedName,
-        entities,
-        { isDev: true }
-      ),
-      comingSoon,
-      'getFirstChallengeOfNextBlock returned isComingSoon challenge'
-    );
-  });
-  t.test('should skip block if all challenges are coming soon', t => {
-    t.plan(2);
-    const currentChallenge = {
-      dashedName: 'current-challenge',
-      block: 'current-block'
-    };
-    const firstChallenge = {
-      dashedName: 'first-challenge',
-      block: 'next-block'
-    };
-    const comingSoon = {
-      dashedName: 'coming-soon',
-      block: 'coming-soon-block',
-      isComingSoon: true
-    };
-    const comingSoon2 = {
-      dashedName: 'coming-soon2',
-      block: 'coming-soon-block',
-      isComingSoon: true
-    };
-    const entities = {
-      challenge: {
-        [currentChallenge.dashedName]: currentChallenge,
-        [firstChallenge.dashedName]: firstChallenge,
-        [comingSoon.dashedName]: comingSoon,
-        [comingSoon2.dashedName]: comingSoon2
-      },
-      block: {
-        'current-block': {
-          dashedName: 'current-block',
-          superBlock: 'current-super-block'
-        },
-        'coming-soon-block': {
-          dashedName: 'coming-soon-block',
-          superBlock: 'current-super-block',
-          challenges: [
-            'coming-soon',
-            'coming-soon2'
-          ]
-        },
-        'next-block': {
-          dashedName: 'next-block',
-          superBlock: 'current-super-block',
-          challenges: [
-            'first-challenge'
-          ]
-        }
-      },
-      superBlock: {
-        'current-super-block': {
-          dashedName: 'current-super-block',
-          blocks: [
-            'current-block',
-            'coming-soon-block',
-            'next-block'
-          ]
-        }
-      }
-    };
-    t.notEqual(
-      getFirstChallengeOfNextBlock(currentChallenge.dashedName, entities),
-      comingSoon,
-      'getFirstChallengeOfNextBlock returned isComingSoon challenge'
-    );
-    t.equal(
-      getFirstChallengeOfNextBlock(currentChallenge.dashedName, entities),
-      firstChallenge,
-      'getFirstChallengeOfNextBlock did not return the correct challenge'
-    );
-  });
-});
-
-test('getFirstChallengeOfNextBlock', t => {
-  t.plan(10);
-  t.test('should return falsey if current challenge not found', t => {
-    t.plan(1);
-    const entities = {
-      challenge: {}
-    };
-    t.notOk(
-      getFirstChallengeOfNextSuperBlock('current-challenge', entities),
-    );
-  });
-  t.test('should return falsey if current block not found', t => {
-    t.plan(1);
-    const entities = {
-      challenge: { 'current-challenge': { block: 'current-block' } },
-      block: {}
-    };
-    t.notOk(
-      getFirstChallengeOfNextSuperBlock('current-challenge', entities)
-    );
-  });
-  t.test('should return falsey if current superBlock is not found', t => {
-    t.plan(1);
-    const entities = {
-      challenge: { 'current-challenge': { block: 'current-block' } },
-      block: { 'current-block': { superBlock: 'current-super-block' } },
-      superBlock: {}
-    };
-    t.notOk(
-      getFirstChallengeOfNextSuperBlock('current-challenge', entities)
-    );
-  });
-  t.test('should return falsey when last superBlock', t => {
-    t.plan(1);
-    const entities = {
-      challenge: { 'current-challenge': { block: 'current-block' } },
-      block: { 'current-block': { superBlock: 'current-super-block' } },
-      superBlock: {
-        'current-super-block': { dashedName: 'current-super-block' }
-      }
-    };
-    const superBlocks = [ 'current-super-block' ];
-    t.notOk(getFirstChallengeOfNextSuperBlock(
-      'current-challenge',
-      entities,
-      superBlocks
-    ));
-  });
-  t.test('should return falsey when last block of new superblock', t => {
-    t.plan(1);
-    const entities = {
-      challenge: { 'current-challenge': { block: 'current-block' } },
-      block: {
-        'current-block': {
-          superBlock: 'current-super-block'
-        }
-      },
-      superBlock: {
-        'current-super-block': { dashedName: 'current-super-block' },
-        'next-super-block': {
-          dashedName: 'next-super-block',
-          blocks: [
-            'first-block'
-          ]
-        }
-      }
-    };
-    const superBlocks = [ 'current-super-block', 'next-super-block' ];
-    t.notOk(getFirstChallengeOfNextSuperBlock(
-      'current-challenge',
-      entities,
-      superBlocks
-    ));
-  });
-  t.test('should return first challenge of next superBlock', t => {
-    t.plan(1);
-    const firstChallenge = {
-      dashedName: 'first-challenge',
-      block: 'next-block'
-    };
-    const entities = {
-      challenge: {
-        'current-challenge': { block: 'current-block' },
-        [firstChallenge.dashedName]: firstChallenge
-      },
-      block: {
-        'current-block': { superBlock: 'current-super-block' },
-        'next-block': {
-          superBlock: 'next-super-block',
-          challenges: [ 'first-challenge' ]
-        }
-      },
-      superBlock: {
-        'current-super-block': { dashedName: 'current-super-block' },
-        'next-super-block': {
-          dashedName: 'next-super-block',
-          blocks: [ 'next-block' ]
-        }
-      }
-    };
-    const superBlocks = [ 'current-super-block', 'next-super-block' ];
-    t.isEqual(
-      getFirstChallengeOfNextSuperBlock(
-        'current-challenge',
-        entities,
-        superBlocks
-      ),
-      firstChallenge
-    );
-  });
-  t.test('should skip coming soon challenge', t => {
-    t.plan(1);
-    const firstChallenge = {
-      dashedName: 'first-challenge',
-      block: 'next-block'
-    };
-    const entities = {
-      challenge: {
-        'current-challenge': { block: 'current-block' },
-        [firstChallenge.dashedName]: firstChallenge,
-        'coming-soon': {
-          dashedName: 'coming-soon',
-          block: 'next-block',
-          isComingSoon: true
-        }
-      },
-      block: {
-        'current-block': { superBlock: 'current-super-block' },
-        'next-block': {
-          dashedName: 'next-block',
-          superBlock: 'next-super-block',
-          challenges: [ 'coming-soon', 'first-challenge' ]
-        }
-      },
-      superBlock: {
-        'current-super-block': { dashedName: 'current-super-block' },
-        'next-super-block': {
-          dashedName: 'next-super-block',
-          blocks: [ 'next-block' ]
-        }
-      }
-    };
-    const superBlocks = [
-      'current-super-block',
-      'next-super-block'
-    ];
-    t.isEqual(
-      getFirstChallengeOfNextSuperBlock(
-        'current-challenge',
-        entities,
-        superBlocks
-      ),
-      firstChallenge
-    );
-  });
-  t.test('should not skip coming soon in dev mode', t => {
-    t.plan(1);
-    const firstChallenge = {
-      dashedName: 'first-challenge',
-      block: 'next-block'
-    };
-    const comingSoon = {
-      dashedName: 'coming-soon',
-      block: 'next-block',
-      isComingSoon: true
-    };
-    const entities = {
-      challenge: {
-        'current-challenge': { block: 'current-block' },
-        [firstChallenge.dashedName]: firstChallenge,
-        'coming-soon': comingSoon
-      },
-      block: {
-        'current-block': { superBlock: 'current-super-block' },
-        'next-block': {
-          dashedName: 'next-block',
-          superBlock: 'next-super-block',
-          challenges: [ 'coming-soon', 'first-challenge' ]
-        }
-      },
-      superBlock: {
-        'current-super-block': { dashedName: 'current-super-block' },
-        'next-super-block': {
-          dashedName: 'next-super-block',
-          blocks: [ 'next-block' ]
-        }
-      }
-    };
-    const superBlocks = [
-      'current-super-block',
-      'next-super-block'
-    ];
-    t.isEqual(
-      getFirstChallengeOfNextSuperBlock(
-        'current-challenge',
-        entities,
-        superBlocks,
-        { isDev: true }
-      ),
-      comingSoon
-    );
-  });
-  t.test('should skip coming soon block', t => {
-    t.plan(1);
-    const firstChallenge = {
-      dashedName: 'first-challenge',
-      block: 'next-block'
-    };
-    const entities = {
-      challenge: {
-        'current-challenge': { block: 'current-block' },
-        [firstChallenge.dashedName]: firstChallenge,
-        'coming-soon': {
-          dashedName: 'coming-soon',
-          block: 'coming-soon-block',
-          isComingSoon: true
-        }
-      },
-      block: {
-        'current-block': { superBlock: 'current-super-block' },
-        'coming-soon-block': {
-          dashedName: 'coming-soon-block',
-          superBlock: 'next-super-block',
-          challenges: [
-            'coming-soon'
-          ]
-        },
-        'next-block': {
-          dashedName: 'next-block',
-          superBlock: 'next-super-block',
-          challenges: [ 'first-challenge' ]
-        }
-      },
-      superBlock: {
-        'current-super-block': { dashedName: 'current-super-block' },
-        'next-super-block': {
-          dashedName: 'next-super-block',
-          blocks: [ 'coming-soon-block', 'next-block' ]
-        }
-      }
-    };
-    const superBlocks = [
-      'current-super-block',
-      'next-super-block'
-    ];
-    t.isEqual(
-      getFirstChallengeOfNextSuperBlock(
-        'current-challenge',
-        entities,
-        superBlocks
-      ),
-      firstChallenge
-    );
-  });
-  t.test('should skip coming soon super block', t => {
-    t.plan(1);
-    const firstChallenge = {
-      dashedName: 'first-challenge',
-      block: 'next-block'
-    };
-    const entities = {
-      challenge: {
-        'current-challenge': { block: 'current-block' },
-        [firstChallenge.dashedName]: firstChallenge,
-        'coming-soon': {
-          dashedName: 'coming-soon',
-          block: 'coming-soon-block',
-          isComingSoon: true
-        }
-      },
-      block: {
-        'current-block': { superBlock: 'current-super-block' },
-        'coming-soon-block': {
-          dashedName: 'coming-soon-block',
-          superBlock: 'coming-soon-super-block',
-          challenges: [
-            'coming-soon'
-          ]
-        },
-        'next-block': {
-          superBlock: 'next-super-block',
-          dashedName: 'next-block',
-          challenges: [ 'first-challenge' ]
-        }
-      },
-      superBlock: {
-        'current-super-block': { dashedName: 'current-super-block' },
-        'coming-soon-super-block': {
-          dashedName: 'coming-soon-super-block',
-          blocks: [ 'coming-soon-block' ]
-        },
-        'next-super-block': {
-          dashedName: 'next-super-block',
-          blocks: [ 'next-block' ]
-        }
-      }
-    };
-    const superBlocks = [
-      'current-super-block',
-      'coming-soon-super-block',
-      'next-super-block'
-    ];
-    t.isEqual(
-      getFirstChallengeOfNextSuperBlock(
-        'current-challenge',
-        entities,
-        superBlocks
-      ),
-      firstChallenge
-    );
-  });
-});
diff --git a/common/app/routes/Challenges/views/Modern/Editor.jsx b/common/app/routes/Challenges/views/Modern/Editor.jsx
deleted file mode 100644
index 59cf7795dd..0000000000
--- a/common/app/routes/Challenges/views/Modern/Editor.jsx
+++ /dev/null
@@ -1,155 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-
-import Codemirror from 'react-codemirror';
-import NoSSR from 'react-no-ssr';
-import MouseTrap from 'mousetrap';
-
-import ns from './ns.json';
-import CodeMirrorSkeleton from '../../Code-Mirror-Skeleton.jsx';
-import {
-  executeChallenge,
-  modernEditorUpdated,
-  challengeMetaSelector
-} from '../../redux';
-
-import { themeSelector } from '../../../../redux';
-
-import { createFileSelector } from '../../../../files';
-
-const envProps = typeof window !== 'undefined' ? Object.keys(window) : [];
-const options = {
-  lint: {
-    esversion: 6,
-    predef: envProps
-  },
-  lineNumbers: true,
-  mode: 'javascript',
-  runnable: true,
-  matchBrackets: true,
-  autoCloseBrackets: true,
-  scrollbarStyle: 'null',
-  lineWrapping: true,
-  gutters: [ 'CodeMirror-lint-markers' ]
-};
-
-const mapStateToProps = createSelector(
-  createFileSelector((_, { fileKey }) => fileKey || ''),
-  challengeMetaSelector,
-  themeSelector,
-  (
-    file,
-    { mode },
-    theme
-  ) => ({
-    content: file.contents || '// Happy Coding!',
-    file: file,
-    mode: file.ext || mode || 'javascript',
-    theme
-  })
-);
-
-const mapDispatchToProps = {
-  executeChallenge,
-  modernEditorUpdated
-};
-
-const propTypes = {
-  content: PropTypes.string,
-  executeChallenge: PropTypes.func.isRequired,
-  fileKey: PropTypes.string,
-  mode: PropTypes.string,
-  modernEditorUpdated: PropTypes.func.isRequired,
-  theme: PropTypes.string
-};
-
-export class Editor extends PureComponent {
-  createOptions = createSelector(
-    state => state.executeChallenge,
-    state => state.mode,
-    state => state.cmTheme,
-    (executeChallenge, mode, cmTheme) => ({
-      ...options,
-      theme: cmTheme,
-      mode,
-      // JSHint only works with javascript
-      // we will need to switch to eslint to make this work with jsx
-      lint: mode === 'javascript' ? options.lint : false,
-      extraKeys: {
-        Esc() {
-          document.activeElement.blur();
-        },
-        Tab(cm) {
-          if (cm.somethingSelected()) {
-            return cm.indentSelection('add');
-          }
-          const spaces = Array(cm.getOption('indentUnit') + 1).join(' ');
-          return cm.replaceSelection(spaces);
-        },
-        'Shift-Tab': function(cm) {
-          return cm.indentSelection('subtract');
-        },
-        'Ctrl-Enter': function() {
-          executeChallenge();
-          return false;
-        },
-        'Cmd-Enter': function() {
-          executeChallenge();
-          return false;
-        },
-        'Ctrl-/': function(cm) {
-          cm.toggleComment();
-        },
-        'Cmd-/': function(cm) {
-          cm.toggleComment();
-        }
-      }
-    })
-  );
-
-  componentDidMount() {
-    MouseTrap.bind('e', () => {
-      this.refs.editor.focus();
-    }, 'keyup');
-  }
-
-  componentWillUnmount() {
-    MouseTrap.unbind('e', 'keyup');
-  }
-
-  render() {
-    const {
-      content,
-      modernEditorUpdated,
-      executeChallenge,
-      fileKey,
-      mode
-    } = this.props;
-    const cmTheme = this.props.theme === 'default' ? 'default' : 'dracula';
-    return (
-      <div
-        className={ `${ns}-editor` }
-        role='main'
-        >
-        <NoSSR onSSR={ <CodeMirrorSkeleton content={ content } /> }>
-          <Codemirror
-            onChange={ content => modernEditorUpdated(fileKey, content) }
-            options={ this.createOptions({ executeChallenge, mode, cmTheme }) }
-            ref='editor'
-            value={ content }
-          />
-        </NoSSR>
-      </div>
-    );
-  }
-}
-
-Editor.displayName = 'Editor';
-Editor.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Editor);
diff --git a/common/app/routes/Challenges/views/Modern/Show.jsx b/common/app/routes/Challenges/views/Modern/Show.jsx
deleted file mode 100644
index b0f6d99b99..0000000000
--- a/common/app/routes/Challenges/views/Modern/Show.jsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import _ from 'lodash';
-import React from 'react';
-import { connect } from 'react-redux';
-import PropTypes from 'prop-types';
-import { createSelector } from 'reselect';
-import { addNS } from 'berkeleys-redux-utils';
-
-import ns from './ns.json';
-import Editor from './Editor.jsx';
-import ChildContainer from '../../Child-Container.jsx';
-import { showPreviewSelector, types } from '../../redux';
-import SidePanel from '../../Side-Panel.jsx';
-import Preview from '../../Preview.jsx';
-import _Map from '../../../../Map';
-import Panes from '../../../../Panes';
-import { filesSelector } from '../../../../files';
-
-const createModernEditorToggleType = fileKey =>
-  types.toggleModernEditor + `(${fileKey})`;
-
-const getFirstFileKey = _.flow(_.values, _.first, _.property('key'));
-
-const propTypes = {
-  nameToFileKey: PropTypes.object
-};
-
-const mapStateToProps = createSelector(
-  filesSelector,
-  files => {
-    if (Object.keys(files).length === 1) {
-      return { nameToFileKey: { Editor: getFirstFileKey(files) }};
-    }
-    return {
-      nameToFileKey: _.reduce(files, (map, file) => {
-        map[file.name] = file.key;
-        return map;
-      }, {})
-    };
-  }
-);
-
-const mapDispatchToProps = null;
-
-export const mapStateToPanes = addNS(
-  ns,
-  createSelector(
-    filesSelector,
-    showPreviewSelector,
-    (files, showPreview) => {
-      // create panes map here
-      // must include map
-      // side panel
-      // editors are created based on state
-      // so pane component can have multiple panes based on state
-
-      const panesMap = {
-        [types.toggleMap]: 'Map',
-        [types.toggleSidePanel]: 'Lesson'
-      };
-
-      // If there is more than one file show file name
-      if (Object.keys(files).length > 1) {
-        _.forEach(files, (file) => {
-          panesMap[createModernEditorToggleType(file.fileKey)] = file.name;
-        });
-      } else {
-        const key = getFirstFileKey(files);
-        panesMap[createModernEditorToggleType(key)] = 'Editor';
-      }
-
-      if (showPreview) {
-        panesMap[types.togglePreview] = 'Preview';
-      }
-
-      return panesMap;
-    }
-  )
-);
-
-const nameToComponent = {
-  Map: _Map,
-  Lesson: SidePanel,
-  Preview: Preview
-};
-
-export function ShowModern({ nameToFileKey }) {
-  return (
-    <ChildContainer isFullWidth={ true }>
-      <Panes
-        render={ name => {
-          const Comp = nameToComponent[name];
-          if (Comp) {
-            return <Comp />;
-          }
-          if (nameToFileKey[name]) {
-            return <Editor fileKey={ nameToFileKey[name] } />;
-          }
-          return <span>Could not find Component for { name }</span>;
-        }}
-      />
-    </ChildContainer>
-  );
-}
-
-ShowModern.displayName = 'ShowModern';
-ShowModern.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(ShowModern);
diff --git a/common/app/routes/Challenges/views/Modern/index.js b/common/app/routes/Challenges/views/Modern/index.js
deleted file mode 100644
index 53c86f5f0b..0000000000
--- a/common/app/routes/Challenges/views/Modern/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default, mapStateToPanes } from './Show.jsx';
diff --git a/common/app/routes/Challenges/views/Modern/ns.json b/common/app/routes/Challenges/views/Modern/ns.json
deleted file mode 100644
index 1abaf5ef09..0000000000
--- a/common/app/routes/Challenges/views/Modern/ns.json
+++ /dev/null
@@ -1 +0,0 @@
-"modern"
diff --git a/common/app/routes/Challenges/views/backend/Back-End.jsx b/common/app/routes/Challenges/views/backend/Back-End.jsx
deleted file mode 100644
index 5e4dc78499..0000000000
--- a/common/app/routes/Challenges/views/backend/Back-End.jsx
+++ /dev/null
@@ -1,184 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { createSelector } from 'reselect';
-import { reduxForm } from 'redux-form';
-import {
-  Button,
-  Col,
-  Row
-} from 'react-bootstrap';
-
-import ChallengeTitle from '../../Challenge-Title.jsx';
-import ChallengeDescription from '../../Challenge-Description.jsx';
-import SolutionInput from '../../Solution-Input.jsx';
-import TestSuite from '../../Test-Suite.jsx';
-import Output from '../../Output.jsx';
-import {
-  executeChallenge,
-  testsSelector,
-  outputSelector
-} from '../../redux';
-import { descriptionRegex } from '../../utils';
-
-import {
-  createFormValidator,
-  isValidURL,
-  makeRequired
-} from '../../../../utils/form.js';
-import { challengeSelector } from '../../../../redux';
-
-// provided by redux form
-const reduxFormPropTypes = {
-  fields: PropTypes.object,
-  handleSubmit: PropTypes.func.isRequired,
-  resetForm: PropTypes.func.isRequired,
-  submitting: PropTypes.bool
-};
-
-const propTypes = {
-  description: PropTypes.arrayOf(PropTypes.string),
-  executeChallenge: PropTypes.func.isRequired,
-  id: PropTypes.string,
-  output: PropTypes.string,
-  tests: PropTypes.array,
-  title: PropTypes.string,
-  ...reduxFormPropTypes
-};
-
-const fields = [ 'solution' ];
-
-const fieldValidators = {
-  solution: makeRequired(isValidURL)
-};
-
-const mapStateToProps = createSelector(
-  challengeSelector,
-  outputSelector,
-  testsSelector,
-  (
-    {
-      id,
-      title,
-      description
-    },
-    output,
-    tests
-  ) => ({
-    id,
-    title,
-    tests,
-    description,
-    output
-  })
-);
-
-const mapDispatchToActions = {
-  executeChallenge
-};
-
-export class BackEnd extends PureComponent {
-  renderDescription(description) {
-    if (!Array.isArray(description)) {
-      return null;
-    }
-    return description.map((line, index) => {
-      if (descriptionRegex.test(line)) {
-        return (
-          <div
-            dangerouslySetInnerHTML={{ __html: line }}
-            key={ line.slice(-6) + index }
-          />
-        );
-      }
-      return (
-        <p
-          className='wrappable'
-          dangerouslySetInnerHTML= {{ __html: line }}
-          key={ line.slice(-6) + index }
-        />
-      );
-    });
-  }
-
-  render() {
-    const {
-      description,
-      executeChallenge,
-      output,
-      tests,
-      title,
-      // provided by redux-form
-      fields: { solution },
-      handleSubmit,
-      submitting
-    } = this.props;
-
-    const buttonCopy = submitting ?
-      'Submit and go to my next challenge' :
-      "I've completed this challenge";
-    return (
-      <Row>
-        <Col
-          xs={ 6 }
-          xsOffset={ 3 }
-          >
-          <Row>
-            <ChallengeTitle>
-              { title }
-            </ChallengeTitle>
-            <ChallengeDescription>
-              { this.renderDescription(description) }
-            </ChallengeDescription>
-          </Row>
-          <Row>
-            <form
-              name='BackEndChallenge'
-              onSubmit={ handleSubmit(executeChallenge) }
-              >
-              <SolutionInput
-                placeholder='https://your-app.com'
-                solution={ solution }
-              />
-              <Button
-                block={ true }
-                bsStyle='primary'
-                className='btn-big'
-                onClick={ submitting ? null : null }
-                type={ submitting ? null : 'submit' }
-                >
-                { buttonCopy } (ctrl + enter)
-              </Button>
-            </form>
-          </Row>
-          <Row>
-            <br/>
-            <Output
-              defaultOutput={
-`/**
-  * Test output will go here
-  */`
-              }
-              output={ output }
-            />
-          </Row>
-          <Row>
-            <TestSuite tests={ tests } />
-          </Row>
-        </Col>
-      </Row>
-    );
-  }
-}
-
-BackEnd.displayName = 'BackEnd';
-BackEnd.propTypes = propTypes;
-
-export default reduxForm(
-  {
-    form: 'BackEndChallenge',
-    fields,
-    validate: createFormValidator(fieldValidators)
-  },
-  mapStateToProps,
-  mapDispatchToActions
-)(BackEnd);
diff --git a/common/app/routes/Challenges/views/backend/Show.jsx b/common/app/routes/Challenges/views/backend/Show.jsx
deleted file mode 100644
index e69702c750..0000000000
--- a/common/app/routes/Challenges/views/backend/Show.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import { addNS } from 'berkeleys-redux-utils';
-
-import ChildContainer from '../../Child-Container.jsx';
-import BackEnd from './Back-End.jsx';
-import { types } from '../../redux';
-import Panes from '../../../../Panes';
-import _Map from '../../../../Map';
-
-const propTypes = {};
-
-export const mapStateToPanes = addNS(
-  'backend',
-  () => ({
-    [types.toggleMap]: 'Map',
-    [types.toggleMain]: 'Main'
-  })
-);
-
-const nameToComponent = {
-  Map: _Map,
-  Main: BackEnd
-};
-
-const renderPane = name => {
-  const Comp = nameToComponent[name];
-  return Comp ? <Comp /> : <span>Pane { name } not found</span>;
-};
-
-export default function ShowBackEnd() {
-  return (
-    <ChildContainer isFullWidth={ true }>
-      <Panes render={ renderPane } />
-    </ChildContainer>
-  );
-}
-
-ShowBackEnd.displayName = 'ShowBackEnd';
-ShowBackEnd.propTypes = propTypes;
diff --git a/common/app/routes/Challenges/views/backend/index.js b/common/app/routes/Challenges/views/backend/index.js
deleted file mode 100644
index 53c86f5f0b..0000000000
--- a/common/app/routes/Challenges/views/backend/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default, mapStateToPanes } from './Show.jsx';
diff --git a/common/app/routes/Challenges/views/classic/Editor.jsx b/common/app/routes/Challenges/views/classic/Editor.jsx
deleted file mode 100644
index 7bddbbff14..0000000000
--- a/common/app/routes/Challenges/views/classic/Editor.jsx
+++ /dev/null
@@ -1,162 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-
-import Codemirror from 'react-codemirror';
-import NoSSR from 'react-no-ssr';
-import MouseTrap from 'mousetrap';
-
-import ns from './ns.json';
-import CodeMirrorSkeleton from '../../Code-Mirror-Skeleton.jsx';
-import {
-  executeChallenge,
-  classicEditorUpdated,
-  challengeMetaSelector,
-  keySelector
-} from '../../redux';
-
-import { themeSelector, challengeSelector } from '../../../../redux';
-
-import { filesSelector } from '../../../../files';
-
-const envProps = typeof window !== 'undefined' ? Object.keys(window) : [];
-const options = {
-  lint: {
-    esversion: 6,
-    predef: envProps
-  },
-  lineNumbers: true,
-  mode: 'javascript',
-  runnable: true,
-  matchBrackets: true,
-  autoCloseBrackets: true,
-  scrollbarStyle: 'null',
-  lineWrapping: true,
-  gutters: [ 'CodeMirror-lint-markers' ]
-};
-
-const mapStateToProps = createSelector(
-  filesSelector,
-  challengeMetaSelector,
-  challengeSelector,
-  keySelector,
-  themeSelector,
-  (
-    files = {},
-    { mode = 'javascript' },
-    { id },
-    key,
-    theme
-  ) => ({
-    content: files[key] && files[key].contents || '// Happy Coding!',
-    file: files[key],
-    fileKey: key,
-    id,
-    mode,
-    theme
-  })
-);
-
-const mapDispatchToProps = {
-  executeChallenge,
-  classicEditorUpdated
-};
-
-const propTypes = {
-  classicEditorUpdated: PropTypes.func.isRequired,
-  content: PropTypes.string,
-  executeChallenge: PropTypes.func.isRequired,
-  fileKey: PropTypes.string.isRequired,
-  id: PropTypes.string,
-  mode: PropTypes.string,
-  theme: PropTypes.string
-};
-
-export class Editor extends PureComponent {
-  createOptions = createSelector(
-    state => state.executeChallenge,
-    state => state.mode,
-    state => state.cmTheme,
-    (executeChallenge, mode, cmTheme) => ({
-      ...options,
-      theme: cmTheme,
-      mode,
-      extraKeys: {
-        Esc() {
-          document.activeElement.blur();
-        },
-        Tab(cm) {
-          if (cm.somethingSelected()) {
-            return cm.indentSelection('add');
-          }
-          const spaces = Array(cm.getOption('indentUnit') + 1).join(' ');
-          return cm.replaceSelection(spaces);
-        },
-        'Shift-Tab': function(cm) {
-          return cm.indentSelection('subtract');
-        },
-        'Ctrl-Enter': function() {
-          executeChallenge();
-          return false;
-        },
-        'Cmd-Enter': function() {
-          executeChallenge();
-          return false;
-        },
-        'Ctrl-/': function(cm) {
-          cm.toggleComment();
-        },
-        'Cmd-/': function(cm) {
-          cm.toggleComment();
-        }
-      }
-    })
-  );
-
-  componentDidMount() {
-    MouseTrap.bind('e', () => {
-      this.refs.editor.focus();
-    }, 'keyup');
-  }
-
-  componentWillUnmount() {
-    MouseTrap.unbind('e', 'keyup');
-  }
-
-  render() {
-    const {
-      content,
-      executeChallenge,
-      fileKey,
-      id,
-      classicEditorUpdated,
-      mode
-    } = this.props;
-    const cmTheme = this.props.theme === 'default' ? 'default' : 'dracula';
-    return (
-      <div
-        className={ `${ns}-editor` }
-        role='main'
-        >
-        <NoSSR onSSR={ <CodeMirrorSkeleton content={ content } /> }>
-          <Codemirror
-            key={ id }
-            onChange={ change => classicEditorUpdated(fileKey, change) }
-            options={ this.createOptions({ executeChallenge, mode, cmTheme }) }
-            ref='editor'
-            value={ content }
-          />
-        </NoSSR>
-      </div>
-    );
-  }
-}
-
-Editor.displayName = 'Editor';
-Editor.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Editor);
diff --git a/common/app/routes/Challenges/views/classic/Show.jsx b/common/app/routes/Challenges/views/classic/Show.jsx
deleted file mode 100644
index b82d361c6d..0000000000
--- a/common/app/routes/Challenges/views/classic/Show.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import { addNS } from 'berkeleys-redux-utils';
-
-import Editor from './Editor.jsx';
-import ChildContainer from '../../Child-Container.jsx';
-import { types, showPreviewSelector } from '../../redux';
-import Preview from '../../Preview.jsx';
-import SidePanel from '../../Side-Panel.jsx';
-import Panes from '../../../../Panes';
-import _Map from '../../../../Map';
-
-const propTypes = {};
-
-export const mapStateToPanes = addNS(
-  'classic',
-  state => {
-    const panesMap = {
-      [types.toggleMap]: 'Map',
-      [types.toggleSidePanel]: 'Lesson',
-      [types.toggleClassicEditor]: 'Editor'
-    };
-
-    if (showPreviewSelector(state)) {
-      panesMap[types.togglePreview] = 'Preview';
-    }
-    return panesMap;
-  }
-);
-
-const nameToComponent = {
-  Map: _Map,
-  Lesson: SidePanel,
-  Editor: Editor,
-  Preview: Preview
-};
-
-const renderPane = name => {
-  const Comp = nameToComponent[name];
-  return Comp ? <Comp /> : <span>Pane for { name } not found</span>;
-};
-
-export default function ShowClassic() {
-  return (
-    <ChildContainer isFullWidth={ true }>
-      <Panes render={ renderPane }/>
-    </ChildContainer>
-  );
-}
-
-ShowClassic.displayName = 'ShowClassic';
-ShowClassic.propTypes = propTypes;
diff --git a/common/app/routes/Challenges/views/classic/classic.less b/common/app/routes/Challenges/views/classic/classic.less
deleted file mode 100644
index e4ca47aee7..0000000000
--- a/common/app/routes/Challenges/views/classic/classic.less
+++ /dev/null
@@ -1,21 +0,0 @@
-// should match filename and ./ns.json
-@ns: classic;
-
-// challenge panes are bound to the pane size which in turn is
-// bound to the total height minus navbar height
-.max-element-height() {
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
-.@{ns}-instructions-panel {
-  .max-element-height();
-  padding-bottom: 10px;
-  padding-left: 5px;
-  padding-right: 5px;
-}
-
-.@{ns}-editor {
-  .max-element-height();
-  width: 100%;
-}
\ No newline at end of file
diff --git a/common/app/routes/Challenges/views/classic/index.js b/common/app/routes/Challenges/views/classic/index.js
deleted file mode 100644
index 53c86f5f0b..0000000000
--- a/common/app/routes/Challenges/views/classic/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default, mapStateToPanes } from './Show.jsx';
diff --git a/common/app/routes/Challenges/views/classic/ns.json b/common/app/routes/Challenges/views/classic/ns.json
deleted file mode 100644
index 1229003f77..0000000000
--- a/common/app/routes/Challenges/views/classic/ns.json
+++ /dev/null
@@ -1 +0,0 @@
-"classic"
diff --git a/common/app/routes/Challenges/views/index.less b/common/app/routes/Challenges/views/index.less
deleted file mode 100644
index 6a485e0b71..0000000000
--- a/common/app/routes/Challenges/views/index.less
+++ /dev/null
@@ -1,3 +0,0 @@
-&{ @import "./classic/classic.less"; }
-&{ @import "./step/step.less"; }
-&{ @import "./quiz/quiz.less"; }
diff --git a/common/app/routes/Challenges/views/project/Forms.jsx b/common/app/routes/Challenges/views/project/Forms.jsx
deleted file mode 100644
index b563412dc6..0000000000
--- a/common/app/routes/Challenges/views/project/Forms.jsx
+++ /dev/null
@@ -1,158 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { reduxForm } from 'redux-form';
-import {
-  Button,
-  FormGroup,
-  FormControl
-} from 'react-bootstrap';
-
-import { showProjectSubmit } from './redux';
-import SolutionInput from '../../Solution-Input.jsx';
-import { openChallengeModal } from '../../redux';
-import {
-  isValidURL,
-  makeRequired,
-  createFormValidator,
-  getValidationState
-} from '../../../../utils/form';
-
-const propTypes = {
-  fields: PropTypes.object,
-  handleSubmit: PropTypes.func,
-  isSignedIn: PropTypes.bool,
-  isSubmitting: PropTypes.bool,
-  openChallengeModal: PropTypes.func.isRequired,
-  resetForm: PropTypes.func,
-  showProjectSubmit: PropTypes.func,
-  submitChallenge: PropTypes.func
-};
-
-const bindableActions = {
-  openChallengeModal,
-  showProjectSubmit
-};
-const frontEndFields = [ 'solution' ];
-const backEndFields = [
-  'solution',
-  'githubLink'
-];
-
-const fieldValidators = {
-  solution: makeRequired(isValidURL)
-};
-
-const backEndFieldValidators = {
-  ...fieldValidators,
-  githubLink: makeRequired(isValidURL)
-};
-
-export function _FrontEndForm({
-  fields,
-  handleSubmit,
-  openChallengeModal,
-  isSubmitting,
-  showProjectSubmit
-}) {
-  const buttonCopy = isSubmitting ?
-    'Submit and go to my next challenge' :
-    "I've completed this challenge";
-  return (
-    <form
-      name='NewFrontEndProject'
-      onSubmit={ handleSubmit(openChallengeModal) }
-      >
-      {
-        isSubmitting ?
-          <SolutionInput
-            placeholder='https://codepen/your-project'
-            { ...fields }
-          /> :
-          null
-      }
-      <Button
-        block={ true }
-        bsStyle='primary'
-        className='btn-big'
-        onClick={ isSubmitting ? null : showProjectSubmit }
-        type={ isSubmitting ? 'submit' : null }
-        >
-        { buttonCopy } (ctrl + enter)
-      </Button>
-    </form>
-  );
-}
-
-_FrontEndForm.propTypes = propTypes;
-
-export const FrontEndForm = reduxForm(
-  {
-    form: 'NewFrontEndProject',
-    fields: frontEndFields,
-    validate: createFormValidator(fieldValidators)
-  },
-  null,
-  bindableActions
-)(_FrontEndForm);
-
-export function _BackEndForm({
-  fields: { solution, githubLink },
-  handleSubmit,
-  openChallengeModal,
-  isSubmitting,
-  showProjectSubmit
-}) {
-  const buttonCopy = isSubmitting ?
-    'Submit and go to my next challenge' :
-    "I've completed this challenge";
-  return (
-    <form
-      name='NewBackEndProject'
-      onSubmit={ handleSubmit(openChallengeModal) }
-      >
-      {
-        isSubmitting ?
-          <SolutionInput
-            placeholder='https://your-app.com'
-            solution={ solution }
-          /> :
-          null
-      }
-      { isSubmitting ?
-        <FormGroup
-          controlId='githubLink'
-          validationState={ getValidationState(githubLink) }
-          >
-          <FormControl
-            name='githubLink'
-            placeholder='https://github.com/your-username/your-project'
-            type='url'
-            { ...githubLink }
-          />
-        </FormGroup> :
-        null
-      }
-      <Button
-        block={ true }
-        bsStyle='primary'
-        className='btn-big'
-        onClick={ isSubmitting ? null : showProjectSubmit }
-        type={ isSubmitting ? 'submit' : null }
-        >
-        { buttonCopy } (ctrl + enter)
-      </Button>
-    </form>
-  );
-}
-
-_BackEndForm.propTypes = propTypes;
-
-export const BackEndForm = reduxForm(
-  {
-    form: 'NewBackEndProject',
-    fields: backEndFields,
-    validate: createFormValidator(backEndFieldValidators)
-  },
-  null,
-  bindableActions
-)(_BackEndForm);
diff --git a/common/app/routes/Challenges/views/project/Project.jsx b/common/app/routes/Challenges/views/project/Project.jsx
deleted file mode 100644
index 977cfa2aca..0000000000
--- a/common/app/routes/Challenges/views/project/Project.jsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { createSelector } from 'reselect';
-import { connect } from 'react-redux';
-import { Col } from 'react-bootstrap';
-
-import SidePanel from './Side-Panel.jsx';
-import ToolPanel from './Tool-Panel.jsx';
-import HelpModal from '../../Help-Modal.jsx';
-
-import { challengeMetaSelector } from '../../redux';
-import { challengeSelector } from '../../../../redux';
-
-const mapStateToProps = createSelector(
-  challengeSelector,
-  challengeMetaSelector,
-  ({ description }, { title }) => ({
-    title,
-    description
-  })
-);
-const propTypes = {
-  description: PropTypes.arrayOf(PropTypes.string),
-  isCompleted: PropTypes.bool,
-  title: PropTypes.string
-};
-
-export class Project extends PureComponent {
-  render() {
-    const {
-      title,
-      isCompleted,
-      description
-    } = this.props;
-    return (
-      <Col
-        md={ 8 }
-        xs={ 12 }
-        >
-        <SidePanel
-          description={ description }
-          isCompleted={ isCompleted }
-          title={ title }
-        />
-        <br />
-        <ToolPanel />
-        <HelpModal />
-      </Col>
-    );
-  }
-}
-
-Project.displayName = 'Project';
-Project.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps
-)(Project);
diff --git a/common/app/routes/Challenges/views/project/Show.jsx b/common/app/routes/Challenges/views/project/Show.jsx
deleted file mode 100644
index 9f7de7e7e0..0000000000
--- a/common/app/routes/Challenges/views/project/Show.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import { addNS } from 'berkeleys-redux-utils';
-
-import ns from './ns.json';
-import Main from './Project.jsx';
-import ChildContainer from '../../Child-Container.jsx';
-import { types } from '../../redux';
-import Panes from '../../../../Panes';
-import _Map from '../../../../Map';
-
-const propTypes = {};
-export const mapStateToPanes = addNS(
-  ns,
-  () => ({
-    [types.toggleMap]: 'Map',
-    [types.toggleMain]: 'Main'
-  })
-);
-
-const nameToComponent = {
-  Map: _Map,
-  Main: Main
-};
-
-const renderPane = name => {
-  const Comp = nameToComponent[name];
-  return Comp ? <Comp /> : <span>Pane { name } not found</span>;
-};
-
-export default function ShowProject() {
-  return (
-    <ChildContainer isFullWidth={ true }>
-      <Panes render={ renderPane }/>
-    </ChildContainer>
-  );
-}
-
-ShowProject.displayName = 'ShowProject';
-ShowProject.propTypes = propTypes;
diff --git a/common/app/routes/Challenges/views/project/Side-Panel.jsx b/common/app/routes/Challenges/views/project/Side-Panel.jsx
deleted file mode 100644
index b93a3a7b3f..0000000000
--- a/common/app/routes/Challenges/views/project/Side-Panel.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import ChallengeTitle from '../../Challenge-Title.jsx';
-
-const propTypes = {
-  description: PropTypes.arrayOf(PropTypes.string),
-  isCompleted: PropTypes.bool,
-  isSignedIn: PropTypes.bool,
-  title: PropTypes.string
-};
-
-export default class SidePanel extends PureComponent {
-  renderDescription(title = '', description = []) {
-    return description.map((line, index) => (
-      <li
-        className='step-text wrappable'
-        dangerouslySetInnerHTML={{ __html: line }}
-        key={ title.slice(6) + index }
-      />
-    ));
-  }
-
-  render() {
-    const { title, description, isCompleted } = this.props;
-    return (
-      <div>
-        <ChallengeTitle isCompleted={ isCompleted }>
-          { title }
-        </ChallengeTitle>
-        <ul>
-          { this.renderDescription(title, description) }
-        </ul>
-      </div>
-    );
-  }
-}
-
-SidePanel.displayName = 'ProjectSidePanel';
-SidePanel.propTypes = propTypes;
diff --git a/common/app/routes/Challenges/views/project/Tool-Panel.jsx b/common/app/routes/Challenges/views/project/Tool-Panel.jsx
deleted file mode 100644
index 9a4b31bf3d..0000000000
--- a/common/app/routes/Challenges/views/project/Tool-Panel.jsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { Button } from 'react-bootstrap';
-
-import { ButtonSpacer } from '../../../../helperComponents';
-import {
-  FrontEndForm,
-  BackEndForm
-} from './Forms.jsx';
-
-import { submittingSelector } from './redux';
-
-import {
-  openHelpModal,
-  chatRoomSelector,
-  guideURLSelector
-} from '../../redux';
-
-import {
-  signInLoadingSelector,
-  challengeSelector
-} from '../../../../redux';
-import {
-  frontEndProject
-} from '../../../../utils/challengeTypes';
-
-const propTypes = {
-  guideUrl: PropTypes.string,
-  helpChatRoom: PropTypes.string.isRequired,
-  isFrontEnd: PropTypes.bool,
-  isSubmitting: PropTypes.bool,
-  openHelpModal: PropTypes.func.isRequired
-};
-const mapDispatchToProps = {
-  openHelpModal
-};
-const mapStateToProps = createSelector(
-  challengeSelector,
-  signInLoadingSelector,
-  submittingSelector,
-  chatRoomSelector,
-  guideURLSelector,
-  (
-    { challengeType },
-    showLoading,
-    isSubmitting,
-    helpChatRoom,
-    guideUrl
-  ) => ({
-    guideUrl,
-    helpChatRoom,
-    isSubmitting,
-    isFrontEnd: challengeType === frontEndProject
-  })
-);
-
-export class ToolPanel extends PureComponent {
-  renderSubmitButton(isSignedIn, openChallengeModal) {
-    const buttonCopy = isSignedIn ?
-      'Submit and go to my next challenge' :
-      "I've completed this challenge";
-    return (
-      <Button
-        block={ true }
-        bsStyle='primary'
-        className='btn-big'
-        onClick={ openChallengeModal }
-        >
-        { buttonCopy } (ctrl + enter)
-      </Button>
-    );
-  }
-
-  render() {
-    const {
-      guideUrl,
-      helpChatRoom,
-      isFrontEnd,
-      isSubmitting,
-      openHelpModal
-    } = this.props;
-
-    const FormElement = isFrontEnd ? FrontEndForm : BackEndForm;
-    return (
-      <div>
-        <FormElement isSubmitting={ isSubmitting }/>
-        <ButtonSpacer />
-        <Button
-          block={ true }
-          bsStyle='primary'
-          className='btn-primary-ghost btn-big'
-          componentClass='a'
-          href={ `https://gitter.im/freecodecamp/${helpChatRoom}` }
-          target='_blank'
-          >
-          Help
-        </Button>
-        <ButtonSpacer />
-        <Button
-          block={ true }
-          bsStyle='primary'
-          className='btn-primary-ghost btn-big'
-          href={ guideUrl }
-          target='_blank'
-          >
-          Get a hint
-        </Button>
-        <ButtonSpacer />
-        <Button
-          block={ true }
-          bsStyle='primary'
-          className='btn-primary-ghost btn-big'
-          onClick={ openHelpModal }
-          >
-          Ask for help on the forum
-        </Button>
-        <ButtonSpacer />
-      </div>
-    );
-  }
-}
-
-ToolPanel.displayName = 'ProjectToolPanel';
-ToolPanel.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(ToolPanel);
diff --git a/common/app/routes/Challenges/views/project/index.js b/common/app/routes/Challenges/views/project/index.js
deleted file mode 100644
index 53c86f5f0b..0000000000
--- a/common/app/routes/Challenges/views/project/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default, mapStateToPanes } from './Show.jsx';
diff --git a/common/app/routes/Challenges/views/project/ns.json b/common/app/routes/Challenges/views/project/ns.json
deleted file mode 100644
index a8138abf72..0000000000
--- a/common/app/routes/Challenges/views/project/ns.json
+++ /dev/null
@@ -1 +0,0 @@
-"project"
diff --git a/common/app/routes/Challenges/views/project/redux/index.js b/common/app/routes/Challenges/views/project/redux/index.js
deleted file mode 100644
index 18c5362e50..0000000000
--- a/common/app/routes/Challenges/views/project/redux/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import {
-  createAction,
-  createTypes,
-  handleActions
-} from 'berkeleys-redux-utils';
-import ns from '../ns.json';
-
-export const types = createTypes([
-  'showProjectSubmit'
-], ns);
-
-export const showProjectSubmit = createAction(types.showProjectSubmit);
-
-const initialState = {
-  // project is ready to submit
-  isSubmitting: false
-};
-export const submittingSelector = state => state[ns].isSubmitting;
-
-export default handleActions(
-  () => ({
-    [types.showProjectSubmit]: state => ({
-      ...state,
-      isSubmitting: true
-    })
-  }),
-  initialState,
-  ns
-);
diff --git a/common/app/routes/Challenges/views/project/redux/project-normalizer.js b/common/app/routes/Challenges/views/project/redux/project-normalizer.js
deleted file mode 100644
index 4cd8b1ae31..0000000000
--- a/common/app/routes/Challenges/views/project/redux/project-normalizer.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { callIfDefined, formatUrl } from '../../../../../utils/form';
-
-export default {
-  NewFrontEndProject: {
-    solution: callIfDefined(formatUrl)
-  },
-  NewBackEndProject: {
-    githubLink: callIfDefined(formatUrl),
-    solution: callIfDefined(formatUrl)
-  }
-};
diff --git a/common/app/routes/Challenges/views/quiz/Choice.jsx b/common/app/routes/Challenges/views/quiz/Choice.jsx
deleted file mode 100644
index 86de3796e8..0000000000
--- a/common/app/routes/Challenges/views/quiz/Choice.jsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-import classnames from 'classnames';
-import { createSelector } from 'reselect';
-
-import {
-  selectChoice,
-  incrementCorrect
-} from './redux';
-
-const mapStateToProps = createSelector(
-  () => ({})
-);
-
-function mapDispatchToProps(dispatch) {
-  return () => bindActionCreators({
-    selectChoice,
-    incrementCorrect
-  }, dispatch);
-}
-
-const propTypes = {
-  choice: PropTypes.string,
-  choiceIndex: PropTypes.number,
-  incrementCorrect: PropTypes.func,
-  isChoiceSelected: PropTypes.bool,
-  isCorrectChoice: PropTypes.bool,
-  selectChoice: PropTypes.func,
-  selected: PropTypes.bool
-};
-
-export class Choice extends PureComponent {
-
-  constructor(props) {
-    super(props);
-    this.selectChoice = this.selectChoice.bind(this);
-  }
-
-  selectChoice() {
-    if (this.props.isChoiceSelected) {
-      return;
-    }
-    if (this.props.isCorrectChoice) {
-      this.props.incrementCorrect();
-    }
-    this.props.selectChoice(this.props.choiceIndex);
-  }
-
-  render() {
-    const choiceClass = classnames({
-      choice: true,
-      selected: this.props.selected,
-      correct: this.props.isCorrectChoice,
-      reveal: this.props.isChoiceSelected
-    });
-
-    return (
-      <div
-        className={choiceClass}
-        onClick={this.selectChoice}
-        >
-        <div className='radio'>
-          <div className='inside' />
-        </div>
-
-        <div
-          className='text'
-          dangerouslySetInnerHTML={{__html: this.props.choice}}
-        />
-      </div>
-    );
-  }
-}
-
-Choice.displayName = 'Choice';
-Choice.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Choice);
diff --git a/common/app/routes/Challenges/views/quiz/Quiz.jsx b/common/app/routes/Challenges/views/quiz/Quiz.jsx
deleted file mode 100644
index b5e0b17334..0000000000
--- a/common/app/routes/Challenges/views/quiz/Quiz.jsx
+++ /dev/null
@@ -1,241 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { Col, Row } from 'react-bootstrap';
-import Choice from './Choice.jsx';
-
-import {
-  currentIndexSelector,
-  selectedChoiceSelector,
-  nextQuestion,
-  selectChoice,
-  correctSelector,
-  incrementCorrect,
-  resetQuiz,
-  resetChoice
-} from './redux';
-
-import { submitChallenge, challengeMetaSelector } from '../../redux';
-import { challengeSelector } from '../../../../redux';
-
-const mapStateToProps = createSelector(
-  challengeSelector,
-  challengeMetaSelector,
-  currentIndexSelector,
-  selectedChoiceSelector,
-  correctSelector,
-  (
-    {
-      description = [],
-      title,
-      dashedName
-    },
-    meta,
-    currentIndex,
-    selectedChoice,
-    correct
-  ) => ({
-    dashedName,
-    title,
-    description,
-    meta,
-    currentIndex,
-    selectedChoice,
-    correct
-  })
-);
-
-function mapDispatchToProps(dispatch) {
-  return () => bindActionCreators({
-    nextQuestion,
-    selectChoice,
-    incrementCorrect,
-    resetQuiz,
-    resetChoice,
-    submitChallenge
-  }, dispatch);
-}
-
-const propTypes = {
-  correct: PropTypes.number,
-  currentIndex: PropTypes.number,
-  dashedName: PropTypes.string,
-  description: PropTypes.arrayOf(
-    PropTypes.shape({
-      answer: PropTypes.number,
-      choices: PropTypes.arrayOf(PropTypes.string),
-      explanation: PropTypes.string,
-      question: PropTypes.string,
-      subtitle: PropTypes.string
-    })
-  ),
-  meta: PropTypes.object,
-  nextQuestion: PropTypes.func,
-  resetChoice: PropTypes.func,
-  resetQuiz: PropTypes.func,
-  selectedChoice: PropTypes.number,
-  submitChallenge: PropTypes.func
-};
-
-export class QuizChallenge extends PureComponent {
-
-  constructor(props) {
-    super(props);
-    this.nextQuestion = this.nextQuestion.bind(this);
-    this.submitChallenge = this.submitChallenge.bind(this);
-  }
-
-  componentWillReceiveProps(nextProps) {
-      if (this.props.dashedName !== nextProps.dashedName) {
-        this.props.resetQuiz();
-      }
-  }
-
-  nextQuestion() {
-    this.props.resetChoice();
-    this.props.nextQuestion();
-  }
-
-  submitChallenge() {
-    this.props.resetQuiz();
-    this.props.submitChallenge();
-  }
-
-  renderTitle() {
-    return (
-      <Row className='quizTitle'>
-        <Col md={12}>
-          <h4>{this.props.meta.title}</h4>
-          <hr/>
-        </Col>
-      </Row>
-    );
-  }
-
-  renderResults() {
-    const isQuizPassed = this.props.correct === this.props.description.length;
-    return (
-      <div>
-        {this.renderTitle()}
-        <Row className='quizResults'>
-          <Col md={12}>
-            <h2>Quiz Results:</h2>
-
-            <p>
-              You got {this.props.correct} out of
-               {` ${this.props.description.length}`} correct!
-            </p>
-
-            {isQuizPassed === false ? (
-              <div>
-                <p>
-                  You will need to get all the questions
-                  correct in order to mark this quiz as completed.
-                </p>
-                <button
-                  className='btn btn-lg btn-primary'
-                  onClick={this.props.resetQuiz}
-                  > Try Again
-                </button>
-              </div>
-            ) : (
-              <button
-                className='btn btn-lg btn-primary'
-                onClick={this.submitChallenge}
-                > Finish Quiz
-              </button>
-            )}
-          </Col>
-        </Row>
-      </div>
-    );
-  }
-
-  renderQuiz() {
-    const currentIndex = this.props.currentIndex;
-    const question = this.props.description[currentIndex];
-    const questionKey = this.props.dashedName + currentIndex.toString();
-    return (
-      <div key={questionKey} >
-        {this.renderTitle()}
-        <Row>
-          <Col md={6}>
-            <h2 className='textCenter'>
-              Question {currentIndex + 1} of {this.props.description.length}:
-            </h2>
-
-            <h3>
-              {question.subtitle}:
-            </h3>
-
-            <p dangerouslySetInnerHTML={{__html: question.question}} />
-          </Col>
-
-          <Col md={6}>
-            <h2 className='textCenter'>Choices</h2>
-
-            {question.choices.map((choice, i) => (
-              <Choice
-                choice={choice}
-                choiceIndex={i}
-                isChoiceSelected={this.props.selectedChoice !== null}
-                isCorrectChoice={question.answer === i}
-                key={choice}
-                selected={i === this.props.selectedChoice}
-              />
-            ))}
-          </Col>
-        </Row>
-
-        {this.props.selectedChoice !== null &&
-          <Row className='quizResults'>
-            <Col md={6} mdPush={3}>
-              <div className='messageDiv'>
-                {this.props.selectedChoice === question.answer
-                  ? <h2 className='correctAnswer'>
-                      Correct, great work!
-                    </h2>
-                  : <h2 className='wrongAnswer'>
-                      Sorry, that is not correct!
-                    </h2>}
-              </div>
-              {this.props.selectedChoice !== question.answer &&
-              <div className='explanation'>
-                <h2>Explanation:</h2>
-                <p dangerouslySetInnerHTML={{__html: question.explanation}} />
-              </div>}
-            </Col>
-
-            <Col md={12}>
-              <button
-                className='btn btn-lg btn-primary'
-                onClick={this.nextQuestion}
-                >
-                {currentIndex + 1 === this.props.description.length ?
-                  'View Results' : 'Next Question'}
-              </button>
-            </Col>
-          </Row>}
-      </div>
-    );
-  }
-
-  render() {
-    return (
-      <div className='quiz'>{
-        this.props.currentIndex >= this.props.description.length ?
-        this.renderResults() : this.renderQuiz()}
-      </div>
-    );
-  }
-}
-
-QuizChallenge.displayName = 'QuizChallenge';
-QuizChallenge.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(QuizChallenge);
diff --git a/common/app/routes/Challenges/views/quiz/Show.jsx b/common/app/routes/Challenges/views/quiz/Show.jsx
deleted file mode 100644
index 7937804521..0000000000
--- a/common/app/routes/Challenges/views/quiz/Show.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import { addNS } from 'berkeleys-redux-utils';
-
-import ns from './ns.json';
-import Main from './Quiz.jsx';
-import ChildContainer from '../../Child-Container.jsx';
-import { types } from '../../redux';
-import Panes from '../../../../Panes';
-import _Map from '../../../../Map';
-
-const propTypes = {};
-export const mapStateToPanes = addNS(
-  ns,
-  () => ({
-    [types.toggleMap]: 'Map',
-    [types.toggleMain]: 'Lesson'
-  })
-);
-
-const nameToComponent = {
-  Map: _Map,
-  Lesson: Main
-};
-
-const renderPane = name => {
-  const Comp = nameToComponent[name];
-  return Comp ? <Comp /> : <span>Pane { name } not found</span>;
-};
-
-export default function ShowQuiz() {
-  return (
-    <ChildContainer isFullWidth={ true }>
-      <Panes render={ renderPane }/>
-    </ChildContainer>
-  );
-}
-
-ShowQuiz.displayName = 'ShowQuiz';
-ShowQuiz.propTypes = propTypes;
diff --git a/common/app/routes/Challenges/views/quiz/index.js b/common/app/routes/Challenges/views/quiz/index.js
deleted file mode 100644
index 53c86f5f0b..0000000000
--- a/common/app/routes/Challenges/views/quiz/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default, mapStateToPanes } from './Show.jsx';
diff --git a/common/app/routes/Challenges/views/quiz/ns.json b/common/app/routes/Challenges/views/quiz/ns.json
deleted file mode 100644
index c2cb0377f5..0000000000
--- a/common/app/routes/Challenges/views/quiz/ns.json
+++ /dev/null
@@ -1 +0,0 @@
-"quiz"
diff --git a/common/app/routes/Challenges/views/quiz/quiz.less b/common/app/routes/Challenges/views/quiz/quiz.less
deleted file mode 100644
index 7b1e960ff9..0000000000
--- a/common/app/routes/Challenges/views/quiz/quiz.less
+++ /dev/null
@@ -1,93 +0,0 @@
-// should match ./ns.json value and filename
-@ns: quiz;
-
-.quiz {
-  padding-left: 20px;
-  padding-right: 20px;
-
-  .quizTitle {
-    margin-top: 10px;
-    text-align: center;
-  }
-
-  .textCenter {
-    text-align: center;
-  }
-
-  .explanation p {
-    text-align: left;
-  }
-
-  .quizResults {
-    text-align: center;
-  }
-
-  .wrongAnswer {
-    color: red;
-  }
-
-  .correctAnswer {
-    color: green;
-  }
-
-  .choice.selected {
-    .radio {
-      .inside {
-        opacity: 1;
-      }
-    }
-  }
-
-  .choice:not(.reveal):hover > .radio {
-    .inside {
-      opacity: 1;
-    }
-  }
-
-  .choice {
-    position: relative;
-    padding: 10px;
-    margin-bottom: 10px;
-    border-radius: 10px;
-
-    .text {
-
-    }
-
-    .radio {
-      width: 24px;
-      height: 24px;
-      border-radius: 100%;
-      border: 4px solid #333;
-      float: left;
-      margin-right: 10px;
-
-      .inside {
-        position: absolute;
-        width: 12px;
-        height: 12px;
-        left: 2px;
-        top: 2px;
-        background-color: #333;
-        border-radius: 100%;
-        opacity: 0;
-      }
-    }
-  }
-
-  .choice:not(.reveal):hover {
-    background-color: rgba(0, 100, 0, 0.3);
-  }
-
-  .choice:not(.reveal) {
-    cursor: pointer;
-  }
-
-  .choice.reveal {
-    background-color: rgba(255, 65, 77, 0.3);
-  }
-
-  .choice.reveal.correct {
-    background-color: rgba(0, 100, 0, 0.3);
-  }
-}
diff --git a/common/app/routes/Challenges/views/quiz/redux/index.js b/common/app/routes/Challenges/views/quiz/redux/index.js
deleted file mode 100644
index 299511e734..0000000000
--- a/common/app/routes/Challenges/views/quiz/redux/index.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import {
-  createAction,
-  createTypes,
-  handleActions
-} from 'berkeleys-redux-utils';
-import noop from 'lodash/noop';
-
-import ns from '../ns.json';
-
-export const types = createTypes([
-  'nextQuestion',
-  'selectChoice',
-  'incrementCorrect',
-  'resetQuiz',
-  'resetChoice'
-], ns);
-
-export const nextQuestion = createAction(
-  types.nextQuestion,
-  noop
-);
-
-export const selectChoice = createAction(
-  types.selectChoice,
-  (selectedChoice) => ({ selectedChoice })
-);
-
-export const incrementCorrect = createAction(
-  types.incrementCorrect,
-  noop
-);
-
-export const resetQuiz = createAction(
-  types.resetQuiz,
-  noop
-);
-
-export const resetChoice = createAction(
-  types.resetChoice,
-  noop
-);
-
-const initialState = {
-  currentIndex: 0,
-  selectedChoice: null,
-  correct: 0
-};
-
-export const getNS = state => state[ns];
-export const currentIndexSelector = state => getNS(state).currentIndex;
-export const selectedChoiceSelector = state => getNS(state).selectedChoice;
-export const correctSelector = state => getNS(state).correct;
-
-export default handleActions(
-  () => ({
-    [types.nextQuestion]: state => ({
-      ...state,
-      currentIndex: state.currentIndex + 1
-    }),
-    [types.selectChoice]: (state, {payload}) => ({
-      ...state,
-      selectedChoice: payload.selectedChoice
-    }),
-    [types.incrementCorrect]: state => ({
-      ...state,
-      correct: state.correct + 1
-    }),
-    [types.resetQuiz]: state => ({
-      ...state,
-      currentIndex: 0,
-      correct: 0,
-      selectedChoice: null
-    }),
-    [types.resetChoice]: state => ({
-      ...state,
-      selectedChoice: null
-    })
-  }),
-  initialState,
-  ns
-);
diff --git a/common/app/routes/Challenges/views/step/Show.jsx b/common/app/routes/Challenges/views/step/Show.jsx
deleted file mode 100644
index 31c4370454..0000000000
--- a/common/app/routes/Challenges/views/step/Show.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import { addNS } from 'berkeleys-redux-utils';
-
-import ns from './ns.json';
-import Step from './Step.jsx';
-import ChildContainer from '../../Child-Container.jsx';
-import { types } from '../../redux';
-import Panes from '../../../../Panes';
-import _Map from '../../../../Map';
-
-const propTypes = {};
-export const mapStateToPanes = addNS(
-  ns,
-  () => ({
-    [types.toggleMap]: 'Map',
-    [types.toggleStep]: 'Lesson'
-  })
-);
-
-const nameToComponent = {
-  Map: _Map,
-  Lesson: Step
-};
-
-const renderPane = name => {
-  const Comp = nameToComponent[name];
-  return Comp ? <Comp /> : <span>Pane { name } not found</span>;
-};
-
-export default function ShowStep() {
-  return (
-    <ChildContainer isFullWidth={ true }>
-      <Panes render={ renderPane }/>
-    </ChildContainer>
-  );
-}
-
-ShowStep.displayName = 'ShowStep';
-ShowStep.propTypes = propTypes;
diff --git a/common/app/routes/Challenges/views/step/Step.jsx b/common/app/routes/Challenges/views/step/Step.jsx
deleted file mode 100644
index 3c4348ef28..0000000000
--- a/common/app/routes/Challenges/views/step/Step.jsx
+++ /dev/null
@@ -1,293 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-import classnames from 'classnames';
-import { createSelector } from 'reselect';
-import LightBox from 'react-images';
-import { Button, Col, Image, Row } from 'react-bootstrap';
-
-import ns from './ns.json';
-import {
-  closeLightBoxImage,
-  completeAction,
-  clickOnImage,
-  stepBackward,
-  stepForward,
-  updateUnlockedSteps,
-
-  currentIndexSelector,
-  actionCompletedSelector,
-  previousIndexSelector,
-  lightBoxSelector
-} from './redux';
-import { submitChallenge } from '../../redux';
-import { challengeSelector } from '../../../../redux';
-
-const mapStateToProps = createSelector(
-  challengeSelector,
-  currentIndexSelector,
-  previousIndexSelector,
-  actionCompletedSelector,
-  lightBoxSelector,
-  (
-    { description = [['', '', 'Happy Coding!', '']] },
-    currentIndex,
-    previousIndex,
-    isActionCompleted,
-    isLightBoxOpen
-  ) => ({
-    currentIndex,
-    isActionCompleted,
-    isLightBoxOpen,
-    step: description[currentIndex],
-    steps: description,
-    numOfSteps: description.length,
-    isLastStep: currentIndex + 1 >= description.length
-  })
-);
-
-function mapDispatchToProps(dispatch) {
-  const dispatchers = bindActionCreators({
-    closeLightBoxImage,
-    completeAction,
-    stepBackward,
-    stepForward,
-    submitChallenge,
-    updateUnlockedSteps
-  }, dispatch);
-  dispatchers.clickOnImage = e => {
-    if (!(e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      return dispatch(clickOnImage());
-    }
-    return null;
-  };
-  return () => dispatchers;
-}
-
-const propTypes = {
-  clickOnImage: PropTypes.func.isRequired,
-  closeLightBoxImage: PropTypes.func.isRequired,
-  completeAction: PropTypes.func.isRequired,
-  currentIndex: PropTypes.number,
-  isActionCompleted: PropTypes.bool,
-  isLastStep: PropTypes.bool,
-  isLightBoxOpen: PropTypes.bool,
-  numOfSteps: PropTypes.number,
-  step: PropTypes.array,
-  stepBackward: PropTypes.func,
-  stepForward: PropTypes.func,
-  steps: PropTypes.array,
-  submitChallenge: PropTypes.func.isRequired,
-  updateUnlockedSteps: PropTypes.func.isRequired
-};
-
-export class StepChallenge extends PureComponent {
-  componentWillMount() {
-    const { updateUnlockedSteps } = this.props;
-    updateUnlockedSteps([]);
-  }
-
-  componentWillUnmount() {
-    const { updateUnlockedSteps } = this.props;
-    updateUnlockedSteps([]);
-  }
-
-  componentWillReceiveProps(nextProps) {
-    const { steps, updateUnlockedSteps } = this.props;
-    if (nextProps.steps !== steps) {
-      updateUnlockedSteps([]);
-    }
-  }
-
-  renderActionButton(action, completeAction) {
-    const isApiAction = action === '#';
-    const buttonCopy = isApiAction ?
-      'Confirm' :
-      'Open link in new tab ';
-    if (!action) {
-      return null;
-    }
-    return (
-      <div>
-        <Button
-          block={ true }
-          bsSize='large'
-          bsStyle='primary'
-          href={ action }
-          onClick={ completeAction }
-          target='_blank'
-          >
-          { buttonCopy }  (this unlocks the next step)
-        </Button>
-        <div className='spacer' />
-      </div>
-    );
-  }
-
-  renderBackButton(index, stepBackward) {
-    if (index === 0) {
-      return (
-        <Col
-          className='hidden-xs'
-          md={ 4 }
-          >
-          { ' ' }
-        </Col>
-      );
-    }
-    return (
-      <Button
-        bsSize='large'
-        bsStyle='primary'
-        className='col-sm-4 col-xs-12'
-        onClick={ stepBackward }
-        >
-        Go to my previous step
-      </Button>
-    );
-  }
-
-  renderNextButton(hasAction, isLastStep, isCompleted, stepForward) {
-    const btnClass = classnames({
-      'col-sm-4 col-xs-12': true,
-      disabled: hasAction && !isCompleted
-    });
-    return (
-      <Button
-        bsSize='large'
-        bsStyle='primary'
-        className={ btnClass }
-        disabled={ hasAction && !isCompleted }
-        onClick={ stepForward }
-        >
-        { isLastStep ? 'Finish lesson' : 'Go to my next step'}
-      </Button>
-    );
-  }
-
-  renderStep(
-    {
-      clickOnImage,
-      completeAction,
-      currentIndex,
-      isActionCompleted,
-      isLastStep,
-      numOfSteps,
-      step,
-      stepBackward,
-      stepForward
-  }) {
-    if (!Array.isArray(step)) {
-      return null;
-    }
-    const [imgUrl, imgAlt, info, action] = step;
-    return (
-      <div key={ `${info.slice(0, 15)}` }>
-        <a
-          href={ imgUrl }
-          onClick={ clickOnImage }
-          target='_blank'
-          >
-          <Image
-            alt={ imgAlt }
-            className='center-block'
-            responsive={ true }
-            src={ imgUrl }
-          />
-        </a>
-        <Row>
-          <div className='spacer' />
-          <Col
-            md={ 8 }
-            mdOffset={ 2 }
-            sm={ 10 }
-            smOffset={ 1 }
-            xs={ 12 }
-            >
-            <div
-              className={ `${ns}-description` }
-              dangerouslySetInnerHTML={{ __html: info }}
-            />
-          </Col>
-        </Row>
-        <div className='spacer' />
-        <div className={ `${ns}-button-block` }>
-          { this.renderActionButton(action, completeAction) }
-          { this.renderBackButton(currentIndex, stepBackward) }
-          <Col
-            className={ `${ns}-counter large-p text-center` }
-            sm={ 4 }
-            xs={ 12 }
-            >
-            ( { currentIndex + 1 } / { numOfSteps } )
-          </Col>
-          {
-            this.renderNextButton(
-              !!action,
-              isLastStep,
-              isActionCompleted,
-              stepForward
-            )
-          }
-        </div>
-        <div className='clearfix' />
-      </div>
-    );
-  }
-
-  renderImages(steps) {
-    // will preload all the image
-    if (!Array.isArray(steps)) {
-      return null;
-    }
-    return steps.map(([ imgUrl, imgAlt, info ]) => (
-      <div key={ `${info.slice(0, 15)}` }>
-        <Image
-          alt={ imgAlt }
-          responsive={ true }
-          src={ imgUrl }
-        />
-      </div>
-    ));
-  }
-
-  render() {
-    const {
-      step,
-      steps,
-      isLightBoxOpen,
-      closeLightBoxImage
-    } = this.props;
-    return (
-      <Row>
-        <Col
-          md={ 8 }
-          mdOffset={ 2 }
-          >
-          { this.renderStep(this.props) }
-          <div className='hidden'>
-            { this.renderImages(steps) }
-          </div>
-          <LightBox
-          backdropClosesModal={ true }
-          images={ [ { src: step[0] } ] }
-          isOpen={ isLightBoxOpen }
-          onClose={ closeLightBoxImage }
-          showImageCount={ false }
-          />
-          <div className='spacer' />
-        </Col>
-      </Row>
-    );
-  }
-}
-
-StepChallenge.displayName = 'StepChallenge';
-StepChallenge.propTypes = propTypes;
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(StepChallenge);
diff --git a/common/app/routes/Challenges/views/step/index.js b/common/app/routes/Challenges/views/step/index.js
deleted file mode 100644
index 53c86f5f0b..0000000000
--- a/common/app/routes/Challenges/views/step/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default, mapStateToPanes } from './Show.jsx';
diff --git a/common/app/routes/Challenges/views/step/ns.json b/common/app/routes/Challenges/views/step/ns.json
deleted file mode 100644
index 8cade00f13..0000000000
--- a/common/app/routes/Challenges/views/step/ns.json
+++ /dev/null
@@ -1 +0,0 @@
-"step"
diff --git a/common/app/routes/Challenges/views/step/redux/index.js b/common/app/routes/Challenges/views/step/redux/index.js
deleted file mode 100644
index c9c13f89ac..0000000000
--- a/common/app/routes/Challenges/views/step/redux/index.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import {
-  createAction,
-  createTypes,
-  handleActions
-} from 'berkeleys-redux-utils';
-
-import noop from 'lodash/noop';
-
-import stepChallengeEpic from './step-challenge-epic.js';
-import ns from '../ns.json';
-import { types as challenges } from '../../../redux';
-
-export const epics = [
-  stepChallengeEpic
-];
-
-export const types = createTypes([
-  'stepForward',
-  'stepBackward',
-  'goToStep',
-  'completeAction',
-  'clickOnImage',
-  'closeLightBoxImage',
-  'updateUnlockedSteps'
-], ns);
-
-export const stepForward = createAction(
-  types.stepForward,
-  noop
-);
-export const stepBackward = createAction(
-  types.stepBackward,
-  noop
-);
-export const goToStep = createAction(
-  types.goToStep,
-  (step, isUnlocked) => ({ step, isUnlocked })
-);
-export const completeAction = createAction(
-  types.completeAction,
-  noop
-);
-export const updateUnlockedSteps = createAction(types.updateUnlockedSteps);
-export const clickOnImage = createAction(types.clickOnImage);
-export const closeLightBoxImage = createAction(types.closeLightBoxImage);
-
-const initialState = {
-  // step index tracing
-  currentIndex: 0,
-  previousIndex: -1,
-  // step action
-  isActionCompleted: false,
-  isLightBoxOpen: false,
-  unlockedSteps: []
-};
-
-export const getNS = state => state[ns];
-export const currentIndexSelector = state => getNS(state).currentIndex;
-export const previousIndexSelector = state => getNS(state).previousIndex;
-export const unlockedStepsSelector = state => getNS(state).unlockedSteps;
-export const lightBoxSelector = state => getNS(state).isLightBoxOpen;
-export const actionCompletedSelector = state => getNS(state).isActionCompleted;
-
-export default handleActions(
-  () => ({
-    [challenges.challengeUpdated]: () => initialState,
-    [types.goToStep]: (state, { payload: { step = 0, isUnlocked }}) => ({
-      ...state,
-      currentIndex: step,
-      previousIndex: state.currentIndex,
-      isActionCompleted: isUnlocked
-    }),
-    [types.completeAction]: state => ({
-      ...state,
-      isActionCompleted: true
-    }),
-    [types.updateUnlockedSteps]: (state, { payload }) => ({
-      ...state,
-      unlockedSteps: payload
-    }),
-    [types.clickOnImage]: state => ({
-      ...state,
-      isLightBoxOpen: true
-    }),
-    [types.closeLightBoxImage]: state => ({
-      ...state,
-      isLightBoxOpen: false
-    })
-  }),
-  initialState,
-  ns
-);
diff --git a/common/app/routes/Challenges/views/step/redux/step-challenge-epic.js b/common/app/routes/Challenges/views/step/redux/step-challenge-epic.js
deleted file mode 100644
index af5cb9e71d..0000000000
--- a/common/app/routes/Challenges/views/step/redux/step-challenge-epic.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { ofType } from 'redux-epic';
-import {
-  types,
-  goToStep,
-  updateUnlockedSteps,
-
-  unlockedStepsSelector,
-  currentIndexSelector
-} from './';
-import { submitChallenge } from '../../../redux';
-import { challengeSelector } from '../../../../../redux';
-
-function unlockStep(step, unlockedSteps) {
-  if (!step) {
-    return null;
-  }
-  const updatedSteps = [ ...unlockedSteps ];
-  updatedSteps[step] = true;
-  return updateUnlockedSteps(updatedSteps);
-}
-
-export default function stepChallengeEpic(actions, { getState }) {
-  return actions::ofType(
-    types.stepForward,
-    types.stepBackward,
-    types.completeAction
-  )
-    .map(({ type }) => {
-      const state = getState();
-      const { description = [] } = challengeSelector(state);
-      const currentIndex = currentIndexSelector(state);
-      const unlockedSteps = unlockedStepsSelector(state);
-      const numOfSteps = description.length;
-      const stepFwd = currentIndex + 1;
-      const stepBwd = currentIndex - 1;
-      const isLastStep = stepFwd >= numOfSteps;
-      if (type === types.completeAction) {
-        return unlockStep(currentIndex, unlockedSteps);
-      }
-      if (type === types.stepForward) {
-        if (isLastStep) {
-          return submitChallenge();
-        }
-        return goToStep(stepFwd, !!unlockedSteps[stepFwd]);
-      }
-      if (type === types.stepBackward) {
-        return goToStep(stepBwd, !!unlockedSteps[stepBwd]);
-      }
-      return null;
-    })
-    .filter(Boolean);
-}
diff --git a/common/app/routes/Challenges/views/step/redux/step-challenge-epic.test.js b/common/app/routes/Challenges/views/step/redux/step-challenge-epic.test.js
deleted file mode 100644
index bb970f31ff..0000000000
--- a/common/app/routes/Challenges/views/step/redux/step-challenge-epic.test.js
+++ /dev/null
@@ -1,146 +0,0 @@
-import { Observable, config } from 'rx';
-import test from 'tape';
-import proxy from 'proxyquire';
-import sinon from 'sinon';
-
-import ns from '../ns.json';
-// import challenges.redux to get around
-// circular dependency
-import { types as challenge } from '../../../redux';
-import { types } from './';
-
-config.longStackSupport = true;
-const challengeSelectorStub = {};
-const stepChallengeEpic = proxy(
-  './step-challenge-epic',
-  { '../../../../../redux': challengeSelectorStub }
-);
-
-const file = 'common/app/routes/Challenges/redux/step-challenge-epic';
-test(file, function(t) {
-  t.test('does not respond to random actions', t => {
-    const actions = Observable.of({ type: 'NotTheMomma' });
-    let called = false;
-    stepChallengeEpic(actions, () => {})
-      .subscribe(
-        () => { called = true; },
-        e => t.fail(e),
-        () => {
-          if (!called) {
-            t.pass();
-          } else {
-            t.fail(new Error('epic should not respond'));
-          }
-          t.end();
-        }
-      );
-  });
-  t.test('steps back', t => {
-    const actions = Observable.of({ type: types.stepBackward });
-    const state = {
-      [ns]: {
-        currentIndex: 1,
-        unlockedSteps: [ true, undefined ] // eslint-disable-line no-undefined
-      }
-    };
-    const onNextSpy = sinon.spy();
-    challengeSelectorStub.challengeSelector = sinon.spy(_state => {
-      t.assert(_state === state, 'challenge selector not called with state');
-      return {
-        description: new Array(2)
-      };
-    });
-    stepChallengeEpic(actions, { getState: () => state })
-      .subscribe(
-        onNextSpy,
-        e => {
-          throw e;
-        },
-        () => {
-          t.assert(
-            onNextSpy.calledOnce,
-            'epic not called exactly once'
-          );
-          t.assert(
-            onNextSpy.calledWithMatch({
-              type: types.goToStep,
-              payload: { step: 0, isUnlocked: true }
-            }),
-            'Epic did not return the expected action'
-          );
-          delete challengeSelectorStub.challengeSelector;
-          t.end();
-        }
-      );
-  });
-  t.test('steps forward', t => {
-    const actions = Observable.of({ type: types.stepForward });
-    const state = {
-      [ns]: {
-        currentIndex: 0,
-        unlockedSteps: []
-      }
-    };
-    const onNextSpy = sinon.spy();
-    challengeSelectorStub.challengeSelector = sinon.spy(_state => {
-      t.assert(_state === state, 'challenge selector not called with state');
-      return {
-        description: new Array(2)
-      };
-    });
-    stepChallengeEpic(actions, { getState: () => state })
-      .subscribe(
-        onNextSpy,
-        e => {
-          throw e;
-        },
-        () => {
-          t.assert(
-            onNextSpy.calledOnce,
-            'epic not called exactly once'
-          );
-          t.assert(
-            onNextSpy.calledWithMatch({
-              type: types.goToStep,
-              payload: { step: 1, isUnlocked: false }
-            }),
-            'Epic did not return the expected action'
-          );
-          delete challengeSelectorStub.challengeSelector;
-          t.end();
-        }
-      );
-  });
-  t.test('submits on last step forward', t => {
-    const actions = Observable.of({ type: types.stepForward });
-    const state = { [ns]: { currentIndex: 1 } };
-    const onNextSpy = sinon.spy();
-    challengeSelectorStub.challengeSelector = sinon.spy(_state => {
-      t.assert(_state === state, 'challenge selector not called with state');
-      return {
-        description: new Array(2)
-      };
-    });
-    stepChallengeEpic(actions, { getState: () => state })
-      .subscribe(
-        onNextSpy,
-        e => {
-          throw e;
-        },
-        () => {
-          t.assert(
-            onNextSpy.calledOnce,
-            'epic not called exactly once'
-          );
-          t.assert(
-            onNextSpy.calledWithMatch({
-              type: challenge.submitChallenge.toString()
-            }),
-            'Epic did not return the expected action'
-          );
-          delete challengeSelectorStub.challengeSelector;
-          t.end();
-        }
-      );
-  });
-});
diff --git a/common/app/routes/Challenges/views/step/step.less b/common/app/routes/Challenges/views/step/step.less
deleted file mode 100644
index 60e16a7a35..0000000000
--- a/common/app/routes/Challenges/views/step/step.less
+++ /dev/null
@@ -1,60 +0,0 @@
-// should match ./ns.json value and filename
-@ns: step;
-
-.@{ns}-description {
-  word-wrap: break-word;
-  font-size: 1.5em;
-}
-
-.@{ns}-description a {
-  font-size: 1em;
-}
-
-.@{ns}-counter {
-  font-size: 20px;
-  line-height: 44px;
-}
-
-.@{ns}-forward-leave {
-  transition: opacity .4s ease-in, transform .3s ease-in-out;
-  opacity: 1;
-  transform: translate(0, 0);
-}
-
-.@{ns}-forward-leave-active {
-  opacity: 0;
-  transform: translate(-100%, 0);
-}
-
-.@{ns}-forward-enter {
-  transition: opacity .4s ease-in, transform .3s ease-in-out;
-  opacity: 0;
-  transform: translate(100%, 0);
-}
-
-.@{ns}-forward-enter-active {
-  opacity: 1;
-  transform: translate(0, 0);
-}
-
-.@{ns}-backward-leave {
-  transition: opacity .4s ease-in, transform .3s ease-in-out;
-  opacity: 1;
-  transform: translate(0, 0);
-}
-
-.@{ns}-backward-leave-active {
-  opacity: 0;
-  transform: translate(100%, 0);
-}
-
-.@{ns}-backward-enter {
-  transition: opacity .4s ease-in, transform .3s ease-in-out;
-  opacity: 0;
-  transform: translate(-100%, 0);
-}
-
-.@{ns}-backward-enter-active {
-  opacity: 1;
-  transform: translate(0, 0);
-}
diff --git a/common/app/routes/Map/index.js b/common/app/routes/Map/index.js
deleted file mode 100644
index 9c0750e66f..0000000000
--- a/common/app/routes/Map/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { types as map } from '../../Map/redux';
-import { onRouteCurrentChallenge } from '../Challenges/redux';
-
-export const routes = {
-  [map.onRouteMap]: {
-    type: map.onRouteMap,
-    path: '/map',
-    redirect: onRouteCurrentChallenge
-  }
-};
diff --git a/common/app/routes/Profile/Profile.jsx b/common/app/routes/Profile/Profile.jsx
index 416dde77b1..fc12992b36 100644
--- a/common/app/routes/Profile/Profile.jsx
+++ b/common/app/routes/Profile/Profile.jsx
@@ -39,7 +39,7 @@ const mapStateToProps = createSelector(
   (
     isSignedIn,
     { isLocked, username: requestedUsername },
-    { username: paramsUsername, lang },
+    { username: paramsUsername },
     currentUsername,
     showLoading,
     isUserFound
@@ -51,7 +51,6 @@ const mapStateToProps = createSelector(
     isUserFound,
     fetchOtherUserCompleted: typeof isUserFound === 'boolean',
     paramsUsername,
-    lang,
     requestedUsername,
     showLoading
   })
@@ -70,7 +69,6 @@ const propTypes = {
   isLocked: PropTypes.bool,
   isSignedIn: PropTypes.bool,
   isUserFound: PropTypes.bool,
-  lang: PropTypes.string,
   paramsUsername: PropTypes.string,
   requestedUsername: PropTypes.string,
   showLoading: PropTypes.bool,
@@ -95,11 +93,10 @@ class Profile extends Component {
       isLocked,
       isUserFound,
       isCurrentUserProfile,
-      lang = 'en',
       paramsUsername
     } = this.props;
     const takeMeToChallenges = (
-      <a href={`/${lang}/challenges/current-challenge`}>
+      <a href='/challenges/current-challenge'>
         <Button bsSize='lg' bsStyle='primary'>
           Take me to the Challenges
         </Button>
diff --git a/common/app/routes/Profile/components/Timeline.jsx b/common/app/routes/Profile/components/Timeline.jsx
index 8bf48f7940..a7f4516a60 100644
--- a/common/app/routes/Profile/components/Timeline.jsx
+++ b/common/app/routes/Profile/components/Timeline.jsx
@@ -11,7 +11,7 @@ import {
 } from 'react-bootstrap';
 
 import { challengeIdToNameMapSelector } from '../../../entities';
-import { userByNameSelector, fetchChallenges } from '../../../redux';
+import { userByNameSelector } from '../../../redux';
 import { homeURL } from '../../../../utils/constantStrings.json';
 import blockNameify from '../../../utils/blockNameify';
 import { FullWidthRow } from '../../../helperComponents';
@@ -31,15 +31,12 @@ const mapStateToProps = createSelector(
   })
 );
 
-const mapDispatchToProps = { fetchChallenges };
-
 const propTypes = {
   completedMap: PropTypes.shape({
     id: PropTypes.string,
     completedDate: PropTypes.number,
     lastUpdated: PropTypes.number
   }),
-  fetchChallenges: PropTypes.func.isRequired,
   idToNameMap: PropTypes.objectOf(PropTypes.string),
   username: PropTypes.string
 };
@@ -58,12 +55,6 @@ class Timeline extends PureComponent {
     this.viewSolution = this.viewSolution.bind(this);
   }
 
-  componentDidMount() {
-    if (!Object.keys(this.props.idToNameMap).length) {
-      this.props.fetchChallenges();
-    }
-  }
-
   renderCompletion(completed) {
     const { idToNameMap } = this.props;
     const { id, completedDate, lastUpdated, files } = completed;
@@ -191,4 +182,4 @@ class Timeline extends PureComponent {
 Timeline.displayName = 'Timeline';
 Timeline.propTypes = propTypes;
 
-export default connect(mapStateToProps, mapDispatchToProps)(Timeline);
+export default connect(mapStateToProps)(Timeline);
diff --git a/common/app/routes/Settings/Settings.jsx b/common/app/routes/Settings/Settings.jsx
index 7b56e3fa78..28d4be17d1 100644
--- a/common/app/routes/Settings/Settings.jsx
+++ b/common/app/routes/Settings/Settings.jsx
@@ -13,7 +13,6 @@ import AboutSettings from './components/About-Settings.jsx';
 import InternetSettings from './components/Internet-Settings.jsx';
 import EmailSettings from './components/Email-Settings.jsx';
 import DangerZone from './components/DangerZone.jsx';
-import LanguageSettings from './components/Language-Settings.jsx';
 import CertificationSettings from './components/Cert-Settings.jsx';
 import PortfolioSettings from './components/Portfolio-Settings.jsx';
 import Honesty from './components/Honesty.jsx';
@@ -51,22 +50,11 @@ const mapDispatchToProps = {
 const propTypes = {
   hardGoTo: PropTypes.func.isRequired,
   showLoading: PropTypes.bool,
-  updateMyLang: PropTypes.func,
   updateTitle: PropTypes.func.isRequired,
   username: PropTypes.string
 };
 
 export class Settings extends React.Component {
-  constructor(...props) {
-    super(...props);
-    this.updateMyLang = this.updateMyLang.bind(this);
-  }
-
-  updateMyLang(e) {
-    e.preventDefault();
-    const lang = e.target.value;
-    this.props.updateMyLang(lang);
-  }
 
   componentWillMount() {
     this.props.updateTitle('Settings');
@@ -115,16 +103,14 @@ export class Settings extends React.Component {
         <Spacer />
         <EmailSettings />
         <Spacer />
-        <LanguageSettings />
-        <Spacer />
         <InternetSettings />
         <Spacer />
         <PortfolioSettings />
         <Spacer />
-        <CertificationSettings />
-        <Spacer />
         <Honesty />
         <Spacer />
+        <CertificationSettings />
+        <Spacer />
         <DangerZone />
       </div>
     );
diff --git a/common/app/routes/Settings/components/Cert-Settings.jsx b/common/app/routes/Settings/components/Cert-Settings.jsx
index c926c4cb51..2e3d1c0c2a 100644
--- a/common/app/routes/Settings/components/Cert-Settings.jsx
+++ b/common/app/routes/Settings/components/Cert-Settings.jsx
@@ -13,7 +13,6 @@ import SectionHeader from './SectionHeader.jsx';
 import { projectsSelector } from '../../../entities';
 import { claimCert, updateUserBackend } from '../redux';
 import {
-  fetchChallenges,
   userSelector,
   hardGoTo,
   createErrorObservable
@@ -72,7 +71,6 @@ function mapDispatchToProps(dispatch) {
   return bindActionCreators({
     claimCert,
     createError: createErrorObservable,
-    fetchChallenges,
     hardGoTo,
     updateUserBackend
   }, dispatch);
@@ -96,7 +94,6 @@ const propTypes = {
   blockNameIsCertMap: PropTypes.objectOf(PropTypes.bool),
   claimCert: PropTypes.func.isRequired,
   createError: PropTypes.func.isRequired,
-  fetchChallenges: PropTypes.func.isRequired,
   hardGoTo: PropTypes.func.isRequired,
   legacyProjects: projectsTypes,
   modernProjects: projectsTypes,
@@ -121,13 +118,6 @@ class CertificationSettings extends PureComponent {
     this.handleSubmit = this.handleSubmit.bind(this);
   }
 
-  componentDidMount() {
-    const { modernProjects } = this.props;
-    if (!modernProjects.length) {
-      this.props.fetchChallenges();
-    }
-  }
-
   buildProjectForms({
     projectBlockName,
     challenges,
diff --git a/common/app/routes/Settings/components/Language-Settings.jsx b/common/app/routes/Settings/components/Language-Settings.jsx
deleted file mode 100644
index 16b46be826..0000000000
--- a/common/app/routes/Settings/components/Language-Settings.jsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import { createSelector } from 'reselect';
-import { reduxForm } from 'redux-form';
-import {
-  FormControl,
-  FormGroup,
-  ControlLabel,
-  Row,
-  Col
-} from 'react-bootstrap';
-
-import { updateMyLang } from '../redux';
-import { userSelector } from '../../../redux';
-import langs from '../../../../utils/supported-languages';
-import { FullWidthRow } from '../../../helperComponents';
-import SectionHeader from './SectionHeader.jsx';
-
-const propTypes = {
-  fields: PropTypes.object,
-  handleSubmit: PropTypes.func.isRequired,
-  updateMyLang: PropTypes.func.isRequired
-};
-
-const mapStateToProps = createSelector(
-  userSelector,
-  ({ languageTag }) => ({
-    // send null to prevent redux-form from initialize empty
-    initialValues: languageTag ? { lang: languageTag } : null
-  })
-);
-const mapDispatchToProps = { updateMyLang };
-const fields = [ 'lang' ];
-const validator = values => {
-  if (!langs[values.lang]) {
-    return { lang: `${values.lang} is unsupported` };
-  }
-  return {};
-};
-const options = [(
-    <option
-      disabled={ true }
-      key='default'
-      value='not-the-momma'
-      >
-      Preferred Language
-    </option>
-  ),
-  ...Object.keys(langs).map(tag => {
-    return (
-      <option
-        key={ tag }
-        value={ tag }
-        >
-        { langs[tag] }
-      </option>
-    );
-  }), (
-    <option
-      disabled={ true }
-      key='more'
-      >
-      More to come...
-    </option>
-  )
-];
-
-export class LanguageSettings extends React.Component {
-  constructor(...props) {
-    super(...props);
-    this.handleChange = this.handleChange.bind(this);
-  }
-  componentWillUnmount() {
-    // make sure to clear timeout if it exist
-    if (this.timeout) {
-      clearTimeout(this.timeout);
-    }
-  }
-
-  handleChange(e) {
-    e.preventDefault();
-    this.props.fields.lang.onChange(e);
-    // give redux-form HOC state time to catch up before
-    // attempting to submit
-    this.timeout = setTimeout(
-      () => this.props.handleSubmit(this.props.updateMyLang)(),
-      0
-    );
-  }
-
-  render() {
-    const {
-      fields: { lang: { name, value } }
-    } = this.props;
-    return (
-      <div>
-        <SectionHeader>
-          Language Settings
-        </SectionHeader>
-        <FullWidthRow>
-          <FormGroup>
-            <Row>
-              <Col sm={ 4 } xs={ 12 }>
-                <ControlLabel htmlFor={ name }>
-                  Preferred Language for Challenges
-                </ControlLabel>
-              </Col>
-              <Col sm={ 8 } xs={ 12 }>
-                <FormControl
-                  className='btn btn-block btn-primary btn-lg'
-                  componentClass='select'
-                  id={ name }
-                  name={ name }
-                  onChange={ this.handleChange }
-                  style={{ height: '45px' }}
-                  value={ value }
-                  >
-                  { options }
-                </FormControl>
-              </Col>
-            </Row>
-          </FormGroup>
-        </FullWidthRow>
-      </div>
-    );
-  }
-}
-
-LanguageSettings.displayName = 'LanguageSettings';
-LanguageSettings.propTypes = propTypes;
-
-export default reduxForm(
-  {
-    form: 'lang',
-    fields,
-    validator,
-    overwriteOnInitialValuesChange: false
-  },
-  mapStateToProps,
-  mapDispatchToProps
-)(LanguageSettings);
diff --git a/common/app/routes/Settings/redux/index.js b/common/app/routes/Settings/redux/index.js
index 5814a6d10e..1128f8d008 100644
--- a/common/app/routes/Settings/redux/index.js
+++ b/common/app/routes/Settings/redux/index.js
@@ -34,7 +34,6 @@ export const types = createTypes([
   createAsyncTypes('updateUserBackend'),
   createAsyncTypes('deletePortfolio'),
   createAsyncTypes('updateMyPortfolio'),
-  'updateMyLang',
   'updateNewUsernameValidity',
   createAsyncTypes('validateUsername'),
   createAsyncTypes('refetchChallengeMap'),
@@ -85,10 +84,6 @@ export const updateMyPortfolioError = createAction(
 );
 export const deletePortfolio = createAction(types.deletePortfolio.start);
 export const deletePortfolioError = createAction(types.deletePortfolio.error);
-export const updateMyLang = createAction(
-  types.updateMyLang,
-  (values) => values.lang
-);
 
 export const resetProgress = createAction(types.resetProgress.start);
 export const resetProgressComplete = createAction(types.resetProgress.complete);
diff --git a/common/app/routes/Settings/redux/update-user-epic.js b/common/app/routes/Settings/redux/update-user-epic.js
index 8604e3d1b4..c999aa96f7 100644
--- a/common/app/routes/Settings/redux/update-user-epic.js
+++ b/common/app/routes/Settings/redux/update-user-epic.js
@@ -3,32 +3,25 @@ import { combineEpics, ofType } from 'redux-epic';
 import { pick } from 'lodash';
 import {
   types,
-  onRouteSettings,
   refetchChallengeMap,
   updateUserBackendComplete,
   updateMyPortfolioComplete
 } from './';
 import { makeToast } from '../../../Toasts/redux';
-import { fetchMapUi } from '../../../Map/redux';
 import {
   doActionOnError,
   usernameSelector,
   userSelector,
-  createErrorObservable,
-  challengeSelector,
-  fetchNewBlock
+  createErrorObservable
 } from '../../../redux';
 import {
   updateUserEmail,
-  updateUserLang,
   updateMultipleUserFlags,
   regresPortfolio,
-  optoUpdatePortfolio,
-  resetFullBlocks
+  optoUpdatePortfolio
 } from '../../../entities';
 
 import { postJSON$ } from '../../../../utils/ajax-stream';
-import langs from '../../../../utils/supported-languages';
 
 const endpoints = {
   email: '/update-my-email',
@@ -195,52 +188,9 @@ function updateUserEmailEpic(actions, { getState }) {
     });
 }
 
-export function updateUserLangEpic(actions, { getState }) {
-  const updateLang = actions
-    .filter(({ type, payload }) => (
-      type === types.updateMyLang && !!langs[payload]
-    ))
-    .map(({ payload }) => {
-      const { languageTag } = userSelector(getState());
-      return { lang: payload, oldLang: languageTag };
-    });
-  const ajaxUpdate = updateLang
-    .debounce(250)
-    .flatMap(({ lang, oldLang }) => {
-      const { app: { user: username, csrfToken: _csrf } } = getState();
-      const body = { _csrf, lang };
-      return postJSON$('/update-my-lang', body)
-        .flatMap(({ message }) => {
-          const { block } = challengeSelector(getState());
-          return Observable.of(
-            // show user that we have updated their lang
-            makeToast({ message }),
-            // update url to reflect change
-            onRouteSettings({ lang }),
-            // clear fullBlocks so challenges are fetched in correct language
-            resetFullBlocks(),
-            // refetch current challenge block updated for new lang
-            fetchNewBlock(block),
-            // refetch mapUi in new language
-            fetchMapUi()
-          );
-        })
-        .catch(doActionOnError(() => {
-          return updateUserLang(username, oldLang);
-        }));
-    });
-  const optimistic = updateLang
-    .map(({ lang }) => {
-      const { app: { user: username } } = getState();
-      return updateUserLang(username, lang);
-    });
-  return Observable.merge(ajaxUpdate, optimistic);
-}
-
 export default combineEpics(
   backendUserUpdateEpic,
   refetchChallengeMapEpic,
   updateMyPortfolioEpic,
-  updateUserEmailEpic,
-  updateUserLangEpic
+  updateUserEmailEpic
 );
diff --git a/common/app/routes/index.js b/common/app/routes/index.js
index e007db83d1..36f862f9e9 100644
--- a/common/app/routes/index.js
+++ b/common/app/routes/index.js
@@ -1,35 +1,8 @@
-import { routes as challengesRoutes } from './Challenges';
-import { routes as mapRoutes } from './Map';
 import { routes as settingsRoutes } from './Settings';
 import { routes as profileRoutes } from './Profile';
 
-// import { addLang } from '../utils/lang';
-
-export { createPanesMap } from './Challenges';
-
 export default {
-  ...challengesRoutes,
-  ...mapRoutes,
   ...settingsRoutes,
   // ensure profile routes are last else they hijack other routes
   ...profileRoutes
 };
-
-// export default function createChildRoute(deps) {
-//   return {
-//     path: '/:lang',
-//     indexRoute: {
-//       onEnter(nextState, replace) {
-//         const { lang } = nextState.params;
-//         const { pathname } = nextState.location;
-//         replace(addLang(pathname, lang));
-//       }
-//     },
-//     childRoutes: [
-//       ...challenges(deps),
-//       ...map(deps),
-//       ...settings(deps),
-//       { path: '*', component: NotFound }
-//     ]
-//   };
-// }
diff --git a/common/app/routes/index.less b/common/app/routes/index.less
index 75b2783b84..d852290ad1 100644
--- a/common/app/routes/index.less
+++ b/common/app/routes/index.less
@@ -1,3 +1,2 @@
-&{ @import "./Challenges/challenges.less"; }
 &{ @import "./Profile/profile.less"; }
 &{ @import "./Settings/index.less"; }
diff --git a/common/app/routes/redux.js b/common/app/routes/redux.js
index 737987ea24..d25ff41ad8 100644
--- a/common/app/routes/redux.js
+++ b/common/app/routes/redux.js
@@ -1,11 +1,8 @@
 import { isLocationAction } from 'redux-first-router';
 import { combineReducers } from 'berkeleys-redux-utils';
 
-
-import challengeReducer from './Challenges/redux';
 import profileReducer from './Profile/redux';
 import settingsReducer from './Settings/redux';
-import { routes as challengeRoutes } from './Challenges';
 import { routes as profileRoutes } from './Profile';
 import { routes as settingsRoutes } from './Settings';
 
@@ -18,9 +15,6 @@ export function mainRouter(state = 'NotFound', action) {
     return state;
   }
   const { type } = action;
-  if (challengeRoutes[type]) {
-    return 'challenges';
-  }
   if (settingsRoutes[type]) {
     return 'settings';
   }
@@ -33,7 +27,6 @@ export function mainRouter(state = 'NotFound', action) {
 mainRouter.toString = () => ns;
 
 export default combineReducers(
-  challengeReducer,
   profileReducer,
   settingsReducer,
   mainRouter
diff --git a/common/app/utils/lang.js b/common/app/utils/lang.js
deleted file mode 100644
index f727331f66..0000000000
--- a/common/app/utils/lang.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import
-  supportedLanguages,
-  { langTagRegex }
-from '../../utils/supported-languages';
-
-const toLowerCase = String.prototype.toLowerCase;
-
-export function getLangFromPath(path) {
-  const maybeLang = toLowerCase.call(path.split('/')[1]);
-  if (supportedLanguages[maybeLang]) {
-    return maybeLang;
-  }
-  return 'en';
-}
-
-export function addLang(path, lang, primaryLang) {
-  // if maybeLang is supported continue
-  // if maybeLang is unsupported lang, remove and use lang
-  // if maybeLang is not lang tag, add lang tag.
-  // if both primary and lang are not lang tags default en
-  const maybeLang = toLowerCase.call(path.split('/')[1]);
-  const restUrl = path.split('/').slice(2).join('/');
-
-  if (supportedLanguages[maybeLang]) {
-    return path;
-  }
-
-  if (
-    langTagRegex.test(maybeLang) &&
-    !supportedLanguages[maybeLang]
-  ) {
-    return `/${primaryLang || lang }/${restUrl}`;
-  }
-
-  if (supportedLanguages[primaryLang || lang]) {
-    return `/${primaryLang || lang}${path}`;
-  }
-  return `/en${path}`;
-}
diff --git a/common/app/utils/quotes.js b/common/app/utils/quotes.js
new file mode 100644
index 0000000000..bdc5e35b1f
--- /dev/null
+++ b/common/app/utils/quotes.js
@@ -0,0 +1,143 @@
+const quotes = [
+  {
+    quote: 'Never, never, never, never, never, never give up.',
+    author: 'Winston Churchill'
+  },
+  {
+    quote: 'The pessimist sees difficulty in every opportunity. ' +
+      'The optimist sees opportunity in every difficulty.',
+    author: 'Winston Churchill'
+  },
+  {
+    quote: 'Twenty years from now you you will be more disappointed by the ' +
+      'things that you didn\'t do than by the ones you did do. So throw ' +
+      'off the bowlines. Sail away from the safe harbor. Catch the trade ' +
+      'winds in your sails.',
+    author: 'Mark Twain'
+  },
+  {
+    quote: 'The secret of getting ahead is getting started.',
+    author: 'Mark Twain'
+  },
+  {
+    quote: 'Change your life today. Don’t gamble on the future, act now, ' +
+      'without delay.',
+    author: 'Simone de Beauvoir'
+  },
+  {
+    quote: 'A person who never made a mistake never tried anything new.',
+    author: 'Albert Einstein'
+  },
+  {
+    quote: 'Life is like riding a bicycle. To keep your balance, you must ' +
+      'keep moving.',
+    author: 'Albert Einstein'
+  },
+  {
+    quote: 'Nothing will work unless you do.',
+    author: 'Maya Angelou'
+  },
+  {
+    quote: 'The most difficult thing is the decision to act, the rest is ' +
+      'merely tenacity.',
+    author: 'Amelia Earhart'
+  },
+  {
+    quote: 'When you reach for the stars, you may not quite get them, but ' +
+      'you won\'t come up with a handful of mud, either.',
+    author: 'Leo Burnett'
+  },
+  {
+    quote: 'The only person you are destined to become is the person you ' +
+      'decide to be.',
+    author: 'Ralph Waldo Emerson'
+  },
+  {
+    quote: 'You must do the things you think you cannot do.',
+    author: 'Eleanor Roosevelt'
+  },
+  {
+    quote:
+      'You are never too old to set another goal, or to dream a new dream.',
+    author: 'C.S. Lewis'
+  },
+  {
+    quote: 'Believe you can and you\'re halfway there.',
+    author: 'Theodore Roosevelt'
+  },
+  {
+    quote:
+    'I fear not the man who I fear not the man who has practiced 10,000 ' +
+    'kicks once, but I fear the man who has practiced one kick 10,000 times.',
+    author: 'Bruce Lee'
+  },
+  {
+    quote: 'The way to get started is to quit talking and begin doing.',
+    author: 'Walt Disney'
+  },
+  {
+    quote: 'Don’t let yesterday take up too much of today.',
+    author: 'Will Rodgers'
+  },
+  {
+    quote:
+      'You learn more from failure than from success. Don’t let it stop you.' +
+      ' Failure builds character.',
+    author: 'Annon'
+  },
+  {
+    quote: 'It’s not whether you get knocked down, it’s whether you get up.',
+    author: 'Vince Lombardi'
+  },
+  {
+    quote:
+      'If you are working on something that you really care about, you ' +
+      'don’t have to be pushed. The vision pulls you.',
+    author: 'Steve Jobs'
+  },
+  {
+    quote:
+      'People who are crazy enough to think they can change the world, are ' +
+      'the ones who do.',
+    author: 'Rob Siltanen'
+  },
+  {
+    quote:
+      'Failure will never overtake me if my determination to succeed is ' +
+      'strong enough.',
+    author: 'Og Mandino'
+  },
+  {
+    quote: 'We may encounter many defeats, but we must not be defeated.',
+    author: 'Maya Angelou'
+  },
+  {
+    quote:
+      'Knowing is not enough; we must apply. Wishing is not enough; we must ' +
+      'do.',
+    author: 'Johann Wolfgang von Goethe'
+  },
+  {
+    quote: 'Whether you think you can or think you can’t, you’re right.',
+    author: 'Henry Ford'
+  },
+  {
+    quote:
+      'The only limit to our realization of tomorrow, will be our doubts of ' +
+      'today.',
+    author: 'Franklin D. Roosevelt'
+  },
+  {
+    quote:
+      'You don’t have to be great to start, but you have to start to be great.',
+    author: 'Zig Ziglar'
+  },
+  {
+    quote: 'Today’s accomplishments were yesterday’s impossibilities.',
+    author: 'Robert H. Schuller'
+  }
+];
+
+export function getRandomQuote() {
+  return quotes[Math.floor(Math.random() * quotes.length)];
+}
diff --git a/common/app/utils/redux-first-router.js b/common/app/utils/redux-first-router.js
deleted file mode 100644
index e03cabf4a0..0000000000
--- a/common/app/utils/redux-first-router.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import invariant from 'invariant';
-import { redirect as createRedirect } from 'redux-first-router';
-
-import routesMap from '../routes-map.js';
-import { langSelector } from '../Router/redux';
-
-export function onBeforeChange(dispatch, getState, action) {
-  const route = routesMap[action.type];
-  const lang = langSelector(getState());
-  if (route && route.redirect) {
-    invariant(
-      typeof route.redirect === 'function',
-      `
-        route redirect should be a function but got %s
-        check the redirect method of route %s
-      `,
-      route.redirect,
-      route
-    );
-    return dispatch(createRedirect(route.redirect({ lang })));
-  }
-  return action;
-}
-
-// prevent function from serializing during SSR
-onBeforeChange.toString = () => 'onBeforeChange';
diff --git a/common/models/user.json b/common/models/user.json
index 18949a58ec..bbe76f9d31 100644
--- a/common/models/user.json
+++ b/common/models/user.json
@@ -97,10 +97,6 @@
       "type": "string",
       "default": ""
     },
-    "gender": {
-      "type": "string",
-      "default": ""
-    },
     "location": {
       "type": "string",
       "default": ""
@@ -222,6 +218,9 @@
       "description": "A map by ID of all the user completed challenges",
       "default": {}
     },
+    "completedChallengeCount": {
+      "type": "number"
+    },
     "completedChallenges": {
       "type": [
         {
@@ -260,11 +259,6 @@
       "type": "string",
       "default": "default"
     },
-    "languageTag": {
-      "type": "string",
-      "description": "An IETF language tag",
-      "default": "en"
-    },
     "badges": {
       "type": {
         "coreTeam": {
@@ -369,13 +363,6 @@
       "permission": "ALLOW",
       "property": "updateTheme"
     },
-    {
-      "accessType": "EXECUTE",
-      "principalType": "ROLE",
-      "principalId": "$owner",
-      "permission": "ALLOW",
-      "property": "updateLanguage"
-    },
     {
       "accessType": "EXECUTE",
       "principalType": "ROLE",
diff --git a/common/utils/supported-languages.js b/common/utils/supported-languages.js
deleted file mode 100644
index b074d02c43..0000000000
--- a/common/utils/supported-languages.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const langTagRegex = /^[a-z]{2}(?:-[a-zA-Z]{2,3})?$/;
-export default {
-  en: 'English',
-  es: 'Spanish'
-};
diff --git a/package-lock.json b/package-lock.json
index a7fe759ca3..2e501dffe4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16340,6 +16340,22 @@
       "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz",
       "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
     },
+    "rss-parser": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/rss-parser/-/rss-parser-3.1.2.tgz",
+      "integrity": "sha512-mbbLnaxMsFz+2mMpXkOVSecGyCghw+wtBg0IubdVz8N/6jVOpKgImMbWCGQfwH8uRdwyUyeYTN4RpPi6YM6lRQ==",
+      "requires": {
+        "entities": "1.1.1",
+        "xml2js": "0.4.19"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+          "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
+        }
+      }
+    },
     "rst-selector-parser": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
diff --git a/package.json b/package.json
index 3f0c743c25..12d8bbf847 100644
--- a/package.json
+++ b/package.json
@@ -139,6 +139,7 @@
     "redux-form": "^5.2.3",
     "request": "^2.65.0",
     "reselect": "^3.0.0",
+    "rss-parser": "^3.1.2",
     "rx": "^4.1.0",
     "rx-dom": "^7.0.3",
     "sanitize-html": "^1.11.1",
diff --git a/server/boot/authentication.js b/server/boot/authentication.js
index 0562d01146..100880e0a4 100644
--- a/server/boot/authentication.js
+++ b/server/boot/authentication.js
@@ -239,6 +239,6 @@ module.exports = function enableAuthentication(app) {
     postPasswordlessAuth
   );
 
-  app.use('/:lang', router);
+  app.use(router);
   app.use(api);
 };
diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index 536af52bcf..30a887fe86 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -134,7 +134,7 @@ export default function(app) {
   router.get('/map', redirectToLearn);
 
   app.use(api);
-  app.use('/:lang', router);
+  app.use(router);
 
   function modernChallengeCompleted(req, res, next) {
     const type = accepts(req).type('html', 'json', 'text');
@@ -372,7 +372,7 @@ export default function(app) {
         return `${learnURL}/${dasherize(superBlock)}/${block}/${dashedName}`;
       })
       .subscribe(
-        redirect => res._oldRedirect(redirect || learnURL),
+        redirect => res.redirect(redirect || learnURL),
         next
       );
   }
@@ -381,8 +381,8 @@ export default function(app) {
     const maybeChallenge = _.last(req.path.split('/'));
     if (maybeChallenge in pathMigrations) {
       const redirectPath = pathMigrations[maybeChallenge];
-      return res.status(302)._oldRedirect(`${learnURL}${redirectPath}`);
+      return res.status(302).redirect(`${learnURL}${redirectPath}`);
     }
-    return res.status(302)._oldRedirect(learnURL);
+    return res.status(302).redirect(learnURL);
   }
 }
diff --git a/server/boot/commit.js b/server/boot/commit.js
index 734a5b9019..d5d523217c 100644
--- a/server/boot/commit.js
+++ b/server/boot/commit.js
@@ -82,7 +82,7 @@ export default function commit(app) {
   );
 
   app.use(api);
-  app.use('/:lang', router);
+  app.use(router);
 
   function commitToNonprofit(req, res, next) {
     const { user } = req;
diff --git a/server/boot/home.js b/server/boot/home.js
index 6d2dcc42e7..d32736d63f 100644
--- a/server/boot/home.js
+++ b/server/boot/home.js
@@ -1,44 +1,69 @@
 import { defaultProfileImage } from '../../common/utils/constantStrings.json';
-import supportedLanguages from '../../common/utils/supported-languages';
+import { getRandomQuote } from '../../common/app/utils/quotes';
+import { cachedMap } from '../utils/map';
+// import NewsFeed from '../rss';
 
-const message =
-  'Learn to Code and Help Nonprofits';
+// const news = new NewsFeed();
 
-module.exports = function(app) {
-  var router = app.loopback.Router();
-  router.get('/', addDefaultImage, index);
-  app.use(
-    '/:lang',
-    (req, res, next) => {
-      // add url language to request for all routers
-      req._urlLang = req.params.lang;
-      next();
-    },
-    router
-  );
-
-  app.use(router);
+module.exports = function(app, done) {
+  const { About } = app.models;
+  const router = app.loopback.Router();
+  let challengeCount = 0;
+  cachedMap(app.models)
+    .do(({ entities: { challenge } }) => {
+      challengeCount = Object.keys(challenge).length;
+    })
+    .subscribe(
+      () => {},
+      err => {throw new Error(err);},
+      () => {
+        router.get('/', addDefaultImage, index);
+        app.use(router);
+        done();
+      }
+    );
 
   function addDefaultImage(req, res, next) {
     if (!req.user || req.user.picture) {
       return next();
     }
     return req.user.update$({ picture: defaultProfileImage })
-      .subscribe(
-        () => next(),
-        next
-      );
+    .subscribe(
+      () => next(),
+      next
+    );
   }
 
-  function index(req, res, next) {
-    if (!supportedLanguages[req._urlLang]) {
-      return next();
-    }
-
-    if (req.user) {
-      return res.redirect('/challenges/current-challenge');
-    }
-
-    return res.render('home', { title: message });
-  }
+  function index(req, res) {
+    const { user } = req;
+    const homePage = user ? 'userHome' : 'noUserHome';
+    const { quote, author} = getRandomQuote();
+    const title = user ?
+      `Welcome back ${user.name ? user.name : 'Camper'}` :
+      'Learn to Code and Help Nonprofits';
+    const completedChallengeCount = user && user.completedChallengeCount || 0;
+    const completedProjectCount = user && user.completedProjectCount || 0;
+    const completedCertCount = user && user.completedCertCount || 0;
+    Promise.all([
+      // news.getFeed(),
+      About.getActiveUsersForRendering()
+    ])
+    .then(([
+      // feed,
+      activeUsers
+    ]) => {
+      return res.render(
+        homePage, {
+          activeUsers,
+          author,
+          challengeCount,
+          completedChallengeCount,
+          completedProjectCount,
+          completedCertCount,
+          // feed,
+          quote,
+          title
+        });
+      });
+      }
 };
diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js
index 7419aa6d69..8e79973ccd 100644
--- a/server/boot/randomAPIs.js
+++ b/server/boot/randomAPIs.js
@@ -8,19 +8,18 @@ const githubSecret = process.env.GITHUB_SECRET;
 module.exports = function(app) {
   const router = app.loopback.Router();
   const User = app.models.User;
-  const noLangRouter = app.loopback.Router();
-  noLangRouter.get('/api/github', githubCalls);
-  noLangRouter.get('/chat', chat);
-  noLangRouter.get('/twitch', twitch);
-  noLangRouter.get('/unsubscribe/:email', unsubscribeAll);
-  noLangRouter.get('/unsubscribe-notifications/:email', unsubscribeAll);
-  noLangRouter.get('/unsubscribe-quincy/:email', unsubscribeAll);
-  noLangRouter.get('/submit-cat-photo', submitCatPhoto);
-  noLangRouter.get(
+
+  router.get('/api/github', githubCalls);
+  router.get('/chat', chat);
+  router.get('/twitch', twitch);
+  router.get('/unsubscribe/:email', unsubscribeAll);
+  router.get('/unsubscribe-notifications/:email', unsubscribeAll);
+  router.get('/unsubscribe-quincy/:email', unsubscribeAll);
+  router.get('/submit-cat-photo', submitCatPhoto);
+  router.get(
     '/the-fastest-web-page-on-the-internet',
     theFastestWebPageOnTheInternet
   );
-
   router.get('/unsubscribed', unsubscribed);
   router.get('/nonprofits', nonprofits);
   router.get('/nonprofits-form', nonprofitsForm);
@@ -36,8 +35,7 @@ module.exports = function(app) {
   );
   router.get('/academic-honesty', academicHonesty);
 
-  app.use(noLangRouter);
-  app.use('/:lang', router);
+  app.use(router);
 
   function chat(req, res) {
     res.redirect('https://gitter.im/FreeCodeCamp/FreeCodeCamp');
diff --git a/server/boot/react.js b/server/boot/react.js
index c8d6f84cad..e3d5647f43 100644
--- a/server/boot/react.js
+++ b/server/boot/react.js
@@ -48,10 +48,9 @@ export default function reactSubRouter(app) {
     });
   }
 
-  app.use('/:lang', router);
+  app.use(router);
 
   function serveReactApp(req, res, next) {
-    const { lang } = req;
     const serviceOptions = { req };
     if (req.originalUrl in markupMap) {
       log('sending markup from cache');
@@ -68,7 +67,7 @@ export default function reactSubRouter(app) {
         devtoolsEnhancer({ name: 'server' })
       ],
       history: createMemoryHistory({ initialEntries: [ req.originalUrl ] }),
-      defaultState: { app: { lang } }
+      defaultState: {}
     })
       .filter(({
         location: {
diff --git a/server/boot/settings.js b/server/boot/settings.js
index 0864683219..33e7953094 100644
--- a/server/boot/settings.js
+++ b/server/boot/settings.js
@@ -4,7 +4,6 @@ import {
   ifNoUser401,
   createValidatorErrorHandler
 } from '../utils/middleware';
-import supportedLanguages from '../../common/utils/supported-languages.js';
 import { themes } from '../../common/utils/themes.js';
 import { alertTypes } from '../../common/utils/flash.js';
 
@@ -48,29 +47,6 @@ export default function settingsController(app) {
       );
   }
 
-  function updateMyLang(req, res, next) {
-    const { user, body: { lang } = {} } = req;
-    const langName = supportedLanguages[lang];
-    const update = { languageTag: lang };
-    if (!supportedLanguages[lang]) {
-      return res.json({
-        message: `${lang} is currently unsupported`
-      });
-    }
-    if (user.languageTag === lang) {
-      return res.json({
-        message: `Your language is already set to ${langName}`
-      });
-    }
-    return user.update$(update)
-      .subscribe(
-        () => res.json({
-          message: `Your language has been updated to '${langName}'`
-        }),
-        next
-      );
-  }
-
   const updateMyCurrentChallengeValidators = [
     check('currentChallengeId')
       .isMongoId()
@@ -183,11 +159,6 @@ export default function settingsController(app) {
     createValidatorErrorHandler(alertTypes.danger),
     updateMyCurrentChallenge
   );
-  api.post(
-    '/update-my-lang',
-    ifNoUser401,
-    updateMyLang
-  );
   api.post(
     '/update-my-portfolio',
     ifNoUser401,
diff --git a/server/boot/user.js b/server/boot/user.js
index 1e901c31a7..50f88bfcd6 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -52,7 +52,7 @@ module.exports = function(app) {
     postReportUserProfile
   );
 
-  app.use('/:lang', router);
+  app.use(router);
   app.use(api);
 
   function getAccount(req, res) {
diff --git a/server/boot/z-lang-redirect.js b/server/boot/z-lang-redirect.js
deleted file mode 100644
index 64be437951..0000000000
--- a/server/boot/z-lang-redirect.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import supportedLanguages from '../../common/utils/supported-languages';
-import passThroughs from '../utils/lang-passthrough-urls';
-import accepts from 'accepts';
-// import debug from 'debug';
-
-// const log = debug('fcc:controller:lang-redirect');
-const toLowerCase = String.prototype.toLowerCase;
-
-export default function redirectLang(app) {
-  app.all('*', function(req, res, next) {
-    const accept = accepts(req);
-    const type = accept.type('html', 'json', 'text');
-    const { url, path } = req;
-    const langCode = toLowerCase.call(url.split('/')[1]);
-
-    if (passThroughs[langCode]) {
-      return next();
-    }
-
-    if (!supportedLanguages[langCode]) {
-      // language aware redirect
-      return res.redirect(url);
-    }
-
-    if (type === 'html') {
-      req.flash('danger', `We couldn't find path ${ path }`);
-      return res.render('404', { title: '404'});
-    }
-
-    if (type === 'json') {
-      return res.status('404').json({ error: 'path not found' });
-    }
-
-    res.setHeader('Content-Type', 'text/plain');
-    return res.send('404 path not found');
-  });
-}
diff --git a/server/boot/z-not-found.js b/server/boot/z-not-found.js
new file mode 100644
index 0000000000..0f517f6e67
--- /dev/null
+++ b/server/boot/z-not-found.js
@@ -0,0 +1,22 @@
+import accepts from 'accepts';
+
+export default function fourOhFour(app) {
+  app.all('*', function(req, res) {
+    const accept = accepts(req);
+    const type = accept.type('html', 'json', 'text');
+    const { path } = req;
+
+
+    if (type === 'html') {
+      req.flash('danger', `We couldn't find path ${ path }`);
+      return res.render('404', { title: '404'});
+    }
+
+    if (type === 'json') {
+      return res.status('404').json({ error: 'path not found' });
+    }
+
+    res.setHeader('Content-Type', 'text/plain');
+    return res.send('404 path not found');
+  });
+}
diff --git a/server/component-passport.js b/server/component-passport.js
index f5c925f344..d28e9bee5f 100644
--- a/server/component-passport.js
+++ b/server/component-passport.js
@@ -9,10 +9,21 @@ const passportOptions = {
 
 const fields = {
   progressTimestamps: false,
-  completedChallenges: false,
-  challengeMap: false
+  completedChallenges: false
 };
 
+function getCompletedCertCount(user) {
+  return [
+    'isApisMicroservicesCert',
+    'is2018DataVisCert',
+    'isFrontEndLibsCert',
+    'isInfosecQaCert',
+    'isJsAlgoDataStructCert',
+    'isRespWebDesignCert'
+  ].reduce((sum, key) => user[key] ? sum + 1 : sum, 0);
+
+}
+
 PassportConfigurator.prototype.init = function passportInit(noSession) {
   this.app.middleware('session:after', passport.initialize());
 
@@ -33,8 +44,10 @@ PassportConfigurator.prototype.init = function passportInit(noSession) {
 
     this.userModel.findById(id, { fields }, (err, user) => {
       if (err || !user) {
+       user.challengeMap = {};
         return done(err, user);
       }
+
       return this.app.dataSources.db.connector
         .collection('user')
         .aggregate([
@@ -43,6 +56,25 @@ PassportConfigurator.prototype.init = function passportInit(noSession) {
         ], function(err, [{ points = 1 } = {}]) {
           if (err) { return done(err); }
           user.points = points;
+          let completedChallengeCount = 0;
+          let completedProjectCount = 0;
+          if ('challengeMap' in user) {
+            completedChallengeCount = Object.keys(user.challengeMap).length;
+            Object.keys(user.challengeMap)
+              .map(key => user.challengeMap[key])
+              .forEach(item => {
+                if (
+                  'challengeType' in item &&
+                  (item.challengeType === 3 || item.challengeType === 4)
+                ) {
+                  completedProjectCount++;
+                }
+              });
+          }
+          user.completedChallengeCount = completedChallengeCount;
+          user.completedProjectCount = completedProjectCount;
+          user.completedCertCount = getCompletedCertCount(user);
+          user.challengeMap = {};
           return done(null, user);
         });
     });
diff --git a/server/middleware.json b/server/middleware.json
index a9d377440d..6afd88a9c4 100644
--- a/server/middleware.json
+++ b/server/middleware.json
@@ -55,7 +55,6 @@
     "./middlewares/csp": {},
     "./middlewares/jade-helpers": {},
     "./middlewares/migrate-completed-challenges": {},
-    "./middlewares/add-lang": {},
     "./middlewares/flash-cheaters": {},
     "./middlewares/passport-login": {}
   },
diff --git a/server/middlewares/add-lang.js b/server/middlewares/add-lang.js
deleted file mode 100644
index eb159664aa..0000000000
--- a/server/middlewares/add-lang.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import
-  supportedLanguages,
-  { langTagRegex }
-from '../../common/utils/supported-languages';
-import passthroughs from '../utils/lang-passthrough-urls';
-import debug from 'debug';
-
-const log = debug('fcc:middlewares:lang');
-const toLowerCase = String.prototype.toLowerCase;
-
-// redirect(statusOrUrl: String|Number, url?: String) => Void
-function langRedirect(...args) {
-  const url = args.length === 2 ? args[1] : args[0];
-  const { lang } = this.req;
-  const maybeLang = toLowerCase.call((url.split('/')[1] || ''));
-
-  if (
-    passthroughs[maybeLang] ||
-    supportedLanguages[maybeLang]
-  ) {
-    return this._oldRedirect(...arguments);
-  }
-
-  // if language present add to url
-  if (lang) {
-    return this._oldRedirect(`/${lang}${url}`);
-  }
-
-  // default to english
-  return this._oldRedirect(`/en${url}`);
-}
-
-// prefer url lang over user lang
-// if url lang is not supported move to user lang
-// if user lang is not supported default to english
-export default function addLang() {
-  return function(req, res, next) {
-    const { url, user = {} } = req;
-    const maybeLang = url.split('/')[1];
-    const restUrl = url.split('/').slice(2).join('/');
-    const userLang = user.languageTag;
-    let finalLang;
-    if (supportedLanguages[maybeLang]) {
-      finalLang = maybeLang;
-    } else if (supportedLanguages[userLang]) {
-      finalLang = userLang;
-    } else {
-      finalLang = 'en';
-    }
-    // found url lang tag that is not yet supported
-    // redirect to fix url with supported lang tag
-    if (langTagRegex.test(maybeLang) && !supportedLanguages[maybeLang]) {
-      log(`unsupported lang tag ${maybeLang}`);
-      return res.redirect(`/${finalLang}/${restUrl}`);
-    }
-    res.locals.supportedLanguages = supportedLanguages;
-
-    if (supportedLanguages[finalLang]) {
-      req.lang = finalLang;
-      res.locals.lang = finalLang;
-    }
-
-    res._oldRedirect = res.redirect;
-    res.redirect = langRedirect;
-
-    return next();
-  };
-}
diff --git a/server/middlewares/add-return-to.js b/server/middlewares/add-return-to.js
index 1a74d03d59..e117f9d877 100644
--- a/server/middlewares/add-return-to.js
+++ b/server/middlewares/add-return-to.js
@@ -35,8 +35,8 @@ export default function addReturnToUrl() {
     ) {
       return next();
     }
-    req.session.returnTo = req.originalUrl === '/map-aside' ?
-      '/map' :
+    req.session.returnTo = req.originalUrl.includes('/map') ?
+      '/' :
       req.originalUrl;
     return next();
   };
diff --git a/server/models/about.js b/server/models/about.js
index 58be09b0e4..1ea5037709 100644
--- a/server/models/about.js
+++ b/server/models/about.js
@@ -3,12 +3,17 @@ import { createActiveUsers } from '../utils/about.js';
 
 module.exports = function(About) {
   const activeUsers = createActiveUsers();
-  About.getActiveUsers = function getActiveUsers() {
+  let activeUsersForRendering = 0;
+  About.getActiveUsers = async function getActiveUsers() {
     // converting to promise automatically will subscribe to Observable
     // initiating the sequence above
-    return activeUsers.toPromise();
+    const usersActive = await activeUsers.toPromise();
+    activeUsersForRendering = usersActive;
+    return usersActive;
   };
 
+  About.getActiveUsersForRendering = () => activeUsersForRendering;
+
   About.remoteMethod(
     'getActiveUsers',
     {
diff --git a/server/rss/index.js b/server/rss/index.js
new file mode 100644
index 0000000000..5fd8f2556c
--- /dev/null
+++ b/server/rss/index.js
@@ -0,0 +1,86 @@
+import _ from 'lodash';
+import compareDesc from 'date-fns/compare_desc';
+import debug from 'debug';
+
+import { getMediumFeed } from './medium';
+import { getLybsynFeed } from './lybsyn';
+
+const log = debug('fcc:rss:news-feed');
+
+const fiveMinutes = 1000 * 60 * 5;
+
+class NewsFeed {
+  constructor() {
+
+    this.state = {
+      readyState: false,
+      mediumFeed: [],
+      lybsynFeed: [],
+      combinedFeed: []
+    };
+    this.refreshFeeds();
+
+    setInterval(this.refreshFeeds, fiveMinutes);
+  }
+
+  setState = stateUpdater => {
+    const newState = stateUpdater(this.state);
+    this.state = _.merge({}, this.state, newState);
+    return;
+  }
+
+  refreshFeeds = () => {
+    const currentFeed = this.state.combinedFeed.slice(0);
+    log('grabbing feeds');
+    return Promise.all([
+    getMediumFeed(),
+    getLybsynFeed()
+  ]).then(
+    ([mediumFeed, lybsynFeed]) => this.setState(
+      state => ({
+        ...state,
+        mediumFeed,
+        lybsynFeed
+      })
+    ))
+    .then(() => {
+      log('crossing the streams');
+      const { mediumFeed, lybsynFeed} = this.state;
+      const combinedFeed = [ ...mediumFeed, ...lybsynFeed ].sort((a, b) => {
+        return compareDesc(a.isoDate, b.isoDate);
+      });
+      this.setState(state => ({
+        ...state,
+        combinedFeed,
+        readyState: true
+      }));
+    })
+    .catch(err => {
+      console.log(err);
+      this.setState(state => ({
+        ...state,
+        combinedFeed: currentFeed
+      }));
+    });
+  }
+
+
+    getFeed = () => new Promise((resolve) => {
+      let notReadyCount = 0;
+
+      function waitForReady() {
+        log('notReadyCount', notReadyCount);
+        notReadyCount++;
+        return this.state.readyState || notReadyCount === 5 ?
+          resolve(this.state.combinedFeed) :
+          setTimeout(waitForReady, 100);
+      }
+      log('are we ready?', this.state.readyState);
+      return this.state.readyState ?
+        resolve(this.state.combinedFeed) :
+        setTimeout(waitForReady, 100);
+    })
+
+}
+
+export default NewsFeed;
diff --git a/server/rss/lybsyn.js b/server/rss/lybsyn.js
new file mode 100644
index 0000000000..f4797b74f8
--- /dev/null
+++ b/server/rss/lybsyn.js
@@ -0,0 +1,47 @@
+import http from 'http';
+import _ from 'lodash';
+
+const lybsynFeed = 'http://freecodecamp.libsyn.com/render-type/json';
+
+export function getLybsynFeed() {
+  return new Promise((resolve, reject) => {
+    http.get(lybsynFeed, res => {
+      let raw = '';
+
+      res.on('data', chunk => {
+        raw += chunk;
+      });
+
+      res.on('error', err => reject(err));
+
+      res.on('end', () => {
+        let feed = [];
+
+        try {
+          feed = JSON.parse(raw);
+        } catch (err) {
+          return reject(err);
+        }
+        const items = feed.map(
+          item => _.pick(item, [
+            'full_item_url',
+            'item_title',
+            'release_date',
+            'item_body_short'
+          ])
+        )
+        /* eslint-disable camelcase */
+        .map(({ full_item_url, item_title, release_date, item_body_short}) => ({
+          title: item_title,
+          extract: item_body_short,
+          isoDate: new Date(release_date).toISOString(),
+          link: full_item_url
+        }));
+        /* eslint-enable camelcase */
+        return resolve(items);
+      });
+
+    });
+
+  });
+}
diff --git a/server/rss/medium.js b/server/rss/medium.js
new file mode 100644
index 0000000000..979b4c9fba
--- /dev/null
+++ b/server/rss/medium.js
@@ -0,0 +1,39 @@
+import Parser from 'rss-parser';
+import _ from 'lodash';
+
+const parser = new Parser();
+
+const mediumFeed = 'https://medium.freecodecamp.org/feed';
+
+function getExtract(str) {
+  return str.slice(0, str.indexOf('</p>') + 4);
+}
+
+
+function addResponsiveClass(str) {
+  return str.replace(/\<img/g, '<img class="img-responsive"');
+}
+
+export function getMediumFeed() {
+  return new Promise((resolve, reject) => {
+    parser.parseURL(mediumFeed, (err, feed) => {
+      if (err) {
+        reject(err);
+      }
+
+      const items = feed.items
+        .map(
+          item => _.pick(item, ['title', 'link', 'isoDate', 'content:encoded'])
+        )
+        .map(
+          (item) => ({
+            ...item,
+            extract: getExtract(item['content:encoded'])
+          })
+        )
+        .map(item => _.omit(item, ['content:encoded']))
+        .map(item => ({ ...item, extract: addResponsiveClass(item.extract)}));
+      resolve(items);
+    });
+  });
+}
diff --git a/server/services/challenge.js b/server/services/challenge.js
index 53b92fbdb2..6804ae153e 100644
--- a/server/services/challenge.js
+++ b/server/services/challenge.js
@@ -2,7 +2,7 @@ import debug from 'debug';
 import { pickBy } from 'lodash';
 import { Observable } from 'rx';
 
-import { cachedMap, getMapForLang, getChallenge } from '../utils/map';
+import { cachedMap, getChallenge } from '../utils/map';
 import { shapeChallenges } from '../../common/app/redux/utils';
 
 const log = debug('fcc:services:challenge');
@@ -15,11 +15,11 @@ export default function getChallengesForBlock(app) {
     read: function readChallengesForBlock(
         req,
         resource,
-        { dashedName, blockName, lang = 'en' } = {},
+        { dashedName, blockName} = {},
         config,
         cb
       ) {
-      const getChallengeBlock$ = challengeMap.map(getMapForLang(lang))
+      const getChallengeBlock$ = challengeMap
         .flatMap(({
           result: { superBlocks },
           entities: {
@@ -46,7 +46,7 @@ export default function getChallengesForBlock(app) {
         });
       return Observable.if(
         () => !!dashedName,
-        getChallenge(dashedName, blockName, challengeMap, lang),
+        getChallenge(dashedName, blockName, challengeMap, 'en'),
         getChallengeBlock$
       )
         .subscribe(
diff --git a/server/services/mapUi.js b/server/services/mapUi.js
index adb313b006..e3a309cc7e 100644
--- a/server/services/mapUi.js
+++ b/server/services/mapUi.js
@@ -1,23 +1,17 @@
 import debug from 'debug';
 import { Observable } from 'rx';
 
-import { cachedMap, getMapForLang } from '../utils/map';
+import { cachedMap } from '../utils/map';
 
 const log = debug('fcc:services:mapUi');
 
 
 export default function mapUiService(app) {
-  const supportedLangMap = {};
   const challengeMap = cachedMap(app.models);
   return {
     name: 'map-ui',
-    read: function readMapUi(req, resource, { lang = 'en' } = {}, config, cb) {
-      log(`generating mapUi for ${lang}`);
-      if (lang in supportedLangMap) {
-        log(`using cache for ${lang} map`);
-        return cb(null, supportedLangMap[lang]);
-      }
-      return challengeMap.map(getMapForLang(lang))
+    read: function readMapUi(req, resource, _, config, cb) {
+      return challengeMap
         .flatMap(({
           result: { superBlocks },
           entities: {
@@ -82,7 +76,6 @@ export default function mapUiService(app) {
               challenge: challengeMap
             }
           };
-          supportedLangMap[lang] = mapUi;
           return Observable.of(mapUi);
         }).subscribe(
           mapUi => cb(null, mapUi ),
diff --git a/server/utils/map.js b/server/utils/map.js
index 99b67d159a..7693d719a8 100644
--- a/server/utils/map.js
+++ b/server/utils/map.js
@@ -2,7 +2,6 @@ import _ from 'lodash';
 import { Observable } from 'rx';
 
 import { unDasherize, nameify } from '../utils';
-import supportedLanguages from '../../common/utils/supported-languages';
 import {
   addNameIdMap as _addNameIdToMap,
   checkMapData,
@@ -118,42 +117,6 @@ export function _cachedMap({ Block, Challenge }) {
 
 export const cachedMap = _.once(_cachedMap);
 
-export function mapChallengeToLang(
-  { translations = {}, ...challenge },
-  lang
-) {
-  if (!supportedLanguages[lang]) {
-    lang = 'en';
-  }
-  const translation = translations[lang] || {};
-  const isTranslated = Object.keys(translation).length > 0;
-  if (lang !== 'en') {
-    challenge = {
-      ...challenge,
-      ...translation,
-      isTranslated
-    };
-  }
-  return {
-    ...challenge,
-    isTranslated
-  };
-}
-
-export function getMapForLang(lang) {
-  return ({ entities: { challenge: challengeMap, ...entities }, result }) => {
-    entities.challenge = Object.keys(challengeMap)
-      .reduce((translatedChallengeMap, key) => {
-        translatedChallengeMap[key] = mapChallengeToLang(
-          challengeMap[key],
-          lang
-        );
-        return translatedChallengeMap;
-      }, {});
-    return { result, entities };
-  };
-}
-
 // type ObjectId: String;
 // getChallengeById(
 //   map: Observable[map],
@@ -208,9 +171,7 @@ function loadComingSoonOrBetaChallenge({
 export function getChallenge(
   challengeDashedName,
   blockDashedName,
-  map,
-  lang
-) {
+  map) {
   return map
     .flatMap(({ entities, result: { superBlocks } }) => {
       const superBlock = entities.superBlock;
@@ -233,7 +194,7 @@ export function getChallenge(
           entities: {
             superBlock,
             challenge: {
-              [challenge.dashedName]: mapChallengeToLang(challenge, lang)
+              [challenge.dashedName]: challenge
             }
           },
           result: {
diff --git a/server/utils/publicUserProps.js b/server/utils/publicUserProps.js
index 36a153234d..5016d960a0 100644
--- a/server/utils/publicUserProps.js
+++ b/server/utils/publicUserProps.js
@@ -43,7 +43,6 @@ export const userPropsForSession = [
   'currentChallengeId',
   'email',
   'id',
-  'languageTag',
   'sendQuincyEmail',
   'theme'
 ];
diff --git a/server/views/homePartials/activeUsersScript.jade b/server/views/homePartials/activeUsersScript.jade
new file mode 100644
index 0000000000..9e0d7fbc2f
--- /dev/null
+++ b/server/views/homePartials/activeUsersScript.jade
@@ -0,0 +1,14 @@
+script.
+  $(document).ready(function getActiveUsers() {
+    setInterval(function getActiveUsersInterval() {
+      $.ajax({
+        type        : 'GET',
+        url         : '/api/about/get-active-users',
+      })
+      .done(function({ activeUsers }) {
+        document.getElementById('active-user-count').innerHTML = `
+          <h3><span class='green-text'>${activeUsers}</span> people are using freeCodeCamp right now</h3>
+        `;
+      })
+    }, 2000)
+  })
\ No newline at end of file
diff --git a/server/views/homePartials/activeUsersView.jade b/server/views/homePartials/activeUsersView.jade
new file mode 100644
index 0000000000..66c4282470
--- /dev/null
+++ b/server/views/homePartials/activeUsersView.jade
@@ -0,0 +1,4 @@
+#active-user-count
+  h3
+    span.green-text=activeUsers
+    |  people are using freeCodeCamp right now
\ No newline at end of file
diff --git a/server/views/homePartials/newsFeed.jade b/server/views/homePartials/newsFeed.jade
new file mode 100644
index 0000000000..d0ad2461a0
--- /dev/null
+++ b/server/views/homePartials/newsFeed.jade
@@ -0,0 +1,18 @@
+.row
+  .col-xs-12.col-sm-8.col-sm-offset-2
+    h2 News Feed
+    ul.list-group
+      each item in feed
+        li.list-group-item
+          a(href=item.link)
+            h3=item.title
+            div !{item.extract}
+        .spacer
+.row
+  .col-xs-12.col-sm-8.col-sm-offset-2
+    .more-button-container
+      div
+        button.btn.btn-primary.btn-lg(href='https://medium.freecodecamp.org') More Articles
+      div
+        button.btn.btn-primary.btn-lg(href='https://freecodecamp.libsyn.com/') More Podcasts
+
diff --git a/server/views/homePartials/quote.jade b/server/views/homePartials/quote.jade
new file mode 100644
index 0000000000..0a435f4434
--- /dev/null
+++ b/server/views/homePartials/quote.jade
@@ -0,0 +1,6 @@
+.row
+  .col-xs-12.col-sm-8.col-sm-offset-2
+    blockquote.blockquote
+      span=quote
+      footer
+        cite.blockquote-footer=author
\ No newline at end of file
diff --git a/server/views/homePartials/scripts.jade b/server/views/homePartials/scripts.jade
new file mode 100644
index 0000000000..34f9ce1b4b
--- /dev/null
+++ b/server/views/homePartials/scripts.jade
@@ -0,0 +1,3 @@
+script(src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js')
+script(src='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js')
+include activeUsersScript
\ No newline at end of file
diff --git a/server/views/homePartials/stats.jade b/server/views/homePartials/stats.jade
new file mode 100644
index 0000000000..dc913c03ef
--- /dev/null
+++ b/server/views/homePartials/stats.jade
@@ -0,0 +1,26 @@
+.row
+  .col-xs-12.col-sm-8.col-sm-offset-2
+    p.stats
+      | You have completed&nbsp;
+      strong
+        span.green-text=completedChallengeCount
+      | &nbsp;of&nbsp;
+      strong
+        span.green-text=challengeCount
+      | &nbsp;lessons.
+    p.stats
+      | You have built&nbsp;
+      strong
+        span.green-text=completedProjectCount
+      |  out of&nbsp;
+      strong
+        span.green-text 30
+      |  projects
+    p.stats
+      | You have earned&nbsp;
+      strong
+        span.green-text=completedCertCount
+      |  out of&nbsp;
+      strong
+        span.green-text 6
+      |  certifications
\ No newline at end of file
diff --git a/server/views/home.jade b/server/views/noUserHome.jade
similarity index 95%
rename from server/views/home.jade
rename to server/views/noUserHome.jade
index 0fd39620ca..db3db52b16 100644
--- a/server/views/home.jade
+++ b/server/views/noUserHome.jade
@@ -4,6 +4,7 @@ block content
         .row
             h1.landing-heading Learn to code for free.
             .big-break
+            include homePartials/activeUsersView
             .big-break
             .big-break
             .col-xs-12.col-sm-12.col-md-4
@@ -82,3 +83,11 @@ block content
             .col-xs-12.col-sm-8.col-sm-offset-2
                 a.btn.btn-cta.signup-btn.btn-block(href="/signin") Start coding (it's free)
         .big-break
+        .big-break
+        include homePartials/quote
+        .big-break
+        hr
+        .big-break
+        .big-break
+        .big-break
+        include homePartials/scripts
\ No newline at end of file
diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade
index 6b2bf735ae..a866c4ee57 100644
--- a/server/views/partials/navbar.jade
+++ b/server/views/partials/navbar.jade
@@ -4,32 +4,17 @@ nav.navbar.navbar-default.navbar-static-top.nav-height
         button.hamburger.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse')
             .col-xs-12
                 span.hamburger-text Menu
-        a.navbar-brand(href='/challenges/current-challenge')
+        a.navbar-brand(href='/')
             img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg', alt='learn to code javascript at freeCodeCamp logo')
     .collapse.navbar-collapse
         ul.nav.navbar-nav.navbar-right.hamburger-dropdown
             li
-              a(href='/map') Map
-            li.dropdown
-                a.dropdown-toggle(data-toggle='dropdown' role='button' href='#' aria-haspopup='true') Community
-                ul.dropdown-menu
-                    li
-                        a(href='https://gitter.im/freecodecamp/home' target='_blank' rel='noopener') Chat
-                    li
-                        a(href='https://forum.freecodecamp.org', target='_blank' rel='noopener') Forum
-                    li
-                        a(href='https://medium.freecodecamp.org', target='_blank' rel='noopener') Medium
-                    li
-                        a(href='https://youtube.com/freecodecamp', target='_blank' rel='noopener') YouTube
-                    li
-                        a(href='https://forum.freecodecamp.org/t/free-code-camp-city-based-local-groups/19574', target='_blank' rel='noopener') In your city
-                    li
-                        a(href='/about') About
+                a(href='https://learn.freecodecamp.org' target='_blank' rel='noopener') Learn
             li
-                a(href='https://www.freecodecamp.org/donate', target='_blank' rel='noopener') Donate
+                a(href='https://forum.freecodecamp.org', target='_blank' rel='noopener') Forum
             if !user
                 li
                     a(href='/signin') Start Coding
             else
                 li
-                  a(href='/settings') My Profile
+                  a(href='/settings') Settings
diff --git a/server/views/userHome.jade b/server/views/userHome.jade
new file mode 100644
index 0000000000..b1528ff831
--- /dev/null
+++ b/server/views/userHome.jade
@@ -0,0 +1,22 @@
+extends layout
+block content
+	.text-center
+		.row
+			h1.landing-heading=title
+		.big-break
+		include homePartials/activeUsersView
+		.big-break
+		.big-break
+		include homePartials/quote
+		.big-break
+		.big-break
+		include homePartials/stats
+		.big-break
+		.big-break
+		.row
+			.col-xs-12.col-sm-8.col-sm-offset-2
+				a.btn.btn-cta.btn-block.btn-lg.btn-primary(href="/challenges/current-challenge") Go to my next lesson
+		.big-break
+		.big-break
+		.big-break
+		include homePartials/scripts
\ No newline at end of file