diff --git a/application/src/main/data/json/system/widget_types/gateway_configuration.json b/application/src/main/data/json/system/widget_types/gateway_configuration.json
index a19ffc23c3..985426ef94 100644
--- a/application/src/main/data/json/system/widget_types/gateway_configuration.json
+++ b/application/src/main/data/json/system/widget_types/gateway_configuration.json
@@ -8,15 +8,7 @@
     "type": "static",
     "sizeX": 8,
     "sizeY": 6.5,
-    "resources": [
-      {
-        "url": {
-          "entityType": "TB_RESOURCE",
-          "id": "71347080-80b6-11ef-a567-0114914c70f8"
-        },
-        "isModule": true
-      }
-    ],
+    "resources": [],
     "templateHtml": "<tb-gateway-form\n    [ctx]=\"ctx\">\n</tb-gateway-form>\n",
     "templateCss": "",
     "controllerScript": "self.onInit = function() {\n}\n",
diff --git a/application/src/main/data/json/system/widget_types/gateway_configuration__single_device_.json b/application/src/main/data/json/system/widget_types/gateway_configuration__single_device_.json
index 26c804a1a8..a7b3291666 100644
--- a/application/src/main/data/json/system/widget_types/gateway_configuration__single_device_.json
+++ b/application/src/main/data/json/system/widget_types/gateway_configuration__single_device_.json
@@ -8,15 +8,7 @@
     "type": "latest",
     "sizeX": 7.5,
     "sizeY": 9,
-    "resources": [
-      {
-        "url": {
-          "entityType": "TB_RESOURCE",
-          "id": "71347080-80b6-11ef-a567-0114914c70f8"
-        },
-        "isModule": true
-      }
-    ],
+    "resources": [],
     "templateHtml": "<tb-gateway-form\n    [ctx]=\"ctx\"\n    [isStateForm]=\"true\">\n</tb-gateway-form>",
     "templateCss": "#container {\n    overflow: auto;\n}\n\n.tbDatasource-container {\n    margin: 5px;\n    padding: 8px;\n}\n\n.tbDatasource-title {\n    font-size: 1.200rem;\n    font-weight: 500;\n    padding-bottom: 10px;\n}\n\n.tbDatasource-table {\n    width: 100%;\n    box-shadow: 0 0 10px #ccc;\n    border-collapse: collapse;\n    white-space: nowrap;\n    font-size: 1.000rem;\n    color: #757575;\n}\n\n.tbDatasource-table td {\n    position: relative;\n    border-top: 1px solid rgba(0, 0, 0, 0.12);\n    border-bottom: 1px solid rgba(0, 0, 0, 0.12);\n    padding: 0px 18px;\n    box-sizing: border-box;\n}",
     "controllerScript": "self.onInit = function() {\n}\n\n\nself.onDestroy = function() {\n}\n\nself.typeParameters = function() {\n    return {\n        maxDatasources: 1,\t\t\t\n        dataKeysOptional: true,\n        singleEntity: true\n    };\n}\n\n",
diff --git a/application/src/main/data/json/system/widget_types/gateway_connectors.json b/application/src/main/data/json/system/widget_types/gateway_connectors.json
index 6323c32b3c..43f95194b8 100644
--- a/application/src/main/data/json/system/widget_types/gateway_connectors.json
+++ b/application/src/main/data/json/system/widget_types/gateway_connectors.json
@@ -8,15 +8,7 @@
     "type": "latest",
     "sizeX": 11,
     "sizeY": 8,
-    "resources": [
-      {
-        "url": {
-          "entityType": "TB_RESOURCE",
-          "id": "71347080-80b6-11ef-a567-0114914c70f8"
-        },
-        "isModule": true
-      }
-    ],
+    "resources": [],
     "templateHtml": "<tb-gateway-connector [device]=\"entityId\" *ngIf=\"entityId\" [ctx]=\"ctx\"></tb-gateway-connector>",
     "templateCss": "",
     "controllerScript": "self.onInit = function() {\n    if (self.ctx.datasources && self.ctx.datasources.length) {\n        self.ctx.$scope.entityId = self.ctx.datasources[0].entity.id;\n    }\n};\n\nself.onDataUpdated = function() {\n    self.ctx.$scope.gatewayConnectors?.onDataUpdated();\n};\n\nself.typeParameters  = function() {\n    return {\n        dataKeysOptional: true,\n        singleEntity: true\n    };\n}",
