diff --git a/examples/deckgl-overlay/src/app.js b/examples/deckgl-overlay/src/app.js
index 4f55eb34..bd3c2117 100644
--- a/examples/deckgl-overlay/src/app.js
+++ b/examples/deckgl-overlay/src/app.js
@@ -3,6 +3,8 @@ import {render} from 'react-dom';
 import DeckGL, {ArcLayer} from 'deck.gl';
 import MapGL from 'react-map-gl';
 
+const TOKEN = ''; // Set your mapbox token here
+
 export default class App extends Component {
   constructor(props) {
     super(props);
@@ -31,7 +33,7 @@ export default class App extends Component {
         height="100%"
         maxPitch={85}
         onViewportChange={this._onViewportChange}
-        mapboxApiAccessToken="<YOUR TOKEN HERE>"
+        mapboxApiAccessToken={TOKEN}
       >
         <DeckGL
           viewState={viewport}
diff --git a/examples/deckgl-overlay/view.js b/examples/deckgl-overlay/view.js
deleted file mode 100644
index e764dc4e..00000000
--- a/examples/deckgl-overlay/view.js
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) 2015 Uber Technologies, Inc.
-
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-import React, {Component} from 'react';
-import PropTypes from 'prop-types';
-import autobind from 'react-autobind';
-import {InteractiveMap} from 'react-map-gl';
-import DeckGL, {ArcLayer} from 'deck.gl';
-import Immutable from 'immutable';
-
-import ScatterplotOverlay from '../additional-overlays/scatterplot-overlay';
-/* global window */
-
-// San Francisco
-import SF_FEATURE from './data/feature-example-sf.json';
-import CITIES from './data/cities.json';
-const location = CITIES[0];
-
-// Example data.
-const locations = Immutable.fromJS(
-  new Array(4000)
-    .fill(0)
-    .map(() => [
-      location.longitude + Math.random() * 0.01,
-      location.latitude + Math.random() * 0.01
-    ])
-);
-
-function buildStyle({fill = 'red', stroke = 'blue'}) {
-  return Immutable.fromJS({
-    version: 8,
-    name: 'Example raster tile source',
-    sources: {
-      'my-geojson-polygon-source': {
-        type: 'geojson',
-        data: SF_FEATURE
-      }
-    },
-    layers: [
-      {
-        id: 'geojson-polygon-fill',
-        source: 'my-geojson-polygon-source',
-        type: 'fill',
-        paint: {'fill-color': fill, 'fill-opacity': 0.4},
-        interactive: true
-      },
-      {
-        id: 'geojson-polygon-stroke',
-        source: 'my-geojson-polygon-source',
-        type: 'line',
-        paint: {'line-color': stroke, 'line-width': 4},
-        interactive: false
-      }
-    ]
-  });
-}
-
-const propTypes = {
-  width: PropTypes.number.isRequired,
-  height: PropTypes.number.isRequired
-};
-
-export default class Example extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      viewport: {
-        latitude: location.latitude,
-        longitude: location.longitude,
-        zoom: 11,
-        bearing: 180,
-        pitch: 60
-      },
-      mapStyle: buildStyle({stroke: '#FF00FF', fill: 'green'})
-    };
-    autobind(this);
-  }
-
-  UNSAFE_componentWillMount() {
-    const colors = ['red', 'green', 'blue'];
-    let i = 0;
-    window.setInterval(
-      function interval() {
-        this.setState({
-          mapStyle: buildStyle({
-            stroke: colors[i % colors.length],
-            fill: colors[(i + 1) % colors.length]
-          })
-        });
-        i = i + 1;
-      }.bind(this),
-      2000
-    );
-  }
-
-  _onViewportChange(opt) {
-    this.setState({viewport: opt});
-  }
-
-  _onClickFeatures(event) {
-    window.console.log(event.features);
-  }
-
-  render() {
-    const viewport = {
-      // mapStyle: this.state.mapStyle,
-      ...this.state.viewport,
-      ...this.props
-    };
-    return (
-      <InteractiveMap
-        {...viewport}
-        maxPitch={85}
-        onViewportChange={this._onViewportChange}
-        onClick={this._onClickFeatures}
-        // setting to `true` should cause the map to flicker because all sources
-        // and layers need to be reloaded without diffing enabled.
-        preventStyleDiffing={false}
-        mapboxApiAccessToken="<YOUR TOKEN HERE>"
-      >
-        <ScatterplotOverlay
-          {...viewport}
-          locations={locations}
-          dotRadius={2}
-          globalOpacity={1}
-          compositeOperation="screen"
-        />
-
-        <DeckGL
-          viewState={viewport}
-          layers={[
-            new ArcLayer({
-              data: [
-                {
-                  sourcePosition: [-122.41669, 37.7853],
-                  targetPosition: [-122.45669, 37.781]
-                }
-              ],
-              strokeWidth: 4,
-              getSourceColor: x => [0, 0, 255],
-              getTargetColor: x => [0, 255, 0]
-            })
-          ]}
-        />
-      </InteractiveMap>
-    );
-  }
-}
-
-Example.propTypes = propTypes;
diff --git a/examples/main/example-container.js b/examples/main/example-container.js
index 8943aa7d..57c6d08b 100644
--- a/examples/main/example-container.js
+++ b/examples/main/example-container.js
@@ -32,7 +32,7 @@ export default class App extends Component {
     };
   }
 
