diff --git a/src/main/java/cz/cvut/kbss/termit/dto/PasswordChangeDto.java b/src/main/java/cz/cvut/kbss/termit/dto/PasswordChangeDto.java
index b8080691e..c6d16c33e 100644
--- a/src/main/java/cz/cvut/kbss/termit/dto/PasswordChangeDto.java
+++ b/src/main/java/cz/cvut/kbss/termit/dto/PasswordChangeDto.java
@@ -8,8 +8,6 @@
 
 import java.io.Serializable;
 import java.net.URI;
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
 
 @OWLClass(iri = Vocabulary.ONTOLOGY_IRI_TERMIT + "/password-change")
 public class PasswordChangeDto implements Serializable {
diff --git a/src/main/java/cz/cvut/kbss/termit/persistence/dao/PasswordChangeRequestDao.java b/src/main/java/cz/cvut/kbss/termit/persistence/dao/PasswordChangeRequestDao.java
index 93d5be8a0..62353caa4 100644
--- a/src/main/java/cz/cvut/kbss/termit/persistence/dao/PasswordChangeRequestDao.java
+++ b/src/main/java/cz/cvut/kbss/termit/persistence/dao/PasswordChangeRequestDao.java
@@ -1,10 +1,6 @@
 package cz.cvut.kbss.termit.persistence.dao;
 
-import cz.cvut.kbss.jopa.exceptions.NoResultException;
 import cz.cvut.kbss.jopa.model.EntityManager;
-import cz.cvut.kbss.jopa.model.query.criteria.CriteriaBuilder;
-import cz.cvut.kbss.jopa.model.query.criteria.CriteriaQuery;
-import cz.cvut.kbss.jopa.model.query.criteria.Root;
 import cz.cvut.kbss.termit.exception.PersistenceException;
 import cz.cvut.kbss.termit.model.PasswordChangeRequest;
 import cz.cvut.kbss.termit.util.Configuration;
@@ -13,7 +9,6 @@
 
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 
 @Repository
 public class PasswordChangeRequestDao extends BaseDao<PasswordChangeRequest> {
diff --git a/src/main/java/cz/cvut/kbss/termit/service/business/PasswordChangeService.java b/src/main/java/cz/cvut/kbss/termit/service/business/PasswordChangeService.java
index fa6b21fb7..ae3e4be16 100644
--- a/src/main/java/cz/cvut/kbss/termit/service/business/PasswordChangeService.java
+++ b/src/main/java/cz/cvut/kbss/termit/service/business/PasswordChangeService.java
@@ -12,7 +12,6 @@
 import cz.cvut.kbss.termit.util.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/cz/cvut/kbss/termit/service/repository/PasswordChangeRequestRepositoryService.java b/src/main/java/cz/cvut/kbss/termit/service/repository/PasswordChangeRequestRepositoryService.java
index b64871cce..e3b861c22 100644
--- a/src/main/java/cz/cvut/kbss/termit/service/repository/PasswordChangeRequestRepositoryService.java
+++ b/src/main/java/cz/cvut/kbss/termit/service/repository/PasswordChangeRequestRepositoryService.java
@@ -2,7 +2,6 @@
 
 import cz.cvut.kbss.termit.dto.PasswordChangeRequestDto;
 import cz.cvut.kbss.termit.dto.mapper.DtoMapper;
-import cz.cvut.kbss.termit.exception.NotFoundException;
 import cz.cvut.kbss.termit.model.PasswordChangeRequest;
 import cz.cvut.kbss.termit.model.UserAccount;
 import cz.cvut.kbss.termit.persistence.dao.GenericDao;
@@ -12,16 +11,17 @@
 
 import java.time.Instant;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 
 @Service
-public class PasswordChangeRequestRepositoryService extends BaseRepositoryService<PasswordChangeRequest, PasswordChangeRequestDto> {
+public class PasswordChangeRequestRepositoryService
+        extends BaseRepositoryService<PasswordChangeRequest, PasswordChangeRequestDto> {
 
     private final PasswordChangeRequestDao passwordChangeRequestDao;
     private final DtoMapper dtoMapper;
 
-    protected PasswordChangeRequestRepositoryService(PasswordChangeRequestDao passwordChangeRequestDao, DtoMapper dtoMapper, Validator validator) {
+    public PasswordChangeRequestRepositoryService(PasswordChangeRequestDao passwordChangeRequestDao,
+                                                  DtoMapper dtoMapper, Validator validator) {
         super(validator);
         this.passwordChangeRequestDao = passwordChangeRequestDao;
         this.dtoMapper = dtoMapper;