diff --git a/src/actions/index.js b/src/actions/index.js
index 82066d1..5f10662 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -9,7 +9,6 @@ const SOURCES_URL = urlFromEnv('SOURCES_EXT')
 const NARRATIVE_URL = urlFromEnv('NARRATIVE_EXT')
 const SITES_URL = urlFromEnv('SITES_EXT')
 const SHAPES_URL = urlFromEnv('SHAPES_EXT')
-const eventUrlMap = (event) => `${process.env.SERVER_ROOT}${process.env.EVENT_DESC_ROOT}/${(event.id) ? event.id : event}`
 
 const domainMsg = (domainType) => `Something went wrong fetching ${domainType}. Check the URL or try disabling them in the config file.`
 
@@ -60,7 +59,7 @@ export function fetchDomain () {
     let sourcesPromise = Promise.resolve([])
     if (process.env.features.USE_SOURCES) {
       if (!SOURCES_URL) {
-        sourcesPromise = Promise.resolve(makeError('USE_SOURCES is true, but you have not provided a SOURCES_EXT'))
+        sourcesPromise = Promise.resolve(handleError('USE_SOURCES is true, but you have not provided a SOURCES_EXT'))
       } else {
         sourcesPromise = fetch(SOURCES_URL)
           .then(response => response.json())
@@ -278,14 +277,6 @@ export function toggleInfoPopup () {
   }
 }
 
-export const TOGGLE_MAPVIEW = 'TOGGLE_MAPVIEW'
-export function toggleMapView (layer) {
-  return {
-    type: TOGGLE_MAPVIEW,
-    layer
-  }
-}
-
 export const TOGGLE_NOTIFICATIONS = 'TOGGLE_NOTIFICATIONS'
 export function toggleNotifications () {
   return {
diff --git a/src/components/ToolbarBottomActions.jsx b/src/components/ToolbarBottomActions.jsx
index b35990d..14489f5 100644
--- a/src/components/ToolbarBottomActions.jsx
+++ b/src/components/ToolbarBottomActions.jsx
@@ -1,26 +1,18 @@
 import React from 'react';
 
 import SitesIcon from './presentational/Icons/SitesIcon.js';
-import RefreshIcon from './presentational/Icons/RefreshIcon.js';
-import CoeventIcon from './presentational/Icons/CoeventIcon.js';
-import RouteIcon from './presentational/Icons/RouteIcon.js';
+// import RefreshIcon from './presentational/Icons/RefreshIcon.js';
+// import CoeventIcon from './presentational/Icons/CoeventIcon.js';
+// import RouteIcon from './presentational/Icons/RouteIcon.js';
 
 function ToolbarBottomActions (props) {
   function renderMapActions() {
     return (
       <div className="bottom-action-block">
-          {/* <RouteIcon */}
-          {/*   onClick={(view) => this.toggleMapViews(view)} */}
-          {/*   isEnabled={this.props.viewFilters.routes} */}
-          {/* /> */}
         {process.env.features.USE_SITES ? <SitesIcon
           isActive={props.sites.enabled}
           onClickHandler={props.sites.toggle}
         /> : null}
-          {/* <CoeventIcon */}
-          {/*   onClick={(view) => this.toggleMapViews(view)} */}
-          {/*   isEnabled={this.props.viewFilters.coevents} */}
-          {/* /> */}
       </div>
     );
   }
diff --git a/src/components/presentational/Card/Category.js b/src/components/presentational/Card/Category.js
index ab6eb4c..83cda74 100644
--- a/src/components/presentational/Card/Category.js
+++ b/src/components/presentational/Card/Category.js
@@ -1,15 +1,15 @@
-import React from 'react';
+import React from 'react'
 
-import { capitalizeFirstLetter } from '../../../js/utilities.js';
+import { capitalizeFirstLetter } from '../../../js/utilities.js'
 
 const CardCategory = ({ categoryTitle, categoryLabel, color }) => (
-  <div className="card-row card-cell category">
+  <div className='card-row card-cell category'>
     <h4>{categoryTitle}</h4>
     <p>
       {capitalizeFirstLetter(categoryLabel)}
-      <span className='color-category' style={{ background: color }}/>
+      <span className='color-category' style={{ background: color }} />
     </p>
   </div>
-);
+)
 
-export default CardCategory;
+export default CardCategory
diff --git a/src/components/presentational/Card/Location.js b/src/components/presentational/Card/Location.js
index 5025c5b..e828b67 100644
--- a/src/components/presentational/Card/Location.js
+++ b/src/components/presentational/Card/Location.js
@@ -1,30 +1,29 @@
-import React from 'react';
+import React from 'react'
 
-import copy from '../../../js/data/copy.json';
-import { isNotNullNorUndefined } from '../../../js/utilities';
+import copy from '../../../js/data/copy.json'
+import { isNotNullNorUndefined } from '../../../js/utilities'
 
 const CardLocation = ({ language, location }) => {
-
   if (isNotNullNorUndefined(location)) {
     return (
-      <div className="card-cell location">
+      <div className='card-cell location'>
         <p>
-          <i className="material-icons left">location_on</i>
+          <i className='material-icons left'>location_on</i>
           {location}
         </p>
       </div>
-    );
+    )
   } else {
-    const unknown = copy[language].cardstack.unknown_location;
+    const unknown = copy[language].cardstack.unknown_location
     return (
-      <div className="card-cell location">
+      <div className='card-cell location'>
         <p>
-          <i className="material-icons left">location_on</i>
+          <i className='material-icons left'>location_on</i>
           {unknown}
         </p>
       </div>
-    );
+    )
   }
 }
 
-export default CardLocation;
+export default CardLocation
diff --git a/src/components/presentational/Card/Narrative.js b/src/components/presentational/Card/Narrative.js
index adc88f2..150180f 100644
--- a/src/components/presentational/Card/Narrative.js
+++ b/src/components/presentational/Card/Narrative.js
@@ -1,15 +1,15 @@
-import React from 'react';
+import React from 'react'
 
-import CardNarrativeLink from './NarrativeLink';
+import CardNarrativeLink from './NarrativeLink'
 
 const CardNarrative = (props) => (
-  <div className="card-row">
+  <div className='card-row'>
     <h4>Connected events</h4>
-    <div className="card-cell">
-      <p>&larr; <CardNarrativeLink {...props} event={props.next}/></p>
+    <div className='card-cell'>
+      <p>&larr; <CardNarrativeLink {...props} event={props.next} /></p>
       <p>&rarr; <CardNarrativeLink {...props} event={props.prev} /></p>
     </div>
   </div>
-);
+)
 
-export default CardNarrative;
+export default CardNarrative
diff --git a/src/components/presentational/Card/Source.js b/src/components/presentational/Card/Source.js
index 7447ca6..6ebacde 100644
--- a/src/components/presentational/Card/Source.js
+++ b/src/components/presentational/Card/Source.js
@@ -3,11 +3,10 @@ import PropTypes from 'prop-types'
 import Img from 'react-image'
 
 import Spinner from '../Spinner'
-import copy from '../../../js/data/copy.json'
 
 const CardSource = ({ source, isLoading, onClickHandler }) => {
-  function renderIconText(type) {
-    switch(type) {
+  function renderIconText (type) {
+    switch (type) {
       case 'Eyewitness Testimony':
         return 'visibility'
       case 'Government Data':
@@ -29,7 +28,7 @@ const CardSource = ({ source, isLoading, onClickHandler }) => {
 
   if (!source) {
     return (
-      <div className="card-source">
+      <div className='card-source'>
         <div>Error: this source was not found</div>
       </div>
     )
@@ -45,30 +44,30 @@ const CardSource = ({ source, isLoading, onClickHandler }) => {
   }
 
   const fallbackIcon = (
-    <i className="material-icons source-icon">
+    <i className='material-icons source-icon'>
       {renderIconText(source.type)}
     </i>
   )
 
   return (
-    <div className="card-source">
+    <div className='card-source'>
       {isLoading
-          ? <Spinner/>
-          : (
-            <div className="source-row" onClick={() => onClickHandler(source)}>
-              {!!thumbnail ? (
-                <Img
-                  className="source-icon"
-                  src={thumbnail}
-                  loader={<Spinner small />}
-                  unloader={fallbackIcon}
-                  width={30}
-                  height={30}
-                />
-              ) : fallbackIcon}
-             <p>{source.id}</p>
-            </div>
-          )}
+        ? <Spinner />
+        : (
+          <div className='source-row' onClick={() => onClickHandler(source)}>
+            {thumbnail ? (
+              <Img
+                className='source-icon'
+                src={thumbnail}
+                loader={<Spinner small />}
+                unloader={fallbackIcon}
+                width={30}
+                height={30}
+              />
+            ) : fallbackIcon}
+            <p>{source.id}</p>
+          </div>
+        )}
     </div>
   )
 }
@@ -79,7 +78,7 @@ CardSource.propTypes = {
     type: PropTypes.string
   }),
   isLoading: PropTypes.bool,
-  onClickHandler: PropTypes.func.isRequired,
+  onClickHandler: PropTypes.func.isRequired
 }
 
 export default CardSource
diff --git a/src/components/presentational/Card/Summary.js b/src/components/presentational/Card/Summary.js
index ac5bbd2..ea170b4 100644
--- a/src/components/presentational/Card/Summary.js
+++ b/src/components/presentational/Card/Summary.js
@@ -1,19 +1,18 @@
-import React from 'react';
+import React from 'react'
 
-import copy from '../../../js/data/copy.json';
+import copy from '../../../js/data/copy.json'
 
 const CardSummary = ({ language, description, isHighlighted }) => {
-
-  const summary = copy[language].cardstack.description;
+  const summary = copy[language].cardstack.description
 
   return (
-    <div className="card-row summary">
-      <div className="card-cell">
+    <div className='card-row summary'>
+      <div className='card-cell'>
         <h4>{summary}</h4>
         <p>{description}</p>
       </div>
     </div>
-  );
+  )
 }
 
-export default CardSummary;
+export default CardSummary
diff --git a/src/components/presentational/Card/Tags.js b/src/components/presentational/Card/Tags.js
index 2bc4cc4..446d819 100644
--- a/src/components/presentational/Card/Tags.js
+++ b/src/components/presentational/Card/Tags.js
@@ -1,37 +1,36 @@
-import React from 'react';
+import React from 'react'
 
-import copy from '../../../js/data/copy.json';
+import copy from '../../../js/data/copy.json'
 
 const CardTags = ({ tags, language }) => {
-  const tags_lang = copy[language].cardstack.tags;
-  const no_tags_lang = copy[language].cardstack.notags;
+  const tagsLang = copy[language].cardstack.tags
+  const noTagsLang = copy[language].cardstack.notags
 
   if (tags.length > 0) {
     return (
-      <div className="card-row card-cell tags">
-        <h4>{tags_lang}:</h4>
+      <div className='card-row card-cell tags'>
+        <h4>{tagsLang}:</h4>
         <p>
           {tags.map((tag, idx) => {
-              return (
-                <span className="tag">
-                  <small>{tag.name}</small>
-                  {(idx < tags.length - 1)
-                    ? ','
-                    : ''}
-                </span>
-              );
+            return (
+              <span className='tag'>
+                <small>{tag.name}</small>
+                {(idx < tags.length - 1)
+                  ? ','
+                  : ''}
+              </span>
+            )
           })}
         </p>
       </div>
-    );
+    )
   }
   return (
-    <div className="card-row card-cell tags">
-      <h4>{tags_lang}</h4>
-      <p><small>{no_tags_lang}</small></p>
+    <div className='card-row card-cell tags'>
+      <h4>{tagsLang}</h4>
+      <p><small>{noTagsLang}</small></p>
     </div>
-  );
-
+  )
 }
 
-export default CardTags;
+export default CardTags
diff --git a/src/components/presentational/Card/Timestamp.js b/src/components/presentational/Card/Timestamp.js
index 6ac69e6..ee95994 100644
--- a/src/components/presentational/Card/Timestamp.js
+++ b/src/components/presentational/Card/Timestamp.js
@@ -1,34 +1,33 @@
-import React from 'react';
+import React from 'react'
 
-import copy from '../../../js/data/copy.json';
-import { isNotNullNorUndefined } from '../../../js/utilities';
+import copy from '../../../js/data/copy.json'
+import { isNotNullNorUndefined } from '../../../js/utilities'
 
 const CardTimestamp = ({ makeTimelabel, language, timestamp }) => {
-
-  const daytime_lang = copy[language].cardstack.timestamp;
-  const estimated_lang = copy[language].cardstack.estimated;
-  const unknown_lang = copy[language].cardstack.unknown_time;
+  // const daytimeLang = copy[language].cardstack.timestamp
+  // const estimatedLang = copy[language].cardstack.estimated
+  const unknownLang = copy[language].cardstack.unknown_time
 
   if (isNotNullNorUndefined(timestamp)) {
-    const timelabel = makeTimelabel(timestamp);
+    const timelabel = makeTimelabel(timestamp)
     return (
-      <div className="card-cell timestamp">
+      <div className='card-cell timestamp'>
         <p>
-          <i className="material-icons left">today</i>
+          <i className='material-icons left'>today</i>
           {timelabel}
         </p>
       </div>
-    );
+    )
   } else {
     return (
-      <div className="card-cell timestamp">
+      <div className='card-cell timestamp'>
         <p>
-          <i className="material-icons left">today</i>
-          {unknown_lang}
+          <i className='material-icons left'>today</i>
+          {unknownLang}
         </p>
       </div>
-    );
+    )
   }
 }
 
