diff --git a/application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java b/application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java
index bf745a2033..abd45e0ca3 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java
@@ -42,7 +42,6 @@ import org.thingsboard.server.service.security.system.SystemSecurityService;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.util.Map;
 
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_ID;
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_ID_PARAM_DESCRIPTION;
diff --git a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
index 3eb6202aea..d73915b617 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
@@ -134,7 +134,6 @@ public class DeviceController extends BaseController {
 
     private final TbDeviceService tbDeviceService;
 
-
     @ApiOperation(value = "Get Device (getDeviceById)",
             notes = "Fetch the Device object based on the provided Device Id. " +
                     "If the user has the authority of 'TENANT_ADMIN', the server checks that the device is owned by the same tenant. " +
diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java
index b138778025..9fd8990a40 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java
@@ -15,84 +15,43 @@
  */
 package org.thingsboard.server.controller;
 
-import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.AdditionalAnswers;
 import org.mockito.Mockito;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardExecutors;
-import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.DeviceInfo;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileType;
 import org.thingsboard.server.common.data.DeviceTransportType;
-import org.thingsboard.server.common.data.EntitySubtype;
-import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.OtaPackageInfo;
-import org.thingsboard.server.common.data.SaveDeviceWithCredentialsRequest;
-import org.thingsboard.server.common.data.SaveOtaPackageInfoRequest;
-import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.device.credentials.BasicMqttCredentials;
 import org.thingsboard.server.common.data.device.profile.CoapDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileConfiguration;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
-import org.thingsboard.server.common.data.edge.Edge;
-import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.DeviceCredentialsId;
-import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
-import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.page.PageData;
-import org.thingsboard.server.common.data.page.PageLink;
-import org.thingsboard.server.common.data.relation.EntityRelation;
-import org.thingsboard.server.common.data.relation.RelationTypeGroup;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
-import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportColumnType;
-import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportRequest;
-import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportResult;
 import org.thingsboard.server.dao.device.DeviceDao;
-import org.thingsboard.server.dao.exception.DataValidationException;
-import org.thingsboard.server.dao.exception.DeviceCredentialsValidationException;
-import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.service.DaoSqlTest;
-import org.thingsboard.server.service.gateway_device.GatewayNotificationsService;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE;
-import static org.thingsboard.server.common.data.ota.OtaPackageType.SOFTWARE;
-import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
 import static org.thingsboard.server.dao.util.DeviceConnectivityUtil.COAP;
 import static org.thingsboard.server.dao.util.DeviceConnectivityUtil.COAPS;
 import static org.thingsboard.server.dao.util.DeviceConnectivityUtil.DOCKER;
diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
index 9ab5f7fde8..1c952bd549 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
@@ -84,6 +84,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE;
 import static org.thingsboard.server.common.data.ota.OtaPackageType.SOFTWARE;
 import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
+
 @ContextConfiguration(classes = {DeviceControllerTest.Config.class})
 @DaoSqlTest
 public class DeviceControllerTest extends AbstractControllerTest {
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityService.java
index 83f35d5566..51643fa1d4 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityService.java
@@ -20,7 +20,6 @@ import org.thingsboard.server.common.data.Device;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.util.Map;
 
 public interface DeviceConnectivityService {
 
diff --git a/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.html b/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.html
index a595487521..01d2330aa3 100644
--- a/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.html
@@ -144,8 +144,8 @@
                   </div>
                   <ng-container
                     *ngTemplateOutlet="executeCommand; context: {cmd: {
-                              noSecLabel: 'MQTT', noSec: this.commands.mqtt.mqtt,
-                              secLabel: 'MQTTs', sec: this.commands.mqtt.mqtts,
+                              noSecLabel: 'MQTT', noSec: commands.mqtt.mqtt,
+                              secLabel: 'MQTTs', sec: commands.mqtt.mqtts,
                               doc: {text: 'device.connectivity.mqtts-x509-command', href: 'https://thingsboard.io/docs/user-guide/mqtt-over-ssl/'}}}">
                   </ng-container>
                 </div>
@@ -165,8 +165,8 @@
                   </div>
                   <ng-container
                     *ngTemplateOutlet="executeCommand; context: {cmd: {
-                              noSecLabel: 'MQTT', noSec: this.commands.mqtt.mqtt,
-                              secLabel: 'MQTTs', sec: this.commands.mqtt.mqtts,
+                              noSecLabel: 'MQTT', noSec: commands.mqtt.mqtt,
+                              secLabel: 'MQTTs', sec: commands.mqtt.mqtts,
                               doc: {text: 'device.connectivity.mqtts-x509-command', href: 'https://thingsboard.io/docs/user-guide/mqtt-over-ssl/'}}}">
                   </ng-container>
                 </div>
