diff --git a/client/src/components/continuous/histogramBrush.js b/client/src/components/continuous/histogramBrush.js
index a0d74f6c..68622c6f 100644
--- a/client/src/components/continuous/histogramBrush.js
+++ b/client/src/components/continuous/histogramBrush.js
@@ -49,9 +49,6 @@ class HistogramBrush extends React.Component {
       brush: null
     };
   }
-  componentDidMount() {}
-  componentDidUpdate() {}
-
   calcHistogramCache(nextProps) {
     // recalculate expensive stuff
     const allValuesForContinuousFieldAsArray = _.map(
@@ -80,14 +77,6 @@ class HistogramBrush extends React.Component {
   componentWillMount() {
     this.calcHistogramCache(this.props);
   }
-  componentWillReceiveProps(nextProps) {
-    if (
-      this.props.metadataField !== nextProps.metadataField ||
-      !this.histogramCache.x
-    ) {
-      this.calcHistogramCache(nextProps);
-    }
-  }
 
   onBrush(selection, x) {
     return () => {
diff --git a/client/src/components/scatterplot/scatterplot.js b/client/src/components/scatterplot/scatterplot.js
index 8966d20a..b4ae8691 100644
--- a/client/src/components/scatterplot/scatterplot.js
+++ b/client/src/components/scatterplot/scatterplot.js
@@ -123,21 +123,6 @@ class Scatterplot extends React.Component {
       colorBuffer
     });
   }
-  componentWillReceiveProps(nextProps) {
-    if (
-      nextProps.expression &&
-      nextProps.expression.data &&
-      nextProps.scatterplotXXaccessor &&
-      nextProps.scatterplotYYaccessor
-    ) {
-      const scales = this.setupScales(
-        nextProps.expression,
-        nextProps.scatterplotXXaccessor,
-        nextProps.scatterplotYYaccessor
-      );
-      this.setState(scales);
-    }
-  }
   componentDidUpdate(prevProps) {
     if (
       this.state.svg &&
@@ -213,6 +198,22 @@ class Scatterplot extends React.Component {
       this.state.sizeBuffer({ data: sizes, dimension: 1 });
       this.count = cellCount;
     }
+
+    if (
+      this.props.expression &&
+      this.props.expression.data &&
+      this.props.scatterplotXXaccessor &&
+      this.props.scatterplotYYaccessor &&
+      (this.props.scatterplotXXaccessor !== prevProps.scatterplotXXaccessor || // was CLU now FTH1 etc
+        this.props.scatterplotYYaccessor !== prevProps.scatterplotYYaccessor)
+    ) {
+      const scales = this.setupScales(
+        this.props.expression,
+        this.props.scatterplotXXaccessor,
+        this.props.scatterplotYYaccessor
+      );
+      this.setState(scales);
+    }
   }
   setupScales(expression, scatterplotXXaccessor, scatterplotYYaccessor) {
     const xScale = d3