-export default CardTimestamp;
+export default CardTimestamp
diff --git a/src/components/presentational/Icons/CoeventIcon.js b/src/components/presentational/Icons/CoeventIcon.js
index 7ddc2f9..5c88ee1 100644
--- a/src/components/presentational/Icons/CoeventIcon.js
+++ b/src/components/presentational/Icons/CoeventIcon.js
@@ -3,7 +3,6 @@ import React from 'react'
 const CoeventIcon = ({ isEnabled, toggleMapViews }) => {
   return (
     <button
-      className={sitesClass}
       onClick={() => toggleMapViews('coevents')}
     >
       <svg className='coevents' x='0px' y='0px' width='30px' height='20px' viewBox='0 0 30 20' enableBackground='new 0 0 30 20'>
diff --git a/src/components/presentational/Icons/RouteIcon.js b/src/components/presentational/Icons/RouteIcon.js
index d0b9b36..f4600ab 100644
--- a/src/components/presentational/Icons/RouteIcon.js
+++ b/src/components/presentational/Icons/RouteIcon.js
@@ -3,7 +3,6 @@ import React from 'react'
 const RouteIcon = ({ isEnabled, toggleMapViews }) => {
   return (
     <button
-      className={sitesClass}
       onClick={() => toggleMapViews('routes')}
     >
       <svg x='0px' y='0px' width='30px' height='20px' viewBox='0 0 30 20' enableBackground='new 0 0 30 20'>
diff --git a/src/components/presentational/Timeline/Clip.js b/src/components/presentational/Timeline/Clip.js
index 11f4c79..7e6f0b4 100644
--- a/src/components/presentational/Timeline/Clip.js
+++ b/src/components/presentational/Timeline/Clip.js
@@ -1,15 +1,14 @@
-import React from 'react';
+import React from 'react'
 
 const TimelineClip = ({ dims }) => (
-  <clipPath id="clip">
+  <clipPath id='clip'>
     <rect
       x={dims.margin_left}
-      y="0"
+      y='0'
       width={dims.width - dims.margin_left - dims.width_controls}
       height={dims.height - 25}
-    >
-    </rect>
+    />
   </clipPath>
-);
+)
 
-export default TimelineClip;
+export default TimelineClip
diff --git a/src/components/presentational/Timeline/Handles.js b/src/components/presentational/Timeline/Handles.js
index 12e9da9..6786055 100644
--- a/src/components/presentational/Timeline/Handles.js
+++ b/src/components/presentational/Timeline/Handles.js
@@ -1,26 +1,24 @@
-import React from 'react';
+import React from 'react'
 
 const TimelineHandles = ({ dims, onMoveTime }) => {
-
   return (
-    <g className="time-controls-inline">
+    <g className='time-controls-inline'>
       <g
         transform={`translate(${dims.margin_left - 20}, 120)`}
         onClick={() => onMoveTime('backwards')}
       >
-        <circle r="15"></circle>
-        <path d="M0,-7.847549217020565L6.796176979388489,3.9237746085102825L-6.796176979388489,3.9237746085102825Z" transform="rotate(270)"></path>
+        <circle r='15' />
+        <path d='M0,-7.847549217020565L6.796176979388489,3.9237746085102825L-6.796176979388489,3.9237746085102825Z' transform='rotate(270)' />
       </g>
       <g
         transform={`translate(${dims.width - dims.width_controls + 20}, 120)`}
         onClick={() => onMoveTime('forward')}
       >
-        <circle r="15"></circle>
-        <path d="M0,-7.847549217020565L6.796176979388489,3.9237746085102825L-6.796176979388489,3.9237746085102825Z" transform="rotate(90)"></path>
+        <circle r='15' />
+        <path d='M0,-7.847549217020565L6.796176979388489,3.9237746085102825L-6.796176979388489,3.9237746085102825Z' transform='rotate(90)' />
       </g>
     </g>
   )
-
 }
 
-export default TimelineHandles;
+export default TimelineHandles
diff --git a/src/components/presentational/Timeline/Labels.js b/src/components/presentational/Timeline/Labels.js
index 60e260e..f1047b6 100644
--- a/src/components/presentational/Timeline/Labels.js
+++ b/src/components/presentational/Timeline/Labels.js
@@ -1,38 +1,35 @@
-import React from 'react';
+import React from 'react'
 
-import { formatterWithYear } from '../../../js/utilities.js';
+import { formatterWithYear } from '../../../js/utilities.js'
 
 const TimelineLabels = ({ dims, timelabels }) => {
-
   return (
     <g>
       <line
-        class="axisBoundaries"
+        class='axisBoundaries'
         x1={dims.margin_left}
         x2={dims.margin_left}
-        y1="10"
-        y2="20"
-      >
-      </line>
+        y1='10'
+        y2='20'
+      />
       <line
-        class="axisBoundaries"
+        class='axisBoundaries'
         x1={dims.width - dims.width_controls}
         x2={dims.width - dims.width_controls}
-        y1="10"
-        y2="20"
-      >
-      </line>
+        y1='10'
+        y2='20'
+      />
       <text
-        class="timeLabel0 timeLabel"
-        x="5"
-        y="15"
+        class='timeLabel0 timeLabel'
+        x='5'
+        y='15'
       >
         {formatterWithYear(timelabels[0])}
       </text>
       <text
-        class="timelabelF timeLabel"
+        class='timelabelF timeLabel'
         x={dims.width - dims.width_controls - 5}
-        y="15"
+        y='15'
         style={{ textAnchor: 'end' }}
       >
         {formatterWithYear(timelabels[1])}
@@ -41,4 +38,4 @@ const TimelineLabels = ({ dims, timelabels }) => {
   )
 }
 
-export default TimelineLabels;
+export default TimelineLabels
diff --git a/src/reducers/app.js b/src/reducers/app.js
index ab31358..e4d7811 100644
--- a/src/reducers/app.js
+++ b/src/reducers/app.js
@@ -14,7 +14,6 @@ import {
   UPDATE_SOURCE,
   RESET_ALLFILTERS,
   TOGGLE_LANGUAGE,
-  TOGGLE_MAPVIEW,
   TOGGLE_SITES,
   TOGGLE_FETCHING_DOMAIN,
   TOGGLE_FETCHING_SOURCES,
@@ -36,7 +35,7 @@ function updateSelected (appState, action) {
   })
 }
 
-function updateNarrative(appState, action) {
+function updateNarrative (appState, action) {
   let minTime = appState.timeline.range[0]
   let maxTime = appState.timeline.range[1]
 
@@ -159,13 +158,13 @@ function updateCategoryFilters (appState, action) {
   })
 }
 
-function updateTimeRange(appState, action) { // XXX
+function updateTimeRange (appState, action) { // XXX
   return {
     ...appState,
     timeline: {
       ...appState.timeline,
       range: action.timerange
-    },
+    }
   }
 }
 
@@ -190,18 +189,6 @@ function toggleLanguage (appState, action) {
   })
 }
 
-function toggleMapView (appState, action) {
-  const isLayerInView = !appState.views[layer]
-  const newViews = {}
-  newViews[layer] = isLayerInView
-  const views = Object.assign({}, appState.views, newViews)
-  return Object.assign({}, appState, {
-    filters: Object.assign({}, appState.filters, {
-      views
-    })
-  })
-}
-
 function toggleSites (appState, action) {
   return {
     ...appState,
@@ -293,8 +280,6 @@ function app (appState = initial.app, action) {
       return resetAllFilters(appState, action)
     case TOGGLE_LANGUAGE:
       return toggleLanguage(appState, action)
-    case TOGGLE_MAPVIEW:
-      return toggleMapView(appState, action)
     case TOGGLE_SITES:
       return toggleSites(appState, action)
     case FETCH_ERROR:
diff --git a/src/reducers/utils/helpers.js b/src/reducers/utils/helpers.js
index f18adaf..f42b299 100644
--- a/src/reducers/utils/helpers.js
+++ b/src/reducers/utils/helpers.js
@@ -5,7 +5,7 @@ export function parseDateTimes (arrayToParse) {
   arrayToParse.forEach(item => {
     let incomingDateTime = `${item.date}T00:00`
     if (item.time) incomingDateTime = `${item.date}T${item.time}`
-    const parser = d3.timeParse(process.env.incomingDateTime_FORMAT)
+    const parser = d3.timeParse(process.env.INCOMING_DATETIME_FORMAT)
     item.timestamp = d3.timeFormat('%Y-%m-%dT%H:%M:%S')(parser(incomingDateTime))
 
     parsedArray.push(item)
diff --git a/src/reducers/utils/validators.js b/src/reducers/utils/validators.js
index 0d407c5..ad00070 100644
--- a/src/reducers/utils/validators.js
+++ b/src/reducers/utils/validators.js
@@ -62,7 +62,7 @@ export function validateDomain (domain) {
     sources: {},
     tags: {},
     shapes: [],
-    notifications: domain.notifications,
+    notifications: domain.notifications
   }
 
   const discardedDomain = {
@@ -119,11 +119,11 @@ export function validateDomain (domain) {
 
   // NB: [lat, lon] array is best format for projecting into map
   sanitizedDomain.shapes = sanitizedDomain.shapes.map(shape => ({
-      name: shape.name,
-      points: shape.items.map(coords => (
-        coords.replace(/\s/g, '').split(',')
-      ))
-    })
+    name: shape.name,
+    points: shape.items.map(coords => (
+      coords.replace(/\s/g, '').split(',')
+    ))
+  })
   )
 
   // Message the number of failed items in domain
diff --git a/src/selectors/index.js b/src/selectors/index.js
index 839aad7..76a5255 100644
--- a/src/selectors/index.js
+++ b/src/selectors/index.js
@@ -3,7 +3,6 @@ import { parseTimestamp, compareTimestamp, insetSourceFrom } from '../js/utiliti
 
 // Input selectors
 export const getEvents = state => state.domain.events
-export const getLocations = state => state.domain.locations
 export const getCategories = state => state.domain.categories
 export const getNarratives = state => state.domain.narratives
 export const getActiveNarrative = state => state.app.narrative
@@ -86,9 +85,10 @@ function isNoCategories (categories) {
  * returns true/false if the event falls within timeRange
  */
 function isTimeRangedIn (event, timeRange) {
+  const eventTime = parseTimestamp(event.timestamp)
   return (
-    timeRange[0] < parseTimestamp(event.timestamp) &&
-    parseTimestamp(event.timestamp) < timeRange[1]
+    timeRange[0] < eventTime &&
+    eventTime < timeRange[1]
   )
 }
 
diff --git a/src/store/initial.js b/src/store/initial.js
index a59cd1e..f3fa4cc 100644
--- a/src/store/initial.js
+++ b/src/store/initial.js
@@ -79,7 +79,7 @@ const initial = {
         { label: '2 hours', duration: 120 },
         { label: '30 min', duration: 30 },
         { label: '10 min', duration: 10 }
-      ],
+      ]
     },
     flags: {
       isFetchingDomain: false,