diff --git a/package-lock.json b/package-lock.json
index bca6a6e5f8385b1cdab45a86db8298aaa8928eea..83e05ecba575807a392a98369b0a2fd44d70da34 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8207,11 +8207,6 @@
         "warning": "3.0.0"
       }
     },
-    "react-router-redux": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/react-router-redux/-/react-router-redux-4.0.8.tgz",
-      "integrity": "sha1-InQDWWtRUeGCN32rg1tdRfD4BU4="
-    },
     "react-scripts": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-1.1.0.tgz",
diff --git a/package.json b/package.json
index 56dc5e168a3f3ee82ec0a8f0df1a1de48c3bb056..a2ade58588c4430138ca9c806363d56745bddb88 100644
--- a/package.json
+++ b/package.json
@@ -3,13 +3,11 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "history": "^4.7.2",
     "prop-types": "^15.6.0",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
     "react-redux": "^5.0.6",
     "react-router-dom": "^4.2.2",
-    "react-router-redux": "^4.0.8",
     "react-scripts": "1.1.0",
     "redux": "^3.7.2",
     "redux-logger": "^3.0.6",
diff --git a/src/components/Main.js b/src/components/Main.js
index 5b9a98b85935f57c78ee1a3f186858bee99c72e2..c265aecc9a0533913219651d41323745fbe92c58 100644
--- a/src/components/Main.js
+++ b/src/components/Main.js
@@ -3,6 +3,7 @@ import { Switch, Route } from 'react-router-dom';
 import Home from './pages/Home';
 import Roster from './pages/Roster';
 import Schedule from './pages/Schedule';
+import NotFound from './pages/NotFound';
 
 const Main = () => (
   <main>
@@ -10,6 +11,7 @@ const Main = () => (
       <Route exact path='/' component={Home} />
       <Route path='/roster' component={Roster} />
       <Route path='/schedule' component={Schedule} />
+      <Route component={NotFound} />
     </Switch>
   </main>
 );
diff --git a/src/components/pages/NotFound.js b/src/components/pages/NotFound.js
new file mode 100644
index 0000000000000000000000000000000000000000..78aba0dc316410f609b8b1901666bb596e9a18ec
--- /dev/null
+++ b/src/components/pages/NotFound.js
@@ -0,0 +1,9 @@
+import React from 'react';
+
+const NotFound = () => (
+  <div>
+    <p>404: Page not found</p>
+  </div>
+);
+
+export default NotFound;
diff --git a/src/configureStore.js b/src/configureStore.js
index 7e9c2c3b3c6e96e09ea89e37981efc408a12f8a8..cdb2694e8a33c674a7d6a1797037b8cc590f4aba 100644
--- a/src/configureStore.js
+++ b/src/configureStore.js
@@ -1,13 +1,8 @@
 import { createStore, applyMiddleware } from 'redux';
 import thunkMiddleware from 'redux-thunk';
 import { createLogger } from 'redux-logger';
-import { routerMiddleware } from 'react-router-redux';
-import createHistory from 'history/createBrowserHistory';
 import rootReducer from './reducers';
 
-const history = createHistory();
-const routingMiddleware = routerMiddleware(history);
-
 const loggerMiddleware = createLogger();
 
 export default function configureStore(preloadedState) {
@@ -17,7 +12,6 @@ export default function configureStore(preloadedState) {
     applyMiddleware(
       thunkMiddleware,
       loggerMiddleware,
-      routingMiddleware,
     ),
   );
 }
diff --git a/src/index.js b/src/index.js
index 15431486bc654ad1463d094fe740c2c1cfb8bff2..5c90af50cd317252ccbdced3f1a37f4e1e597396 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,8 +2,6 @@ import React from 'react';
 import { render } from 'react-dom';
 import { Provider } from 'react-redux';
 import { BrowserRouter as Router } from 'react-router-dom';
-import createHistory from 'history/createBrowserHistory';
-import { syncHistoryWithStore } from 'react-router-redux';
 
 import configureStore from './configureStore';
 import './index.css';
@@ -11,12 +9,10 @@ import App from './components/App';
 import registerServiceWorker from './registerServiceWorker';
 
 const store = configureStore();
-const browserHistory = createHistory();
-const history = syncHistoryWithStore(browserHistory, store);
 
 render(
   <Provider store={store}>
-    <Router history={history}>
+    <Router>
       <App />
     </Router>
   </Provider>,
diff --git a/src/reducers/index.js b/src/reducers/index.js
index 0275c9d4fa15bdb2a1886fc2833e71740af14d9b..030bd73a735f6d1674b1547089bc51d9ba0b55fa 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -1,9 +1,7 @@
 import { combineReducers } from 'redux';
-import { routerReducer } from 'react-router-redux';
 import TodoReducer from './TodoReducer';
 
 const rootReducer = combineReducers({
-  routing: routerReducer,
   todos: TodoReducer,
 });