diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/QueryNames.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/QueryNames.java
index 10e4c77d6ed47d38b6211f4457ef81d7a6c6c9d5..39a88555e5bdc566acdc766ad31b24e89573a497 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/QueryNames.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/QueryNames.java
@@ -121,9 +121,6 @@ public class QueryNames {
     public static final String QUERY_USERS = "DBUser.getUsers";
     public static final String QUERY_QUERY_USERS_FILTER = "DBUser.getUsersByFilter";
     // ALERTS
-    public static final String QUERY_USER_BEFORE_PASSWORD_EXPIRE = "DBUser.getUsersForBeforePasswordExpireAlerts";
-    public static final String QUERY_USER_WITH_PASSWORD_EXPIRED =  "DBUser.getUsersForPasswordExpiredAlerts";
-
     public static final String QUERY_CREDENTIAL_BEFORE_EXPIRE = "DBCredential.getCredentialBeforeExpireAlerts";
     public static final String QUERY_CREDENTIAL_EXPIRED =  "DBCredential.getCredentiaExpiredAlerts";
 
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBUser.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBUser.java
index 5d997c51bd6e34e8c8b8dea77e67d89864f2c9d0..10910d38a0f03937eb9e4c3f61219937d04ad324 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBUser.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBUser.java
@@ -18,7 +18,6 @@ import eu.europa.ec.edelivery.smp.data.enums.ApplicationRoleType;
 import eu.europa.ec.edelivery.smp.data.model.BaseEntity;
 import eu.europa.ec.edelivery.smp.data.model.CommonColumnsLengths;
 import eu.europa.ec.edelivery.smp.data.model.DBUserDeleteValidation;
-import eu.europa.ec.edelivery.smp.data.model.doc.DBResource;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.envers.Audited;
@@ -51,59 +50,6 @@ import static eu.europa.ec.edelivery.smp.data.dao.QueryNames.*;
         " WHERE (lower(c.username) like lower(:user_filter) OR  lower(c.fullName) like lower(:user_filter))")
 @NamedQuery(name = QUERY_QUERY_USERS_FILTER, query = "SELECT c FROM DBUser c " +
         " WHERE (lower(c.username) like lower(:user_filter) OR  lower(c.fullName) like lower(:user_filter))  order by c.username")
-
-
-//@NamedQueries({
-
-// @NamedQuery(name = "DBUser.getUserByCertificateId", query = "SELECT u FROM DBUser u WHERE u.certificate.certificateId = :certificateId"),
-//@NamedQuery(name = "DBUser.getUserByPatId", query = "SELECT u FROM DBUser u WHERE u.accessTokenIdentifier = :patId"),
-//@NamedQuery(name = "DBUser.getUserByCertificateIdCaseInsensitive", query = "SELECT u FROM DBUser u WHERE upper(u.certificate.certificateId) = upper(:certificateId)"),
-@NamedQuery(name = QUERY_USER_BEFORE_PASSWORD_EXPIRE,
-                query = "SELECT distinct u FROM DBUser u JOIN DBCredential  c ON u.id = c.user.id  WHERE  c.credentialType=:credential_type  " +
-                        " AND c.expireOn IS NOT NULL" +
-                        " AND c.expireOn <= :start_alert_send_date " +
-                        " AND c.expireOn > :expire_test_date" +
-                        " AND (c.expireAlertOn IS NULL OR c.expireAlertOn < :lastSendAlertDate )")
-@NamedQuery(name = QUERY_USER_WITH_PASSWORD_EXPIRED,
-        query = "SELECT distinct u FROM DBUser u JOIN DBCredential  c ON u.id = c.user.id  WHERE  c.credentialType=:credential_type" +
-                " AND  c.expireOn IS NOT NULL" +
-                " AND c.expireOn > :endAlertDate " +
-                " AND c.expireOn <= :expire_test_date" +
-                " AND (c.expireAlertOn IS NULL " +
-                "   OR c.expireAlertOn <= c.expireOn " +
-                "   OR c.expireAlertOn < :lastSendAlertDate )")
-/*
-@NamedQuery(name = "DBUser.getUsersForBeforeAccessTokenExpireAlerts",
-        query = "SELECT u FROM DBUser u WHERE u.accessTokenExpireOn IS NOT NULL" +
-                " AND u.accessTokenExpireOn <= :startAlertDate " +
-                " AND u.accessTokenExpireOn > :expire_test_date" +
-                " AND (u.accessTokenExpireAlertOn IS NULL OR u.accessTokenExpireAlertOn < :lastSendAlertDate )"),
-@NamedQuery(name = "DBUser.getUsersForAccessTokenExpiredAlerts",
-        query = "SELECT u FROM DBUser u WHERE u.accessTokenExpireOn IS NOT NULL" +
-                " AND u.accessTokenExpireOn > :endAlertDate " +
-                " AND u.accessTokenExpireOn <= :expire_test_date" +
-                " AND (u.accessTokenExpireAlertOn IS NULL " +
-                "   OR u.accessTokenExpireAlertOn <= u.accessTokenExpireOn " +
-                "   OR u.accessTokenExpireAlertOn < :lastSendAlertDate )"),
-/*
-@NamedQuery(name = "DBUser.getUsersForBeforeCertificateExpireAlerts",
-        query = "SELECT u FROM DBUser u WHERE u.certificate IS NOT NULL" +
-                " AND u.certificate.validTo IS NOT NULL " +
-                " AND u.certificate.validTo <= :startAlertDate " +
-                " AND u.certificate.validTo > :expire_test_date" +
-                " AND (u.certificate.certificateLastExpireAlertOn IS NULL " +
-                "       OR u.certificate.certificateLastExpireAlertOn < :lastSendAlertDate )"),
-@NamedQuery(name = "DBUser.getUsersForCertificateExpiredAlerts",
-        query = "SELECT u FROM DBUser u WHERE u.certificate IS NOT NULL" +
-                " AND u.certificate.validTo IS NOT NULL " +
-                " AND u.certificate.validTo > :endAlertDate " +
-                " AND u.certificate.validTo <= :expire_test_date" +
-                " AND (u.certificate.certificateLastExpireAlertOn IS NULL " +
-                "     OR u.certificate.certificateLastExpireAlertOn <= u.certificate.validTo " +
-
-                "     OR u.certificate.certificateLastExpireAlertOn < :lastSendAlertDate )")
-                })
- */
 @NamedNativeQuery(name = "DBUserDeleteValidation.validateUsersForOwnership",
         resultSetMapping = "DBUserDeleteValidationMapping",
         query = "SELECT S.ID as ID, S.USERNAME as USERNAME, " +