diff --git a/src/sql/workbench/contrib/executionPlan/browser/executionPlanTab.ts b/src/sql/workbench/contrib/executionPlan/browser/executionPlanTab.ts
index 3c37abc0ac..82a67155b0 100644
--- a/src/sql/workbench/contrib/executionPlan/browser/executionPlanTab.ts
+++ b/src/sql/workbench/contrib/executionPlan/browser/executionPlanTab.ts
@@ -16,7 +16,7 @@ import { QueryResultsView } from 'sql/workbench/contrib/query/browser/queryResul
 import { Disposable, dispose } from 'vs/base/common/lifecycle';
 
 export class ExecutionPlanTab implements IPanelTab {
-	public readonly title = localize('executionPlanTitle', "Query Plan (Preview)");
+	public readonly title = localize('executionPlanTitle', "Query Plan");
 	public readonly identifier = 'ExecutionPlan2Tab';
 	public readonly view: ExecutionPlanTabView;
 
diff --git a/src/sql/workbench/contrib/executionPlan/browser/executionPlanTreeTab.ts b/src/sql/workbench/contrib/executionPlan/browser/executionPlanTreeTab.ts
index 0e023715da..3b68845744 100644
--- a/src/sql/workbench/contrib/executionPlan/browser/executionPlanTreeTab.ts
+++ b/src/sql/workbench/contrib/executionPlan/browser/executionPlanTreeTab.ts
@@ -26,7 +26,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { deepClone } from 'vs/base/common/objects';
 
 export class ExecutionPlanTreeTab extends Disposable implements IPanelTab {
-	public readonly title: string = localize('planTreeTab.title', 'Plan Tree (Preview)');
+	public readonly title: string = localize('planTreeTab.title', 'Plan Tree');
 	public readonly identifier: string = 'planTreeTab';
 	public readonly view: ExecutionPlanTreeTabView;
 
diff --git a/src/sql/workbench/contrib/executionPlan/browser/topOperationsTab.ts b/src/sql/workbench/contrib/executionPlan/browser/topOperationsTab.ts
index 223abc6af0..5cff4ea0cb 100644
--- a/src/sql/workbench/contrib/executionPlan/browser/topOperationsTab.ts
+++ b/src/sql/workbench/contrib/executionPlan/browser/topOperationsTab.ts
@@ -34,7 +34,7 @@ import { filterIconClassNames, searchPlaceholder, topOperationsSearchDescription
 const TABLE_SORT_COLUMN_KEY = 'tableCostColumnForSorting';
 
 export class TopOperationsTab extends Disposable implements IPanelTab {
-	public readonly title = localize('topOperationsTabTitle', "Top Operations  (Preview)");
+	public readonly title = localize('topOperationsTabTitle', "Top Operations");
 	public readonly identifier: string = 'TopOperationsTab';
 	public readonly view: TopOperationsTabView;
 
diff --git a/src/sql/workbench/contrib/query/browser/queryEditor.ts b/src/sql/workbench/contrib/query/browser/queryEditor.ts
index 01b9363626..37ccfe27c4 100644
--- a/src/sql/workbench/contrib/query/browser/queryEditor.ts
+++ b/src/sql/workbench/contrib/query/browser/queryEditor.ts
@@ -327,14 +327,18 @@ export class QueryEditor extends EditorPane {
 		}
 
 		// TODO: Allow extensions to contribute toolbar actions.
-		if (previewFeaturesEnabled && providerId === 'MSSQL') {
+		if (providerId === 'MSSQL') {
 			content.push(
 				{ element: Taskbar.createTaskbarSeparator() },
 				{ action: this._estimatedQueryPlanAction },
 				{ action: this._toggleActualExecutionPlanMode },
-				{ action: this._toggleSqlcmdMode },
-				{ action: this._exportAsNotebookAction }
 			);
+			if (previewFeaturesEnabled) {
+				content.push(
+					{ action: this._toggleSqlcmdMode },
+					{ action: this._exportAsNotebookAction }
+				);
+			}
 		}
 
 		this.taskbar.setContent(content);
diff --git a/src/sql/workbench/services/query/common/queryManagement.ts b/src/sql/workbench/services/query/common/queryManagement.ts
index 96e562868a..da19e553dd 100644
--- a/src/sql/workbench/services/query/common/queryManagement.ts
+++ b/src/sql/workbench/services/query/common/queryManagement.ts
@@ -17,8 +17,6 @@ import { ResultSetSubset } from 'sql/workbench/services/query/common/query';
 import { isUndefined } from 'vs/base/common/types';
 import { ILogService } from 'vs/platform/log/common/log';
 import * as nls from 'vs/nls';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { CONFIG_WORKBENCH_ENABLEPREVIEWFEATURES } from 'sql/workbench/common/constants';
 
 export const SERVICE_ID = 'queryManagementService';
 
@@ -123,7 +121,6 @@ export class QueryManagementService implements IQueryManagementService {
 		@IConnectionManagementService private _connectionService: IConnectionManagementService,
 		@IAdsTelemetryService private _telemetryService: IAdsTelemetryService,
 		@ILogService private _logService: ILogService,
-		@IConfigurationService private _configurationService: IConfigurationService
 	) {
 	}
 
@@ -337,7 +334,7 @@ export class QueryManagementService implements IQueryManagementService {
 	public onResultSetUpdated(resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void {
 		this._notify(resultSetInfo.ownerUri, (runner: QueryRunner) => {
 			runner.handleResultSetUpdated(resultSetInfo.resultSetSummary);
-			if (resultSetInfo.executionPlans && this._configurationService.getValue<boolean>(CONFIG_WORKBENCH_ENABLEPREVIEWFEATURES)) {
+			if (resultSetInfo.executionPlans) {
 				runner.handleExecutionPlanAvailable(resultSetInfo.executionPlans);
 			}
 		});