diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d70b75772dec..5cef71ef2454 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1107,7 +1107,6 @@ Note the `y_axis_format` is defined under various section for some charts.
 | `dimension`                     | _N/A_ |       |
 | `end_spatial`                   | _N/A_ |       |
 | `entity`                        | _N/A_ |       |
-| `equal_date_size`               | _N/A_ |       |
 | `expanded_slices`               | _N/A_ |       |
 | `extra_filters`                 | _N/A_ |       |
 | `extruded`                      | _N/A_ |       |
@@ -1162,8 +1161,6 @@ Note the `y_axis_format` is defined under various section for some charts.
 | `order_desc`                    | _N/A_ |       |
 | `page_length`                   | _N/A_ |       |
 | `pandas_aggfunc`                | _N/A_ |       |
-| `partition_limit`               | _N/A_ |       |
-| `partition_threshold`           | _N/A_ |       |
 | `period_ratio_type`             | _N/A_ |       |
 | `perm`                          | _N/A_ |       |
 | `pivot_margins`                 | _N/A_ |       |
@@ -1217,7 +1214,6 @@ Note the `y_axis_format` is defined under various section for some charts.
 | `table_filter`                  | _N/A_ |       |
 | `table_timestamp_format`        | _N/A_ |       |
 | `time_compare`                  | _N/A_ |       |
-| `time_series_option`            | _N/A_ |       |
 | `timed_refresh_immune_slices`   | _N/A_ |       |
 | `toggle_polygons`               | _N/A_ |       |
 | `transpose_pivot`               | _N/A_ |       |
diff --git a/superset-frontend/src/explore/controlPanels/Partition.js b/superset-frontend/src/explore/controlPanels/Partition.js
deleted file mode 100644
index 22d7709bb9bd..000000000000
--- a/superset-frontend/src/explore/controlPanels/Partition.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { t } from '@superset-ui/translation';
-import { NVD3TimeSeries } from './sections';
-
-export default {
-  controlPanelSections: [
-    NVD3TimeSeries[0],
-    {
-      label: t('Time Series Options'),
-      expanded: true,
-      controlSetRows: [['time_series_option']],
-    },
-    {
-      label: t('Chart Options'),
-      expanded: true,
-      controlSetRows: [
-        ['color_scheme', 'label_colors'],
-        ['number_format', 'date_time_format'],
-        ['partition_limit', 'partition_threshold'],
-        ['log_scale', 'equal_date_size'],
-        ['rich_tooltip'],
-      ],
-    },
-    NVD3TimeSeries[1],
-  ],
-};
diff --git a/superset-frontend/src/explore/controlPanels/Partition.jsx b/superset-frontend/src/explore/controlPanels/Partition.jsx
new file mode 100644
index 000000000000..8cb3b9d4c823
--- /dev/null
+++ b/superset-frontend/src/explore/controlPanels/Partition.jsx
@@ -0,0 +1,151 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import { t } from '@superset-ui/translation';
+import { NVD3TimeSeries } from './sections';
+import OptionDescription from '../../components/OptionDescription';
+import { nonEmpty } from '../validators';
+
+export default {
+  controlPanelSections: [
+    NVD3TimeSeries[0],
+    {
+      label: t('Time Series Options'),
+      expanded: true,
+      controlSetRows: [
+        [
+          {
+            name: 'time_series_option',
+            config: {
+              type: 'SelectControl',
+              label: t('Options'),
+              validators: [nonEmpty],
+              default: 'not_time',
+              valueKey: 'value',
+              options: [
+                {
+                  label: t('Not Time Series'),
+                  value: 'not_time',
+                  description: t('Ignore time'),
+                },
+                {
+                  label: t('Time Series'),
+                  value: 'time_series',
+                  description: t('Standard time series'),
+                },
+                {
+                  label: t('Aggregate Mean'),
+                  value: 'agg_mean',
+                  description: t('Mean of values over specified period'),
+                },
+                {
+                  label: t('Aggregate Sum'),
+                  value: 'agg_sum',
+                  description: t('Sum of values over specified period'),
+                },
+                {
+                  label: t('Difference'),
+                  value: 'point_diff',
+                  description: t(
+                    'Metric change in value from `since` to `until`',
+                  ),
+                },
+                {
+                  label: t('Percent Change'),
+                  value: 'point_percent',
+                  description: t(
+                    'Metric percent change in value from `since` to `until`',
+                  ),
+                },
+                {
+                  label: t('Factor'),
+                  value: 'point_factor',
+                  description: t(
+                    'Metric factor change from `since` to `until`',
+                  ),
+                },
+                {
+                  label: t('Advanced Analytics'),
+                  value: 'adv_anal',
+                  description: t('Use the Advanced Analytics options below'),
+                },
+              ],
+              optionRenderer: op => <OptionDescription option={op} />,
+              valueRenderer: op => <OptionDescription option={op} />,
+              description: t('Settings for time series'),
+            },
+          },
+        ],
+      ],
+    },
+    {
+      label: t('Chart Options'),
+      expanded: true,
+      controlSetRows: [
+        ['color_scheme', 'label_colors'],
+        ['number_format', 'date_time_format'],
+        [
+          {
+            name: 'partition_limit',
+            config: {
+              type: 'TextControl',
+              label: t('Partition Limit'),
+              isInt: true,
+              default: '5',
+              description: t(
+                'The maximum number of subdivisions of each group; ' +
+                  'lower values are pruned first',
+              ),
+            },
+          },
+          {
+            name: 'partition_threshold',
+            config: {
+              type: 'TextControl',
+              label: t('Partition Threshold'),
+              isFloat: true,
+              default: '0.05',
+              description: t(
+                'Partitions whose height to parent height proportions are ' +
+                  'below this value are pruned',
+              ),
+            },
+          },
+        ],
+        [
+          'log_scale',
+          {
+            name: 'equal_date_size',
+            config: {
+              type: 'CheckboxControl',
+              label: t('Equal Date Sizes'),
+              default: true,
+              renderTrigger: true,
+              description: t(
+                'Check to force date partitions to have the same height',
+              ),
+            },
+          },
+        ],
+        ['rich_tooltip'],
+      ],
+    },
+    NVD3TimeSeries[1],
+  ],
+};
diff --git a/superset-frontend/src/explore/controls.jsx b/superset-frontend/src/explore/controls.jsx
index 18a90cff373f..fe274b926798 100644
--- a/superset-frontend/src/explore/controls.jsx
+++ b/superset-frontend/src/explore/controls.jsx
@@ -70,7 +70,6 @@ import {
 } from '../modules/utils';
 import * as v from './validators';
 import ColumnOption from '../components/ColumnOption';
