diff --git a/public/app/plugins/datasource/mssql/partials/query.editor.html b/public/app/plugins/datasource/mssql/partials/query.editor.html
index 824e5cc0533..4036d7ea756 100644
--- a/public/app/plugins/datasource/mssql/partials/query.editor.html
+++ b/public/app/plugins/datasource/mssql/partials/query.editor.html
@@ -31,10 +31,6 @@
 		</div>
 	</div>
 
-	<div class="gf-form" ng-show="ctrl.showLastQuerySQL">
-		<pre class="gf-form-pre">{{ctrl.lastQueryMeta.sql}}</pre>
-	</div>
-
 	<div class="gf-form"  ng-show="ctrl.showHelp">
 		<pre class="gf-form-pre alert alert-info">Time series:
 - return column named time (in UTC), as a unix time stamp or any sql native date data type. You can use the macros below.
diff --git a/public/app/plugins/datasource/mssql/query_ctrl.ts b/public/app/plugins/datasource/mssql/query_ctrl.ts
index 96103a35fdf..2b17ed45053 100644
--- a/public/app/plugins/datasource/mssql/query_ctrl.ts
+++ b/public/app/plugins/datasource/mssql/query_ctrl.ts
@@ -31,7 +31,7 @@ export class MssqlQueryCtrl extends QueryCtrl {
 
   formats: any[];
   target: MssqlQuery;
-  lastQueryError: string;
+  lastQueryError: string | null;
   showHelp: boolean;
 
   /** @ngInject */
diff --git a/public/app/plugins/datasource/mysql/query_ctrl.ts b/public/app/plugins/datasource/mysql/query_ctrl.ts
index ed06d08b477..3e666f8b75f 100644
--- a/public/app/plugins/datasource/mysql/query_ctrl.ts
+++ b/public/app/plugins/datasource/mysql/query_ctrl.ts
@@ -29,7 +29,7 @@ export class MysqlQueryCtrl extends QueryCtrl {
   static templateUrl = 'partials/query.editor.html';
 
   formats: any[];
-  lastQueryError: string;
+  lastQueryError: string | null;
   showHelp: boolean;
 
   queryModel: MysqlQuery;
diff --git a/public/app/plugins/datasource/postgres/query_ctrl.ts b/public/app/plugins/datasource/postgres/query_ctrl.ts
index 6725d1809b0..d09413e600f 100644
--- a/public/app/plugins/datasource/postgres/query_ctrl.ts
+++ b/public/app/plugins/datasource/postgres/query_ctrl.ts
@@ -28,11 +28,10 @@ WHERE
 export class PostgresQueryCtrl extends QueryCtrl {
   static templateUrl = 'partials/query.editor.html';
 
-  showLastQuerySQL: boolean;
   formats: any[];
   queryModel: PostgresQuery;
   metaBuilder: PostgresMetaQuery;
-  lastQueryError: string;
+  lastQueryError: string | null;
   showHelp: boolean;
   tableSegment: any;
   whereAdd: any;
diff --git a/public/app/plugins/datasource/stackdriver/components/Help.tsx b/public/app/plugins/datasource/stackdriver/components/Help.tsx
index 081a986b4d3..e9622c8093b 100644
--- a/public/app/plugins/datasource/stackdriver/components/Help.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/Help.tsx
@@ -4,7 +4,7 @@ import { Icon } from '@grafana/ui';
 
 export interface Props {
   rawQuery: string;
-  lastQueryError: string;
+  lastQueryError?: string;
   metricDescriptor?: MetricDescriptor;
 }
 
diff --git a/public/app/plugins/panel/text2/module.tsx b/public/app/plugins/panel/text2/module.tsx
index d60e3b09ec3..24f1c93df1a 100644
--- a/public/app/plugins/panel/text2/module.tsx
+++ b/public/app/plugins/panel/text2/module.tsx
@@ -19,15 +19,6 @@ export const plugin = new PanelPlugin<TextOptions>(TextPanel)
         },
         defaultValue: 'markdown',
       })
-      .addStringArray({
-        path: 'strings',
-        name: 'String Array',
-        description: 'list of strings',
-        settings: {
-          placeholder: 'Add a string value (text2 demo)',
-        },
-        defaultValue: ['hello', 'world'],
-      })
       .addTextInput({
         path: 'content',
         name: 'Content',