diff --git a/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java b/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
index 98f739a24b..7a28c205bc 100644
--- a/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
+++ b/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
@@ -111,7 +111,6 @@ public class DefaultActorService extends TbApplicationEventListener<PartitionCha
         } else {
             return ThingsBoardExecutors.newWorkStealingPool(poolSize, dispatcherName);
         }
-        //return Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() + 1, ThingsBoardThreadFactory.forName(dispatcherName));
     }
 
     @EventListener(ApplicationReadyEvent.class)
diff --git a/application/src/main/java/org/thingsboard/server/service/script/AbstractJsInvokeService.java b/application/src/main/java/org/thingsboard/server/service/script/AbstractJsInvokeService.java
index cae4a8e05c..67ad4a8696 100644
--- a/application/src/main/java/org/thingsboard/server/service/script/AbstractJsInvokeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/script/AbstractJsInvokeService.java
@@ -124,12 +124,6 @@ public abstract class AbstractJsInvokeService implements JsInvokeService {
         DisableListInfo disableListInfo = disabledFunctions.computeIfAbsent(scriptId, key -> new DisableListInfo());
         log.warn("Script has exception and will increment counter {} on disabledFunctions for id {}, exception {}, cause {}, scriptBody {}",
                 disableListInfo.get(), scriptId, t, t.getCause(), scriptBody);
-//        if (t instanceof TimeoutException || (t.getCause() != null && t.getCause() instanceof TimeoutException)) {
-//            log.warn("Script has TimeoutException and will increment counter {} on disabledFunctions for id {}", //TODO remove after test
-//                    disableListInfo.get(),
-//                    scriptId);
-//            //return; //timeout is not a good reason to disable function
-//        }
         disableListInfo.incrementAndGet();
     }