diff --git a/src/components/App.jsx b/src/components/App.jsx
index 45d604d..d02d62e 100644
--- a/src/components/App.jsx
+++ b/src/components/App.jsx
@@ -110,20 +110,6 @@ export default class App extends React.Component {
     this.onLayersChange(changedLayers)
   }
 
-  changeHighlightedLayer(highlight) {
-    const metadata = this.state.mapStyle.metadata || {}
-    const layers = this.state.mapStyle.layers
-    const highlightedLayer = highlight ? layers[this.state.selectedLayerIndex].id : null
-
-    const changedStyle = {
-      ...this.state.mapStyle,
-      metadata: {
-        'maputnik:highlighted_layer': highlightedLayer
-      }
-    }
-    this.onStyleChanged(changedStyle)
-  }
-
   onLayerChanged(layer) {
     const changedLayers = this.state.mapStyle.layers.slice(0)
     const idx = style.indexOfLayer(changedLayers, layer.id)
@@ -188,10 +174,8 @@ export default class App extends React.Component {
       layer={selectedLayer}
       sources={this.state.sources}
       vectorLayers={this.state.vectorLayers}
-      highlightLayer={metadata['maputnik:highlighted_layer'] ? true : false}
       onLayerChanged={this.onLayerChanged.bind(this)}
       onLayerIdChange={this.onLayerIdChange.bind(this)}
-      onHighlightLayerChange={this.changeHighlightedLayer.bind(this)}
     /> : null
 
     return <AppLayout
diff --git a/src/components/layers/LayerEditor.jsx b/src/components/layers/LayerEditor.jsx
index aa63789..5ff2c93 100644
--- a/src/components/layers/LayerEditor.jsx
+++ b/src/components/layers/LayerEditor.jsx
@@ -28,8 +28,6 @@ export default class LayerEditor extends React.Component {
     layer: React.PropTypes.object.isRequired,
     sources: React.PropTypes.object,
     vectorLayers: React.PropTypes.object,
-    highlightLayer: React.PropTypes.bool,
-    onHighlightLayerChange: React.PropTypes.func,
     onLayerChanged: React.PropTypes.func,
     onLayerIdChange: React.PropTypes.func,
   }
@@ -147,13 +145,6 @@ export default class LayerEditor extends React.Component {
           value={this.props.layer['source-layer']}
           onChange={v => this.changeProperty(null, 'source-layer', v)}
         />
-        <InputBlock label={"Inspection Mode"}>
-          <MultiButtonInput
-            value={this.props.highlightLayer ? "highlight" : "normal"}
-            options={[["highlight", "Highlight"], ["normal", "Normal"]]}
-            onChange={v => this.props.onHighlightLayerChange(v === "highlight")}
-          />
-        </InputBlock>
       </div>
       case 'properties': return <PropertyGroup
         layer={this.props.layer}