diff --git a/application/src/main/data/json/system/widget_types/gateway_custom_statistics.json b/application/src/main/data/json/system/widget_types/gateway_custom_statistics.json
index 1eaa061d11..7090490ea6 100644
--- a/application/src/main/data/json/system/widget_types/gateway_custom_statistics.json
+++ b/application/src/main/data/json/system/widget_types/gateway_custom_statistics.json
@@ -8,15 +8,7 @@
     "type": "timeseries",
     "sizeX": 8,
     "sizeY": 5,
-    "resources": [
-      {
-        "url": {
-          "entityType": "TB_RESOURCE",
-          "id": "71347080-80b6-11ef-a567-0114914c70f8"
-        },
-        "isModule": true
-      }
-    ],
+    "resources": [],
     "templateHtml": "<tb-gateway-statistics [ctx]=ctx></tb-gateway-statistics>",
     "templateCss": ".legend {\n    font-size: 13px;\n    line-height: 10px;\n}\n\n.legend table { \n    border-spacing: 0px;\n    border-collapse: separate;\n}\n\n.mouse-events .flot-overlay {\n    cursor: crosshair; \n}\n\n",
     "controllerScript": "self.onInit = function() {   \n};\n\nself.onDataUpdated = function() {\n};\n\nself.onLatestDataUpdated = function() {\n};\n\nself.onResize = function() {\n};\n\nself.onEditModeChanged = function() {\n};\n\nself.onDestroy = function() {\n};\n\nself.typeParameters = function() {\n    return {\n        hasAdditionalLatestDataKeys: false,\n        dataKeysOptional: true\n    };\n}\n",
diff --git a/application/src/main/data/json/system/widget_types/gateway_general_chart_statistics.json b/application/src/main/data/json/system/widget_types/gateway_general_chart_statistics.json
index 37a16fa7ba..7e1974d5b7 100644
--- a/application/src/main/data/json/system/widget_types/gateway_general_chart_statistics.json
+++ b/application/src/main/data/json/system/widget_types/gateway_general_chart_statistics.json
@@ -8,15 +8,7 @@
     "type": "timeseries",
     "sizeX": 8,
     "sizeY": 5,
-    "resources": [
-      {
-        "url": {
-          "entityType": "TB_RESOURCE",
-          "id": "71347080-80b6-11ef-a567-0114914c70f8"
-        },
-        "isModule": true
-      }
-    ],
+    "resources": [],
     "templateHtml": "<tb-gateway-statistics [ctx]=ctx [general]='true'></tb-gateway-statistics>",
     "templateCss": ".legend {\n    font-size: 13px;\n    line-height: 10px;\n}\n\n.legend table { \n    border-spacing: 0px;\n    border-collapse: separate;\n}\n\n.mouse-events .flot-overlay {\n    cursor: crosshair; \n}\n\n",
     "controllerScript": "self.onInit = function() {   \n};\n\nself.onDataUpdated = function() {\n};\n\nself.onLatestDataUpdated = function() {\n};\n\nself.onResize = function() {\n};\n\nself.onEditModeChanged = function() {\n};\n\nself.onDestroy = function() {\n};\n\nself.typeParameters = function() {\n    return {\n        hasAdditionalLatestDataKeys: false\n    };\n}\n",
diff --git a/application/src/main/data/json/system/widget_types/gateway_general_configuration.json b/application/src/main/data/json/system/widget_types/gateway_general_configuration.json
index e260746bec..e2129c0271 100644
--- a/application/src/main/data/json/system/widget_types/gateway_general_configuration.json
+++ b/application/src/main/data/json/system/widget_types/gateway_general_configuration.json
@@ -8,15 +8,7 @@
     "type": "latest",
     "sizeX": 11,
     "sizeY": 8,
-    "resources": [
-      {
-        "url": {
-          "entityType": "TB_RESOURCE",
-          "id": "71347080-80b6-11ef-a567-0114914c70f8"
-        },
-        "isModule": true
-      }
-    ],
+    "resources": [],
     "templateHtml": "<tb-gateway-configuration [device]=\"entityId\" *ngIf=\"entityId\"></tb-gateway-configuration>",
     "templateCss": "",
     "controllerScript": "self.onInit = function() {\n    if (self.ctx.datasources && self.ctx.datasources.length) {\n        self.ctx.$scope.entityId = self.ctx.datasources[0].entity.id;\n    }\n};\n\nself.typeParameters  = function() {\n    return {\n        dataKeysOptional: true,\n        singleEntity: true\n    };\n}",