-import OptionDescription from '../components/OptionDescription';
 import { DEFAULT_VIEWPORT } from '../explore/components/controls/ViewportControl';
 import { TIME_FILTER_LABELS } from './constants';
 
@@ -2020,80 +2019,6 @@ export const controls = {
     controlName: 'TimeSeriesColumnControl',
   },
 
-  time_series_option: {
-    type: 'SelectControl',
-    label: t('Options'),
-    validators: [v.nonEmpty],
-    default: 'not_time',
-    valueKey: 'value',
-    options: [
-      {
-        label: t('Not Time Series'),
-        value: 'not_time',
-        description: t('Ignore time'),
-      },
-      {
-        label: t('Time Series'),
-        value: 'time_series',
-        description: t('Standard time series'),
-      },
-      {
-        label: t('Aggregate Mean'),
-        value: 'agg_mean',
-        description: t('Mean of values over specified period'),
-      },
-      {
-        label: t('Aggregate Sum'),
-        value: 'agg_sum',
-        description: t('Sum of values over specified period'),
-      },
-      {
-        label: t('Difference'),
-        value: 'point_diff',
-        description: t('Metric change in value from `since` to `until`'),
-      },
-      {
-        label: t('Percent Change'),
-        value: 'point_percent',
-        description: t(
-          'Metric percent change in value from `since` to `until`',
-        ),
-      },
-      {
-        label: t('Factor'),
-        value: 'point_factor',
-        description: t('Metric factor change from `since` to `until`'),
-      },
-      {
-        label: t('Advanced Analytics'),
-        value: 'adv_anal',
-        description: t('Use the Advanced Analytics options below'),
-      },
-    ],
-    optionRenderer: op => <OptionDescription option={op} />,
-    valueRenderer: op => <OptionDescription option={op} />,
-    description: t('Settings for time series'),
-  },
-
-  equal_date_size: {
-    type: 'CheckboxControl',
-    label: t('Equal Date Sizes'),
-    default: true,
-    renderTrigger: true,
-    description: t('Check to force date partitions to have the same height'),
-  },
-
-  partition_limit: {
-    type: 'TextControl',
-    label: t('Partition Limit'),
-    isInt: true,
-    default: '5',
-    description: t(
-      'The maximum number of subdivisions of each group; ' +
-        'lower values are pruned first',
-    ),
-  },
-
   min_radius: {
     type: 'TextControl',
     label: t('Minimum Radius'),
@@ -2120,17 +2045,6 @@ export const controls = {
     ),
   },
 
-  partition_threshold: {
-    type: 'TextControl',
-    label: t('Partition Threshold'),
-    isFloat: true,
-    default: '0.05',
-    description: t(
-      'Partitions whose height to parent height proportions are ' +
-        'below this value are pruned',
-    ),
-  },
-
   line_column: {
     type: 'SelectControl',
     label: t('Lines column'),