diff --git a/application/src/test/resources/logback-test.xml b/application/src/test/resources/logback-test.xml
index d72bccb7a6..4651f2f359 100644
--- a/application/src/test/resources/logback-test.xml
+++ b/application/src/test/resources/logback-test.xml
@@ -31,6 +31,7 @@
     <!--    To reduce logs -->
     <logger name="org.apache.catalina.loader.WebappClassLoaderBase" level="ERROR" />
     <logger name="org.thingsboard.server.service.queue.DefaultTbClusterService" level="ERROR" />
+    <logger name="org.thingsboard.server.service.security.auth.jwt.settings.DefaultJwtSettingsService" level="ERROR" />
 
     <!-- Coap client context debug for the test scope -->
     <!--    <logger name="org.thingsboard.server.transport.coap.client.DefaultCoapClientContext" level="TRACE" />-->
diff --git a/common/cluster-api/src/main/java/org/thingsboard/server/queue/TbQueueConsumer.java b/common/cluster-api/src/main/java/org/thingsboard/server/queue/TbQueueConsumer.java
index 3747e6d026..51456ab0e2 100644
--- a/common/cluster-api/src/main/java/org/thingsboard/server/queue/TbQueueConsumer.java
+++ b/common/cluster-api/src/main/java/org/thingsboard/server/queue/TbQueueConsumer.java
@@ -36,8 +36,6 @@ public interface TbQueueConsumer<T extends TbQueueMsg> {
 
     void commit();
 
-    boolean isCommitSupported();
-
     boolean isStopped();
 
     List<String> getFullTopicNames();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTask.java
index 344edc3f0d..8354b2b861 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTask.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTask.java
@@ -60,19 +60,10 @@ public class HousekeeperTask implements Serializable {
         return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_ATTRIBUTES);
     }
 
-    /**
-     * Task for telemetry deletion, processed by TelemetryDeletionTaskProcessor.
-     * The processor will submit separate tasks for each key for latest and ts history deletion,
-     * processed by LatestTsDeletionTaskProcessor and TsHistoryDeletionTaskProcessor accordingly.
-     * */
     public static HousekeeperTask deleteTelemetry(TenantId tenantId, EntityId entityId) {
         return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_TELEMETRY);
     }
 
-    /**
-     * Task for events deletion, processed by EventsDeletionTaskProcessor.
-     * All types of events will be dropped for this entity.
-     * */
     public static HousekeeperTask deleteEvents(TenantId tenantId, EntityId entityId) {
         return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_EVENTS);
     }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
index 89840d81ad..ac263c10c8 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
@@ -201,11 +201,6 @@ public abstract class AbstractTbQueueConsumerTemplate<R, T extends TbQueueMsg> i
         return partitions.stream().map(TopicPartitionInfo::getFullTopicName).collect(Collectors.toList());
     }
 
-    @Override
-    public boolean isCommitSupported() {
-        return true;
-    }
-
     protected boolean isLongPollingSupported() {
         return false;
     }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryTbQueueConsumer.java b/common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryTbQueueConsumer.java
index 269924087b..de3833d124 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryTbQueueConsumer.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryTbQueueConsumer.java
@@ -114,9 +114,4 @@ public class InMemoryTbQueueConsumer<T extends TbQueueMsg> implements TbQueueCon
         return partitions.stream().map(TopicPartitionInfo::getFullTopicName).collect(Collectors.toList());
     }
 
-    @Override
-    public boolean isCommitSupported() {
-        return false;
-    }
-
 }
diff --git a/docker/monitoring/grafana/provisioning/dashboards/housekeeper.json b/docker/monitoring/grafana/provisioning/dashboards/housekeeper.json
index 8c68cc9428..b604b96135 100644
--- a/docker/monitoring/grafana/provisioning/dashboards/housekeeper.json
+++ b/docker/monitoring/grafana/provisioning/dashboards/housekeeper.json
@@ -188,7 +188,7 @@
             "uid": "9BonzvTSz"
           },
           "exemplar": true,
-          "expr": "sum by (taskType) (increase(housekeeper_total{instance=\"192.168.3.27:8080\",statsName=\"failedProcessing\"}[1m]))",
+          "expr": "sum by (taskType) (increase(housekeeper_total{statsName=\"failedProcessing\"}[1m]))",
           "interval": "",
           "legendFormat": "{{taskType}}",
           "refId": "A"
@@ -274,7 +274,7 @@
             "uid": "9BonzvTSz"
           },
           "exemplar": true,
-          "expr": "sum by (taskType) (increase(housekeeper_total{instance=\"192.168.3.27:8080\",statsName=\"reprocessed\"}[1m]))",
+          "expr": "sum by (taskType) (increase(housekeeper_total{statsName=\"reprocessed\"}[1m]))",
           "interval": "",
           "legendFormat": "{{taskType}}",
           "refId": "A"
@@ -360,7 +360,7 @@
             "uid": "9BonzvTSz"
           },
           "exemplar": true,
-          "expr": "sum by (taskType) (increase(housekeeper_total{instance=\"192.168.3.27:8080\",statsName=\"failedReprocessing\"}[1m]))",
+          "expr": "sum by (taskType) (increase(housekeeper_total{statsName=\"failedReprocessing\"}[1m]))",
           "interval": "",
           "legendFormat": "{{taskType}}",
           "refId": "A"