@@ -186,14 +186,14 @@
                   </div>
                   <ng-container
                     *ngTemplateOutlet="executeCommand; context: {cmd: {
-                              noSecLabel: 'MQTT', noSec: this.commands.mqtt.mqtt,
-                              secLabel: 'MQTTs', sec: this.commands.mqtt.mqtts,
+                              noSecLabel: 'MQTT', noSec: commands.mqtt.mqtt,
+                              secLabel: 'MQTTs', sec: commands.mqtt.mqtts,
                               doc: {text: 'device.connectivity.mqtts-x509-command', href: 'https://thingsboard.io/docs/user-guide/mqtt-over-ssl/'}}}">
                   </ng-container>
                 </div>
               </ng-template>
             </mat-tab>
-            <mat-tab *ngIf="!!this.commands.mqtt.docker">
+            <mat-tab *ngIf="!!commands.mqtt.docker">
               <ng-template mat-tab-label>
                 <mat-icon class="tabs-icon" svgIcon="docker"></mat-icon>
                 Docker
@@ -202,8 +202,8 @@
                 <div class="tb-form-panel no-padding no-border tb-tab-body">
                   <ng-container
                     *ngTemplateOutlet="executeCommand; context: {cmd: {
-                              noSecLabel: 'MQTT', noSec: this.commands.mqtt.docker.mqtt,
-                              secLabel: 'MQTTs', sec: this.commands.mqtt.docker.mqtts,
+                              noSecLabel: 'MQTT', noSec: commands.mqtt.docker.mqtt,
+                              secLabel: 'MQTTs', sec: commands.mqtt.docker.mqtts,
                               doc: {text: 'device.connectivity.mqtts-x509-command', href: 'https://thingsboard.io/docs/user-guide/mqtt-over-ssl/'}}}">
                   </ng-container>
                 </div>
@@ -228,8 +228,8 @@
                   </div>
                   <ng-container
                     *ngTemplateOutlet="executeCommand; context: {cmd: {
-                              noSecLabel: 'CoAP', noSec: this.commands.coap.coap,
-                              secLabel: 'CoAPs', sec: this.commands.coap.coaps,
+                              noSecLabel: 'CoAP', noSec: commands.coap.coap,
+                              secLabel: 'CoAPs', sec: commands.coap.coaps,
                               doc: {text: 'device.connectivity.coaps-x509-command', href: 'https://thingsboard.io/docs/user-guide/ssl/coap-x509-certificates/'}}}">
                   </ng-container>
                 </div>
@@ -249,14 +249,14 @@
                   </div>
                   <ng-container
                     *ngTemplateOutlet="executeCommand; context: {cmd: {
-                              noSecLabel: 'CoAP', noSec: this.commands.coap.coap,
-                              secLabel: 'CoAPs', sec: this.commands.coap.coaps,
+                              noSecLabel: 'CoAP', noSec: commands.coap.coap,
+                              secLabel: 'CoAPs', sec: commands.coap.coaps,
                               doc: {text: 'device.connectivity.coaps-x509-command', href: 'https://thingsboard.io/docs/user-guide/ssl/coap-x509-certificates/'}}}">
                   </ng-container>
                 </div>
               </ng-template>
             </mat-tab>
-            <mat-tab *ngIf="!!this.commands.coap.docker">
+            <mat-tab *ngIf="!!commands.coap.docker">
               <ng-template mat-tab-label>
                 <mat-icon class="tabs-icon" svgIcon="docker"></mat-icon>
                 Docker
@@ -265,8 +265,8 @@
                 <div class="tb-form-panel no-padding no-border tb-tab-body">
                   <ng-container
                     *ngTemplateOutlet="executeCommand; context: {cmd: {
-                              noSecLabel: 'CoAP', noSec: this.commands.coap.docker.coap,
-                              secLabel: 'CoAPs', sec: this.commands.coap.docker.coaps,
+                              noSecLabel: 'CoAP', noSec: commands.coap.docker.coap,
+                              secLabel: 'CoAPs', sec: commands.coap.docker.coaps,
                               doc: {text: 'device.connectivity.coaps-x509-command', href: 'https://thingsboard.io/docs/user-guide/ssl/coap-x509-certificates/'}}}">
                   </ng-container>
                 </div>