diff --git a/application/src/main/data/json/system/widget_types/gateway_logs.json b/application/src/main/data/json/system/widget_types/gateway_logs.json
index 2d408a5ea6..45b380e544 100644
--- a/application/src/main/data/json/system/widget_types/gateway_logs.json
+++ b/application/src/main/data/json/system/widget_types/gateway_logs.json
@@ -8,15 +8,7 @@
     "type": "timeseries",
     "sizeX": 7.5,
     "sizeY": 3,
-    "resources": [
-      {
-        "url": {
-          "entityType": "TB_RESOURCE",
-          "id": "71347080-80b6-11ef-a567-0114914c70f8"
-        },
-        "isModule": true
-      }
-    ],
+    "resources": [],
     "templateHtml": "<tb-gateway-logs [ctx]=\"ctx\">\n    \n</tb-gateway-logs>",
     "templateCss": "#container {\n    overflow: auto;\n}\n\n.tbDatasource-container {\n    margin: 5px;\n    padding: 8px;\n}\n\n.tbDatasource-title {\n    font-size: 1.200rem;\n    font-weight: 500;\n    padding-bottom: 10px;\n}\n\n.tbDatasource-table {\n    width: 100%;\n    box-shadow: 0 0 10px #ccc;\n    border-collapse: collapse;\n    white-space: nowrap;\n    font-size: 1.000rem;\n    color: #757575;\n}\n\n.tbDatasource-table td {\n    position: relative;\n    border-top: 1px solid rgba(0, 0, 0, 0.12);\n    border-bottom: 1px solid rgba(0, 0, 0, 0.12);\n    padding: 0px 18px;\n    box-sizing: border-box;\n}",
     "controllerScript": "self.onInit = function() {\n};\n\nself.typeParameters  = function() {\n    return {\n        dataKeysOptional: true,\n        singleEntity: true\n    };\n}",
diff --git a/application/src/main/data/json/system/widget_types/service_rpc.json b/application/src/main/data/json/system/widget_types/service_rpc.json
index 7e1276a486..23cc13adf0 100644
--- a/application/src/main/data/json/system/widget_types/service_rpc.json
+++ b/application/src/main/data/json/system/widget_types/service_rpc.json
@@ -8,15 +8,7 @@
     "type": "rpc",
     "sizeX": 8.5,
     "sizeY": 5.5,
-    "resources": [
-      {
-        "url": {
-          "entityType": "TB_RESOURCE",
-          "id": "71347080-80b6-11ef-a567-0114914c70f8"
-        },
-        "isModule": true
-      }
-    ],
+    "resources": [],
     "templateHtml": "<tb-gateway-service-rpc [ctx]=\"ctx\"></tb-gateway-service-rpc>",
     "templateCss": ".error {\n    font-size: 14px !important;\n    color: maroon;/*rgb(250,250,250);*/\n    background-color: transparent;\n    padding: 6px;\n}\n\n.error span {\n    margin: auto;\n}\n\n.gpio-panel {\n    padding-top: 10px;\n    white-space: nowrap;\n}\n\n.gpio-panel section[fxflex] {\n    min-width: 0px;\n}\n\n\n.switch-panel {\n    margin: 0;\n    height: 32px;\n    width: 66px;\n    min-width: 66px;\n}\n\n.switch-panel mat-slide-toggle {\n    margin: 0;\n    width: 36px;\n    min-width: 36px;\n}\n\n.switch-panel.col-0 mat-slide-toggle {\n    margin-left: 8px;\n    margin-right: 4px;\n}\n\n.switch-panel.col-1 mat-slide-toggle {\n    margin-left: 4px;\n    margin-right: 8px;\n}\n\n.gpio-row {\n    height: 32px;\n}\n\n.pin {\n    margin-top: auto;\n    margin-bottom: auto;\n    color: white;\n    font-size: 12px;\n    width: 16px;\n    min-width: 16px;\n}\n\n.switch-panel.col-0 .pin {\n    margin-left: auto;\n    padding-left: 2px;\n    text-align: right;\n}\n\n.switch-panel.col-1 .pin {\n    margin-right: auto;\n    \n    text-align: left;\n}\n\n.gpio-left-label {\n    margin-right: 8px;\n}\n\n.gpio-right-label {\n    margin-left: 8px;\n}",
     "controllerScript": "\nself.onInit = function() {\n};",
