diff --git a/dao/src/main/java/org/thingsboard/server/dao/domain/DomainServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/domain/DomainServiceImpl.java
index 487e3feb5c..b3380ef540 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/domain/DomainServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/domain/DomainServiceImpl.java
@@ -42,8 +42,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.thingsboard.server.dao.service.Validator.validateId;
-
 @Slf4j
 @Service
 public class DomainServiceImpl extends AbstractEntityService implements DomainService {
@@ -128,7 +126,6 @@ public class DomainServiceImpl extends AbstractEntityService implements DomainSe
     @Override
     public void deleteDomainsByTenantId(TenantId tenantId) {
         log.trace("Executing deleteDomainsByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         domainDao.deleteByTenantId(tenantId);
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppServiceImpl.java
index f5b558cdcc..1e89b3c645 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppServiceImpl.java
@@ -35,7 +35,6 @@ import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.oauth2.OAuth2ClientDao;
-import org.thingsboard.server.dao.service.Validator;
 
 import java.util.List;
 import java.util.Map;
@@ -47,8 +46,6 @@ import java.util.stream.Collectors;
 @Service
 public class MobileAppServiceImpl extends AbstractEntityService implements MobileAppService {
 
-    public static final String INCORRECT_TENANT_ID = "Incorrect tenantId ";
-
     @Autowired
     private OAuth2ClientDao oauth2ClientDao;
     @Autowired
@@ -135,7 +132,6 @@ public class MobileAppServiceImpl extends AbstractEntityService implements Mobil
     @Override
     public void deleteMobileAppsByTenantId(TenantId tenantId) {
         log.trace("Executing deleteMobileAppsByTenantId, tenantId [{}]", tenantId);
-        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         mobileAppDao.deleteByTenantId(tenantId);
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientServiceImpl.java
index 6273ee2763..a39416620e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientServiceImpl.java
@@ -34,25 +34,16 @@ import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.service.DataValidator;
-import org.thingsboard.server.dao.service.Validator;
 
 import java.util.List;
 import java.util.Optional;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
-import static org.thingsboard.server.dao.service.Validator.validateId;
-import static org.thingsboard.server.dao.service.Validator.validateIds;
-import static org.thingsboard.server.dao.service.Validator.validateString;
 
 @Slf4j
 @Service("OAuth2ClientService")
 public class OAuth2ClientServiceImpl extends AbstractEntityService implements OAuth2ClientService {
 
-    public static final String INCORRECT_TENANT_ID = "Incorrect tenantId ";
-    public static final String INCORRECT_CLIENT_REGISTRATION_ID = "Incorrect clientRegistrationId ";
-    public static final String INCORRECT_DOMAIN_NAME = "Incorrect domainName ";
-
     @Autowired
     private OAuth2ClientDao oauth2ClientDao;
     @Autowired
@@ -61,7 +52,6 @@ public class OAuth2ClientServiceImpl extends AbstractEntityService implements OA
     @Override
     public List<OAuth2ClientLoginInfo> findOAuth2ClientLoginInfosByDomainName(String domainName) {
         log.trace("Executing findOAuth2ClientLoginInfosByDomainName [{}] ", domainName);
-        validateString(domainName, dn -> INCORRECT_DOMAIN_NAME + dn);
         return oauth2ClientDao.findEnabledByDomainName(domainName)
                 .stream()
                 .map(OAuth2Utils::toClientLoginInfo)
@@ -90,7 +80,6 @@ public class OAuth2ClientServiceImpl extends AbstractEntityService implements OA
     @Override
     public OAuth2Client findOAuth2ClientById(TenantId tenantId, OAuth2ClientId oAuth2ClientId) {
         log.trace("Executing findOAuth2ClientById [{}]", oAuth2ClientId);
-        validateId(oAuth2ClientId, uuid -> INCORRECT_CLIENT_REGISTRATION_ID + uuid);
         return oauth2ClientDao.findById(tenantId, oAuth2ClientId.getId());
     }
 
@@ -103,8 +92,6 @@ public class OAuth2ClientServiceImpl extends AbstractEntityService implements OA
     @Override
     public String findAppSecret(OAuth2ClientId oAuth2ClientId, String pkgName) {
         log.trace("Executing findAppSecret [{}][{}]", oAuth2ClientId, pkgName);
-        validateId(oAuth2ClientId, uuid -> INCORRECT_CLIENT_REGISTRATION_ID + uuid);
-        validateString(pkgName, "Incorrect package name");
         return oauth2ClientDao.findAppSecret(oAuth2ClientId.getId(), pkgName);
     }
 
@@ -123,7 +110,6 @@ public class OAuth2ClientServiceImpl extends AbstractEntityService implements OA
     @Override
     public void deleteOauth2ClientsByTenantId(TenantId tenantId) {
         log.trace("Executing deleteOauth2ClientsByTenantId, tenantId [{}]", tenantId);
-        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         oauth2ClientDao.deleteByTenantId(tenantId.getId());
     }
 
@@ -137,8 +123,6 @@ public class OAuth2ClientServiceImpl extends AbstractEntityService implements OA
     @Override
     public List<OAuth2ClientInfo> findOAuth2ClientInfosByIds(TenantId tenantId, List<OAuth2ClientId> oAuth2ClientIds) {
         log.trace("Executing findQueueStatsByIds, tenantId [{}], queueStatsIds [{}]", tenantId, oAuth2ClientIds);
-        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
-        validateIds(oAuth2ClientIds, ids -> "Incorrect clientIds " + ids);
         return oauth2ClientDao.findByIds(tenantId, oAuth2ClientIds)
                 .stream()
                 .map(OAuth2ClientInfo::new)