diff --git a/.jshintrc b/.jshintrc
index 22b620c..5c94f7b 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -26,7 +26,7 @@
   "unused": true,
   "maxdepth": 6,
   "maxlen": 140,
-  "esnext": true,
+  "esversion": 8,
 
   "globals": {
     "System": true,
diff --git a/Makefile b/Makefile
index 5105258..f6ceeed 100644
--- a/Makefile
+++ b/Makefile
@@ -43,4 +43,4 @@ clean:
 .PHONY: lint
 lint:
 	yarn lint
-	golint -set_exit_status pkg/...
+	golint -min_confidence=1.1 -set_exit_status pkg/...
diff --git a/pkg/datasource_test.go b/pkg/datasource_test.go
index 9ac424a..756fec5 100644
--- a/pkg/datasource_test.go
+++ b/pkg/datasource_test.go
@@ -113,7 +113,7 @@ func TestBuildResponse(t *testing.T) {
 			},
 		},
 		{
-			name: "Connetion Status Response",
+			name: "Connection Status Response",
 			responseData: connectionTestResponse{
 				ZabbixVersion: "2.4",
 				DbConnectorStatus: &dbConnectionStatus{
diff --git a/src/datasource-zabbix/datasource.js b/src/datasource-zabbix/datasource.js
index a2b1d06..6ad0fb7 100644
--- a/src/datasource-zabbix/datasource.js
+++ b/src/datasource-zabbix/datasource.js
@@ -11,11 +11,11 @@ import { Zabbix } from './zabbix/zabbix';
 import { ZabbixAPIError } from './zabbix/connectors/zabbix_api/zabbixAPICore';
 import {
   DataSourceApi,
-  DataSourceInstanceSettings,
+  // DataSourceInstanceSettings,
 } from '@grafana/ui';
-import { BackendSrv, DataSourceSrv } from '@grafana/runtime';
-import { ZabbixAlertingService } from './zabbixAlerting.service';
-import { ZabbixConnectionTestQuery, ZabbixConnectionInfo, TemplateSrv, TSDBResponse } from './types';
+// import { BackendSrv, DataSourceSrv } from '@grafana/runtime';
+// import { ZabbixAlertingService } from './zabbixAlerting.service';
+// import { ZabbixConnectionTestQuery, ZabbixConnectionInfo, TemplateSrv, TSDBResponse } from './types';
 
 const DEFAULT_ZABBIX_VERSION = 3;
 
diff --git a/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.js b/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.js
index ac449e5..f344d03 100644
--- a/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.js
+++ b/src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.js
@@ -42,7 +42,7 @@ export class ZabbixAPIConnector {
   request(method, params) {
     return this.tsdbRequest(method, params).then(response => {
       const result = this.handleTsdbResponse(response);
-      
+
       return result;
     });
   }
@@ -535,13 +535,13 @@ function filterTriggersByAcknowledge(triggers, acknowledged) {
   }
 }
 
-function isNotAuthorized(message) {
-  return (
-    message === "Session terminated, re-login, please." ||
-    message === "Not authorised." ||
-    message === "Not authorized."
-  );
-}
+// function isNotAuthorized(message) {
+//   return (
+//     message === "Session terminated, re-login, please." ||
+//     message === "Not authorised." ||
+//     message === "Not authorized."
+//   );
+// }
 
 function getSLAInterval(intervalMs) {
   // Too many intervals may cause significant load on the database, so decrease number of resulting points
diff --git a/src/datasource-zabbix/zabbix/zabbix.js b/src/datasource-zabbix/zabbix/zabbix.js
index 551c8c8..677fb62 100644
--- a/src/datasource-zabbix/zabbix/zabbix.js
+++ b/src/datasource-zabbix/zabbix/zabbix.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import * as utils from '../utils';
 import responseHandler from '../responseHandler';
 import { CachingProxy } from './proxy/cachingProxy';
-import { ZabbixNotImplemented } from './connectors/dbConnector';
+// import { ZabbixNotImplemented } from './connectors/dbConnector';
 import { DBConnector } from './connectors/dbConnector';
 import { ZabbixAPIConnector } from './connectors/zabbix_api/zabbixAPIConnector';
 import { SQLConnector } from './connectors/sql/sqlConnector';