diff --git a/src/datasource-zabbix/datasource.js b/src/datasource-zabbix/datasource.js
index cd1e2de..ee7d960 100644
--- a/src/datasource-zabbix/datasource.js
+++ b/src/datasource-zabbix/datasource.js
@@ -433,13 +433,6 @@ function bindFunctionDefs(functionDefs, category) {
   });
 }
 
-function filterFunctionDefs(funcs, category) {
-  let filteredFuncs = _.map(metricFunctions.getCategories()[category]);
-  return _.filter(funcs, func => {
-    return _.includes(filteredFuncs, func.def.name);
-  });
-}
-
 function formatMetric(metricObj) {
   return {
     text: metricObj.name,
@@ -457,7 +450,7 @@ function formatMetric(metricObj) {
  * template variables, for example
  * /CPU $cpu_item.*time/ where $cpu_item is system,user,iowait
  */
-function zabbixTemplateFormat(value, variable) {
+function zabbixTemplateFormat(value) {
   if (typeof value === 'string') {
     return utils.escapeRegex(value);
   }
@@ -466,7 +459,8 @@ function zabbixTemplateFormat(value, variable) {
   return '(' + escapedValues.join('|') + ')';
 }
 
-/** If template variables are used in request, replace it using regex format
+/**
+ * If template variables are used in request, replace it using regex format
  * and wrap with '/' for proper multi-value work. Example:
  * $variable selected as a, b, c
  * We use filter $variable
diff --git a/src/datasource-zabbix/query.controller.js b/src/datasource-zabbix/query.controller.js
index ca271cc..5536d48 100644
--- a/src/datasource-zabbix/query.controller.js
+++ b/src/datasource-zabbix/query.controller.js
@@ -1,4 +1,5 @@
 import {QueryCtrl} from 'app/plugins/sdk';
+import angular from 'angular';
 import _ from 'lodash';
 import * as utils from './utils';
 import * as metricFunctions from './metricFunctions';
diff --git a/src/datasource-zabbix/queryProcessor.service.js b/src/datasource-zabbix/queryProcessor.service.js
index 5f8e8e9..959645b 100644
--- a/src/datasource-zabbix/queryProcessor.service.js
+++ b/src/datasource-zabbix/queryProcessor.service.js
@@ -335,12 +335,6 @@ function getByFilter(list, filter) {
   }
 }
 
-function getFromIndex(index, objids) {
-  return _.map(objids, function(id) {
-    return index[id];
-  });
-}
-
 function convertHistoryPoint(point) {
   // Value must be a number for properly work
   return [
diff --git a/src/datasource-zabbix/utils.js b/src/datasource-zabbix/utils.js
index fbebd5b..01e0932 100644
--- a/src/datasource-zabbix/utils.js
+++ b/src/datasource-zabbix/utils.js
@@ -1,7 +1,6 @@
 import _ from 'lodash';
 import moment from 'moment';
 
-
 /**
  * Expand Zabbix item name
  *
diff --git a/src/datasource-zabbix/zabbixCache.service.js b/src/datasource-zabbix/zabbixCache.service.js
index 9970568..7107654 100644
--- a/src/datasource-zabbix/zabbixCache.service.js
+++ b/src/datasource-zabbix/zabbixCache.service.js
@@ -1,6 +1,5 @@
 import angular from 'angular';
 import _ from 'lodash';
-import * as utils from './utils';
 
 // Use factory() instead service() for multiple datasources support.
 // Each datasource instance must initialize its own cache.