diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
index dfc248f79b..677a9c2641 100644
--- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
+++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/application/src/main/java/org/thingsboard/server/service/apiusage/TbApiUsageStateService.java b/application/src/main/java/org/thingsboard/server/service/apiusage/TbApiUsageStateService.java
index 668dc288a0..5f01d34877 100644
--- a/application/src/main/java/org/thingsboard/server/service/apiusage/TbApiUsageStateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/apiusage/TbApiUsageStateService.java
@@ -17,7 +17,6 @@ package org.thingsboard.server.service.apiusage;
 
 import org.springframework.context.ApplicationListener;
 import org.thingsboard.rule.engine.api.RuleEngineApiUsageStateService;
-import org.thingsboard.server.common.data.ApiUsageState;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantProfileId;
@@ -31,8 +30,6 @@ public interface TbApiUsageStateService extends TbApiUsageStateClient, RuleEngin
 
     void process(TbProtoQueueMsg<ToUsageStatsServiceMsg> msg, TbCallback callback);
 
-    ApiUsageState getApiUsageState(TenantId tenantId);
-
     void onTenantProfileUpdate(TenantProfileId tenantProfileId);
 
     void onTenantUpdate(TenantId tenantId);
diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultTbRuleEngineRpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultTbRuleEngineRpcService.java
index 2acedb9107..c0f6cc750f 100644
--- a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultTbRuleEngineRpcService.java
+++ b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultTbRuleEngineRpcService.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.service.rpc;
 
-import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -67,7 +66,8 @@ public class DefaultTbRuleEngineRpcService implements TbRuleEngineDeviceRpcServi
 
     public DefaultTbRuleEngineRpcService(PartitionService partitionService,
                                          TbClusterService clusterService,
-                                         TbServiceInfoProvider serviceInfoProvider, RpcService rpcService) {
+                                         TbServiceInfoProvider serviceInfoProvider,
+                                         RpcService rpcService) {
         this.partitionService = partitionService;
         this.clusterService = clusterService;
         this.serviceInfoProvider = serviceInfoProvider;
diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
index 9c66d14011..d0279c1a87 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
@@ -52,6 +52,7 @@ import org.thingsboard.server.service.subscription.TbSubscriptionUtils;
 
 import java.util.Collection;
 import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 
 /**
  * Created by ashvayka on 27.03.18.
@@ -129,6 +130,15 @@ public class DefaultAlarmSubscriptionService extends AbstractSubscriptionService
         return alarmService.findAlarmByIdAsync(tenantId, alarmId);
     }
 
+    @Override
+    public Alarm findAlarmById(TenantId tenantId, AlarmId alarmId) {
+        try {
+            return alarmService.findAlarmByIdAsync(tenantId, alarmId).get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     @Override
     public ListenableFuture<AlarmInfo> findAlarmInfoByIdAsync(TenantId tenantId, AlarmId alarmId) {
         return alarmService.findAlarmInfoByIdAsync(tenantId, alarmId);
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineRpcService.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineRpcService.java
index c2f06c14da..779e958793 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineRpcService.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineRpcService.java
@@ -15,8 +15,6 @@
  */
 package org.thingsboard.rule.engine.api;
 
-import com.google.common.util.concurrent.ListenableFuture;
-import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.RpcId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rpc.Rpc;