diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImpl.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImpl.java
index 917322144a1dac6c6b3ca66a6cb79fc099d34f9f..c89b87a2505cde0611eccedf9510270912ac9a4e 100644
--- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImpl.java
+++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImpl.java
@@ -8,10 +8,11 @@ import cz.muni.fi.pa165.icehockeymanager.model.Game;
 import cz.muni.fi.pa165.icehockeymanager.model.Team;
 import cz.muni.fi.pa165.icehockeymanager.services.BeanMappingService;
 import cz.muni.fi.pa165.icehockeymanager.services.GameService;
-import cz.muni.fi.pa165.icehockeymanager.services.PlayerService;
 import cz.muni.fi.pa165.icehockeymanager.services.TeamService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+@Service
 public class LeagueManagerFacadeImpl implements LeagueManagerFacade {
 
     private final TeamService teamService;
diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java
index 06dd6c54e3565b769a7bcff5cfba233dc10b0236..746c150bd6cbb089c16d02618d23af5ef26ef919 100644
--- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java
+++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java
@@ -2,7 +2,6 @@ package cz.muni.fi.pa165.icehockeymanager.facades;
 
 import cz.muni.fi.pa165.icehockeymanager.dto.PlayerCreateDTO;
 import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO;
-import cz.muni.fi.pa165.icehockeymanager.dto.TeamDTO;
 import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownPlayerException;
 import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;
 import cz.muni.fi.pa165.icehockeymanager.model.Player;
diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Game.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Game.java
index c6ae389759f0a04627c6fe65abea25b04a8ab0e1..59fdb8fa0133e0fbb3ac282618bc2059b5cd16be 100644
--- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Game.java
+++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Game.java
@@ -5,13 +5,7 @@ import cz.muni.fi.pa165.icehockeymanager.properties.IDEqual;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.PositiveOrZero;
 import java.time.ZonedDateTime;
diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Player.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Player.java
index afe27cd00163dd27a5a4c0ed37d357878a23353c..8fd23ef09fc937e583840fc9684e965984e0318a 100644
--- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Player.java
+++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Player.java
@@ -6,13 +6,7 @@ import cz.muni.fi.pa165.icehockeymanager.properties.IDEqual;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import java.util.Objects;
 import java.util.Optional;
diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Team.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Team.java
index eee979410b1d20b1a4ef28040f699433e7bf1d1e..b8df099a064c21be11b95d11e350faafb0eb2bef 100644
--- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Team.java
+++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Team.java
@@ -6,13 +6,7 @@ import cz.muni.fi.pa165.icehockeymanager.properties.IDEqual;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import java.util.HashSet;
 import java.util.Objects;
diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerService.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerService.java
index e9f887a510dbe04e6048dc76212dfde0734a705a..aa06f7ef8df68e04c60caa9a1018b63e27a6ba2b 100644
--- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerService.java
+++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerService.java
@@ -1,6 +1,5 @@
 package cz.muni.fi.pa165.icehockeymanager.services;
 
-import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO;
 import cz.muni.fi.pa165.icehockeymanager.model.Player;
 import cz.muni.fi.pa165.icehockeymanager.model.Team;
 
diff --git a/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java b/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java
index 32b873a311bb6473a610640d294f63da43c76aa9..503dad3ed8b9f45abd943783d1f5e9c6aad29f92 100644
--- a/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java
+++ b/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java
@@ -8,11 +8,7 @@ import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;
 import cz.muni.fi.pa165.icehockeymanager.model.Game;
 import cz.muni.fi.pa165.icehockeymanager.model.Player;
 import cz.muni.fi.pa165.icehockeymanager.model.Team;
-import cz.muni.fi.pa165.icehockeymanager.services.BeanMappingService;
-import cz.muni.fi.pa165.icehockeymanager.services.BeanMappingServiceImpl;
-import cz.muni.fi.pa165.icehockeymanager.services.GameService;
-import cz.muni.fi.pa165.icehockeymanager.services.PlayerService;
-import cz.muni.fi.pa165.icehockeymanager.services.TeamService;
+import cz.muni.fi.pa165.icehockeymanager.services.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -23,18 +19,11 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = ApplicationConfig.class)