-  UNSAFE_componentWillMount() {
+  componentDidMount() {
     window.onresize = () =>
       this.setState({
         viewport: {
diff --git a/examples/main/views/style-diffing.js b/examples/main/views/style-diffing.js
index 87ea0ce3..0c4fa8c4 100644
--- a/examples/main/views/style-diffing.js
+++ b/examples/main/views/style-diffing.js
@@ -80,7 +80,7 @@ export default class StyleDiffingExample extends Component {
     this._onClick = this._onClick.bind(this);
   }
 
-  UNSAFE_componentWillMount() {
+  componentDidMount() {
     const colors = ['red', 'green', 'blue'];
     let i = 0;
     this._intervalId = window.setInterval(
diff --git a/src/components/interactive-map.js b/src/components/interactive-map.js
index 71756043..60dbf701 100644
--- a/src/components/interactive-map.js
+++ b/src/components/interactive-map.js
@@ -245,14 +245,6 @@ export default class InteractiveMap extends PureComponent<InteractiveMapProps, S
     this._updateInteractiveContext({mapContainer});
   }
 
-  UNSAFE_componentWillUpdate(nextProps: InteractiveMapProps, nextState: State) {
-    this._setControllerProps(nextProps);
-
-    if (nextState.isDragging !== this.state.isDragging) {
-      this._updateInteractiveContext({isDragging: nextState.isDragging});
-    }
-  }
-
   componentWillUnmount() {
     this._eventManager.destroy();
   }
@@ -286,10 +278,11 @@ export default class InteractiveMap extends PureComponent<InteractiveMapProps, S
 
     this._controller.setOptions(props);
 
-    this._updateInteractiveContext({
-      onViewStateChange: props.onViewStateChange,
-      onViewportChange: props.onViewportChange
-    });
+    // Pass callbacks via MapContext
+    // Do not create a new context object because these do not affect render
+    const context = this._interactiveContext;
+    context.onViewportChange = props.onViewportChange;
+    context.onViewStateChange = props.onViewStateChange;
   }
 
   _getFeatures({pos, radius}: {pos: Array<number>, radius: number}) {
@@ -315,6 +308,7 @@ export default class InteractiveMap extends PureComponent<InteractiveMapProps, S
   _onInteractionStateChange = (interactionState: InteractionState) => {
     const {isDragging = false} = interactionState;
     if (isDragging !== this.state.isDragging) {
+      this._updateInteractiveContext({isDragging});
       this.setState({isDragging});
     }
 
@@ -495,6 +489,8 @@ export default class InteractiveMap extends PureComponent<InteractiveMapProps, S
   };
 
   render() {
+    this._setControllerProps(this.props);
+
     const {width, height, style, getCursor} = this.props;
 
     const eventCanvasStyle = Object.assign({position: 'relative'}, style, {