diff --git a/client/src/main/java/fr/lnl/game/client/App.java b/client/src/main/java/fr/lnl/game/client/App.java
index 1d0fc7b..099c6d9 100644
--- a/client/src/main/java/fr/lnl/game/client/App.java
+++ b/client/src/main/java/fr/lnl/game/client/App.java
@@ -14,7 +14,10 @@ import javafx.application.Application;
 import javafx.stage.Stage;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * Application starting point
diff --git a/client/src/main/java/fr/lnl/game/client/listener/NextPlayerButtonListener.java b/client/src/main/java/fr/lnl/game/client/listener/NextPlayerButtonListener.java
index 5c28445..3d67ca5 100644
--- a/client/src/main/java/fr/lnl/game/client/listener/NextPlayerButtonListener.java
+++ b/client/src/main/java/fr/lnl/game/client/listener/NextPlayerButtonListener.java
@@ -2,10 +2,7 @@ package fr.lnl.game.client.listener;
 
 import fr.lnl.game.client.App;
 import fr.lnl.game.server.games.Game;
-import fr.lnl.game.server.games.player.Player;
 import fr.lnl.game.server.listener.AbstractModelListening;
-import fr.lnl.game.server.listener.ModelListener;
-import javafx.scene.control.Alert;
 
 /**
  * This method is call when the current player have selected an action to play (or if it's a computer player, will
diff --git a/client/src/main/java/fr/lnl/game/client/listener/SelectDirectionListener.java b/client/src/main/java/fr/lnl/game/client/listener/SelectDirectionListener.java
index 07a3557..4d95554 100644
--- a/client/src/main/java/fr/lnl/game/client/listener/SelectDirectionListener.java
+++ b/client/src/main/java/fr/lnl/game/client/listener/SelectDirectionListener.java
@@ -4,7 +4,6 @@ import fr.lnl.game.client.view.Window;
 import fr.lnl.game.server.games.Game;
 import fr.lnl.game.server.games.action.Action;
 import fr.lnl.game.server.listener.AbstractModelListening;
-import fr.lnl.game.server.listener.ModelListener;
 
 /**
  * Call when the player selected the direction where it wants to play it
diff --git a/client/src/main/java/fr/lnl/game/client/view/ViewManager.java b/client/src/main/java/fr/lnl/game/client/view/ViewManager.java
index 6fd2a21..326d185 100644
--- a/client/src/main/java/fr/lnl/game/client/view/ViewManager.java
+++ b/client/src/main/java/fr/lnl/game/client/view/ViewManager.java
@@ -8,7 +8,6 @@ import fr.lnl.game.server.games.player.HumanPlayer;
 import fr.lnl.game.server.games.player.Player;
 
 import java.util.HashMap;
-import java.util.Objects;
 import java.util.Scanner;
 
 /**
diff --git a/client/src/main/java/fr/lnl/game/client/view/Window.java b/client/src/main/java/fr/lnl/game/client/view/Window.java
index d517f07..5bd2b02 100644
--- a/client/src/main/java/fr/lnl/game/client/view/Window.java
+++ b/client/src/main/java/fr/lnl/game/client/view/Window.java
@@ -1,14 +1,17 @@
 package fr.lnl.game.client.view;
 
 import fr.lnl.game.client.App;
-import fr.lnl.game.client.listener.NextPlayerButtonListener;
 import fr.lnl.game.client.listener.ClientEventHandler;
+import fr.lnl.game.client.listener.NextPlayerButtonListener;
 import fr.lnl.game.client.listener.SelectActionButton;
 import fr.lnl.game.client.listener.SelectDirectionListener;
 import fr.lnl.game.server.games.Game;
 import fr.lnl.game.server.games.action.*;
 import fr.lnl.game.server.games.grid.Grid;
-import fr.lnl.game.server.games.grid.elements.*;
+import fr.lnl.game.server.games.grid.elements.Box;
+import fr.lnl.game.server.games.grid.elements.EnergyBall;
+import fr.lnl.game.server.games.grid.elements.Explosive;
+import fr.lnl.game.server.games.grid.elements.Wall;
 import fr.lnl.game.server.games.player.HumanPlayer;
 import fr.lnl.game.server.games.player.Player;
 import fr.lnl.game.server.utils.Pair;
diff --git a/server/src/main/java/fr/lnl/game/server/games/Game.java b/server/src/main/java/fr/lnl/game/server/games/Game.java
index 7fa5aa6..b6c0ea6 100644
--- a/server/src/main/java/fr/lnl/game/server/games/Game.java
+++ b/server/src/main/java/fr/lnl/game/server/games/Game.java
@@ -6,7 +6,6 @@ import fr.lnl.game.server.games.grid.build.GridFactoryBuilder;
 import fr.lnl.game.server.games.grid.elements.CountdownBox;
 import fr.lnl.game.server.games.player.ComputerPlayer;
 import fr.lnl.game.server.games.player.Player;
-import fr.lnl.game.server.utils.Point;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/server/src/main/java/fr/lnl/game/server/games/action/AbstractAction.java b/server/src/main/java/fr/lnl/game/server/games/action/AbstractAction.java
index 72212f1..e4a51ac 100644
--- a/server/src/main/java/fr/lnl/game/server/games/action/AbstractAction.java
+++ b/server/src/main/java/fr/lnl/game/server/games/action/AbstractAction.java
@@ -2,10 +2,6 @@ package fr.lnl.game.server.games.action;
 
 import fr.lnl.game.server.games.Game;
 import fr.lnl.game.server.games.player.Player;
-import fr.lnl.game.server.utils.Point;
-
-import java.util.List;
-import java.util.Random;
 
 public abstract class AbstractAction implements Action {
 
diff --git a/server/src/main/java/fr/lnl/game/server/games/player/RandomComputerPlayer.java b/server/src/main/java/fr/lnl/game/server/games/player/RandomComputerPlayer.java
index 3a1af8b..d0be3d7 100644
--- a/server/src/main/java/fr/lnl/game/server/games/player/RandomComputerPlayer.java
+++ b/server/src/main/java/fr/lnl/game/server/games/player/RandomComputerPlayer.java
@@ -2,8 +2,6 @@ package fr.lnl.game.server.games.player;
 
 import fr.lnl.game.server.games.Game;
 import fr.lnl.game.server.games.action.Action;
-import fr.lnl.game.server.games.action.Nothing;
-import fr.lnl.game.server.games.grid.Grid;
 import fr.lnl.game.server.utils.Point;
 
 import java.util.Random;
diff --git a/server/src/main/java/fr/lnl/game/server/games/player/StrategyComputerPlayer.java b/server/src/main/java/fr/lnl/game/server/games/player/StrategyComputerPlayer.java
index a681bd9..ce20ca7 100644
--- a/server/src/main/java/fr/lnl/game/server/games/player/StrategyComputerPlayer.java
+++ b/server/src/main/java/fr/lnl/game/server/games/player/StrategyComputerPlayer.java
@@ -2,7 +2,6 @@ package fr.lnl.game.server.games.player;
 
 import fr.lnl.game.server.games.Game;
 import fr.lnl.game.server.games.action.*;
-import fr.lnl.game.server.games.grid.Grid;
 import fr.lnl.game.server.games.grid.elements.Box;
 import fr.lnl.game.server.games.grid.elements.EnergyBall;
 import fr.lnl.game.server.games.grid.elements.Explosive;
@@ -10,8 +9,6 @@ import fr.lnl.game.server.utils.Point;
 
 import java.util.List;
 import java.util.Random;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 public class StrategyComputerPlayer extends ComputerPlayer {