diff --git a/src/app/partials/opentsdb/editor.html b/src/app/partials/opentsdb/editor.html
index 1d237e304a7..673c5a68cc4 100644
--- a/src/app/partials/opentsdb/editor.html
+++ b/src/app/partials/opentsdb/editor.html
@@ -169,152 +169,6 @@
           </li>
         </ul>
 
-        <!-- <ul class="grafana-segment-list" role="menu">
-          <li>
-            <input type="text"
-                   class="input-xlarge grafana-target-segment-input"
-                   ng-model="target.metric"
-                   spellcheck='false'
-                   bs-typeahead="suggestMetrics"
-                   placeholder="metric name"
-                   data-min-length=0 data-items=100
-                   ng-blur="targetBlur()"
-                   >
-            <a bs-tooltip="target.errors.metric"
-               style="color: rgb(229, 189, 28)"
-               ng-show="target.errors.metric">
-              <i class="icon-warning-sign"></i>
-            </a>
-          </li>
-
-          <li>
-            <select ng-model="target.aggregator"
-                    class="grafana-target-segment-input input-small"
-                    ng-options="agg for agg in aggregators"
-                    ng-change="targetBlur()">
-            </select>
-            <a bs-tooltip="target.errors.aggregator"
-               style="color: rgb(229, 189, 28)"
-               ng-show="target.errors.aggregator">
-              <i class="icon-warning-sign"></i>
-            </a>
-          </li>
-
-          <li class="grafana-target-segment">
-              Rate:
-              <input type="checkbox"
-                     class="grafana-target-option-checkbox"
-                     ng-model="target.shouldComputeRate"
-                     ng-change="targetBlur()"
-                     >
-              <span ng-hide="!target.shouldComputeRate">
-                Counter:
-                <input type="checkbox"
-                       class="grafana-target-option-checkbox"
-                       ng-disabled="!target.shouldComputeRate"
-                       ng-model="target.isCounter"
-                       ng-change="targetBlur()"
-                       >
-              </span>
-          </li>
-
-          <li class="grafana-target-segment">
-            Downsample:
-            <input type="checkbox"
-                   class="grafana-target-option-checkbox"
-                   ng-model="target.shouldDownsample"
-                   ng-change="targetBlur(target)"
-                   >
-            <div ng-hide="!target.shouldDownsample">
-              <table>
-                <tr>
-                  <td>
-                    Interval:
-                  </td>
-                  <td>
-                    <input type="text"
-                           class="input-small"
-                           ng-disabled="!target.shouldDownsample"
-                           ng-model="target.downsampleInterval"
-                           ng-change="targetBlur()">
-                  </td>
-                  <td>
-                    <a bs-tooltip="target.errors.downsampleInterval"
-                       style="color: rgb(229, 189, 28)"
-                       ng-show="target.errors.downsampleInterval">
-                      <i class="icon-warning-sign"></i>
-                    </a>
-                  </td>
-                </tr>
-                <tr>
-                  <td>Aggregator:</td>
-                  <td>
-                    <select ng-model="target.downsampleAggregator"
-                            class="grafana-target-segment-input input-small"
-                            ng-options="agg for agg in aggregators"
-                            ng-change="targetBlur()"
-                            >
-                      <option value="">Pick one</option>
-                    </select>
-                  </td>
-                  <td>
-                    <a bs-tooltip="target.errors.downsampleAggregator"
-                       style="color: rgb(229, 189, 28)"
-                       ng-show="target.errors.downsampleAggregator">
-                      <i class="icon-warning-sign"></i>
-                    </a>
-                  </td>
-                </tr>
-              </table>
-            </div>
-          </li>
-
-          <li class="grafana-target-segment">
-              Tags:
-          </li>
-
-          <li>
-            <div>
-              <input type="text"
-                     class="input-small grafana-target-segment-input"
-                     spellcheck='false'
-                     bs-typeahead="suggestTagKeys"
-                     data-min-length=0 data-items=100
-                     ng-model="target.currentTagKey"
-                     placeholder="key">
-              <input type="text"
-                     class="input-small grafana-target-segment-input"
-                     spellcheck='false'
-                     bs-typeahead="suggestTagValues"
-                     data-min-length=0 data-items=100
-                     ng-model="target.currentTagValue"
-                     placeholder="value">
-              <a ng-click="addTag()">
-                <i class="icon-plus-sign"></i>
-              </a>
-              <a bs-tooltip="target.errors.tags"
-                 style="color: rgb(229, 189, 28)"
-                 ng-show="target.errors.tags">
-                <i class="icon-warning-sign"></i>
-              </a>
-            </div>
-            <table ng-hide="_.isEmpty(target.tags)">
-              <tr>
-                <th>Key</th>
-                <th>Value</td>
-              <tr ng-repeat="(key, value) in target.tags track by $index">
-                <td>{{ key }}</td>
-                <td>{{ value }}</td>
-                <td>
-                  <a ng-click="removeTag(key)">
-                    <i class="icon-remove"></i>
-                  </a>
-                </td>
-              </tr>
-            </table>
-          </li>
-        </ul> -->
-
         <div class="clearfix"></div>
       </div>
     </div>