diff --git a/application/src/main/data/json/tenant/dashboards/gateways.json b/application/src/main/data/json/tenant/dashboards/gateways.json
index 5d910493ab..668b92b7b2 100644
--- a/application/src/main/data/json/tenant/dashboards/gateways.json
+++ b/application/src/main/data/json/tenant/dashboards/gateways.json
@@ -1919,15 +1919,7 @@
                 "customHtml": "<div class=\"container\">\n    <mat-toolbar fxLayout=\"row\" color=\"primary\">\n        <h2>{{ 'gateway.launch-command' | translate }}</h2>\n        <span fxFlex></span>\n        <div [tb-help]=\"'gatewayInstall'\"></div>\n        <button mat-icon-button (click)=\"cancel()\" type=\"button\">\n            <mat-icon class=\"material-icons\">close</mat-icon>\n        </button>\n    </mat-toolbar>\n    <tb-gateway-command [deviceId]=\"entityId\"></tb-gateway-command>\n    <div mat-dialog-actions fxLayout=\"row\" fxLayoutAlign=\"end center\">\n        <button mat-button color=\"primary\"\n            type=\"button\"\n            (click)=\"cancel()\" cdkFocusInitial>\n            {{ 'action.close' | translate }}\n        </button>\n    </div>\n</div>\n",
                 "customCss": ".container {\n    display: grid;\n    grid-template-rows: min-content minmax(auto, 1fr) min-content;\n    height: 100%;\n    max-height: 100vh;\n    width: 600px;\n    max-width: 100%;\n}",
                 "customFunction": "let $injector = widgetContext.$scope.$injector;\nlet customDialog = $injector.get(widgetContext.servicesMap.get('customDialog'));\n\nopenCommands();\n\nfunction openCommands() {\n    customDialog.customDialog(htmlTemplate, CommandsDialogController, {panelClass: \"test\"}).subscribe();\n}\n\nfunction CommandsDialogController(instance) {\n    let vm = instance;\n    \n    vm.entityId = entityId.id;\n\n    vm.cancel = function() {\n        vm.dialogRef.close(null);\n    };\n}\n",
-                "customResources": [
-                  {
-                    "url": {
-                      "entityType": "TB_RESOURCE",
-                      "id": "71347080-80b6-11ef-a567-0114914c70f8"
-                    },
-                    "isModule": true
-                  }
-                ],
+                "customResources": [],
                 "openInSeparateDialog": false,
                 "openInPopover": false,
                 "id": "337c767b-3217-d3d3-b955-7b0bd0858a1d"
diff --git a/ui-ngx/src/app/modules/common/modules-map.ts b/ui-ngx/src/app/modules/common/modules-map.ts
index 82401a4d6e..4b363fa1df 100644
--- a/ui-ngx/src/app/modules/common/modules-map.ts
+++ b/ui-ngx/src/app/modules/common/modules-map.ts
@@ -259,7 +259,6 @@ import * as EventContentDialogComponent from '@home/components/event/event-conte
 import * as SharedHomeComponentsModule from '@home/components/shared-home-components.module';
 import * as WidgetConfigComponentsModule from '@home/components/widget/config/widget-config-components.module';
 import * as BasicWidgetConfigModule from '@home/components/widget/config/basic/basic-widget-config.module';
-import * as TbFlot from '@home/components/widget/lib/flot-widget';
 import * as WidgetSettingsCommonModule from '@home/components/widget/lib/settings/common/widget-settings-common.module';
 import * as WidgetComponentsModule from '@home/components/widget/widget-components.module';
 import * as SelectTargetLayoutDialogComponent from '@home/components/dashboard/select-target-layout-dialog.component';
@@ -585,7 +584,6 @@ class ModulesMap implements IModulesMap {
     '@home/components/widget/config/data-keys.component': DataKeysComponent,
     '@home/components/widget/config/data-key-config-dialog.component': DataKeyConfigDialogComponent,
     '@home/components/widget/config/data-key-config.component': DataKeyConfigComponent,
-    '@home/components/widget/lib/flot-widget': TbFlot,
     '@home/components/widget/lib/settings/common/legend-config.component': LegendConfigComponent,
     '@home/components/widget/action/manage-widget-actions.component': ManageWidgetActionsComponent,
     '@home/components/widget/action/widget-action-dialog.component': WidgetActionDialogComponent,