diff --git a/public/app/angular/angular_wrappers.ts b/public/app/angular/angular_wrappers.ts
index be939278a09..15159553cd7 100644
--- a/public/app/angular/angular_wrappers.ts
+++ b/public/app/angular/angular_wrappers.ts
@@ -21,7 +21,6 @@ import PageHeader from '../core/components/PageHeader/PageHeader';
 import { MetricSelect } from '../core/components/Select/MetricSelect';
 import { TagFilter } from '../core/components/TagFilter/TagFilter';
 import { HelpModal } from '../core/components/help/HelpModal';
-import { SearchField, SearchResults, SearchResultsFilter } from '../features/search';
 
 const { SecretFormField } = LegacyForms;
 
@@ -49,35 +48,6 @@ export function registerAngularDirectives() {
     'infoBox',
     'infoBoxTitle',
   ]);
-  //Search
-  react2AngularDirective('searchField', SearchField, [
-    'query',
-    'autoFocus',
-    ['onChange', { watchDepth: 'reference' }],
-    ['onKeyDown', { watchDepth: 'reference' }],
-  ]);
-  react2AngularDirective('searchResults', SearchResults, [
-    'results',
-    'editable',
-    'selectors',
-    ['onSelectionChanged', { watchDepth: 'reference' }],
-    ['onTagSelected', { watchDepth: 'reference' }],
-    ['onFolderExpanding', { watchDepth: 'reference' }],
-    ['onToggleSelection', { watchDepth: 'reference' }],
-  ]);
-  react2AngularDirective('searchFilters', SearchResultsFilter, [
-    'allChecked',
-    'canMove',
-    'canDelete',
-    'tagFilterOptions',
-    'selectedStarredFilter',
-    'selectedTagFilter',
-    ['onSelectAllChanged', { watchDepth: 'reference' }],
-    ['deleteItem', { watchDepth: 'reference' }],
-    ['moveTo', { watchDepth: 'reference' }],
-    ['onStarredFilterChange', { watchDepth: 'reference' }],
-    ['onTagFilterChange', { watchDepth: 'reference' }],
-  ]);
   react2AngularDirective('tagFilter', TagFilter, [
     'tags',
     ['onChange', { watchDepth: 'reference' }],
diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts
index f9df9d68291..390715d59e2 100644
--- a/public/app/plugins/datasource/grafana/datasource.ts
+++ b/public/app/plugins/datasource/grafana/datasource.ts
@@ -85,13 +85,6 @@ export class GrafanaDatasource extends DataSourceWithBackend<GrafanaQuery> {
         let channel = templateSrv.replace(target.channel, request.scopedVars);
         const { filter } = target;
 
-        // Help migrate pre-release channel paths saved in dashboards
-        // NOTE: this should be removed before V8 is released
-        if (channel && channel.startsWith('telegraf/')) {
-          channel = 'stream/' + channel;
-          target.channel = channel; // mutate the current query object so it is saved with `stream/` prefix
-        }
-
         const addr = parseLiveChannelAddress(channel);
         if (!isValidLiveChannelAddress(addr)) {
           continue;