diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/minigame/lobby/LobbyPhase.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/minigame/lobby/LobbyPhase.java
index 3b97728..000b86b 100644
--- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/minigame/lobby/LobbyPhase.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/minigame/lobby/LobbyPhase.java
@@ -1,5 +1,6 @@
 package de.kentoj.scrow.bukkit.minigame.lobby;
 
+import de.kentoj.scrow.bukkit.minigame.Minigame;
 import de.kentoj.scrow.bukkit.minigame.phaseflow.LinearPhaseFlow;
 import de.kentoj.scrow.bukkit.minigame.phase.CompositePhase;
 import de.kentoj.scrow.bukkit.minigame.phaseflow.PhaseContext;
@@ -15,15 +16,15 @@ import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.hanging.HangingBreakByEntityEvent;
 import org.bukkit.event.player.*;
 
-public class LobbyPhase extends CompositePhase<LobbyMinigame> {
+public class LobbyPhase<T extends Minigame> extends CompositePhase<T> {
 
     @Getter
     private final LinearPhaseFlow subPhaseFlow = new LinearPhaseFlow("lobby");
 
-    public LobbyPhase(PhaseContext<LobbyMinigame> ctx) {
+    public LobbyPhase(PhaseContext<T> ctx) {
         super(ctx);
-        PhaseContext<LobbyMinigame> subCtx = new PhaseContext<>(ctx.game(), subPhaseFlow);
-        subPhaseFlow.add(new WaitForMinimumPlayersPhase<>(subCtx));
+        PhaseContext<T> subCtx = new PhaseContext<>(ctx.game(), subPhaseFlow);
+        subPhaseFlow.add(new WaitForMinimumPlayersPhase(subCtx));
         subPhaseFlow.add(new WaitForMaximumPlayersPhase(subCtx));
     }
 
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMaximumPlayersPhase.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMaximumPlayersPhase.java
index d3532f8..6c05432 100644
--- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMaximumPlayersPhase.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMaximumPlayersPhase.java
@@ -1,6 +1,6 @@
 package de.kentoj.scrow.bukkit.minigame.lobby;
 
-import de.kentoj.scrow.bukkit.gameserver.GameServer;
+import de.kentoj.scrow.bukkit.minigame.Minigame;
 import de.kentoj.scrow.bukkit.minigame.phase.Phase;
 import de.kentoj.scrow.bukkit.minigame.phaseflow.PhaseContext;
 import org.bukkit.event.player.PlayerQuitEvent;
@@ -8,36 +8,18 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
-public class WaitForMaximumPlayersPhase extends Phase<LobbyMinigame> {
+class WaitForMaximumPlayersPhase<T extends Minigame> extends Phase<T> {
 
     private int secsLeft;
-    private CompletableFuture<GameServer> deployedServer;
 
-    public WaitForMaximumPlayersPhase(PhaseContext<LobbyMinigame> ctx) {
+    public WaitForMaximumPlayersPhase(PhaseContext<T> ctx) {
         super(ctx);
-
-        var delayedExecutor = CompletableFuture.delayedExecutor(3, TimeUnit.MINUTES);
-        ctx.game().setDestroyGameServer(CompletableFuture.runAsync(() -> {
-            synchronized (ctx.game().getGameServer()) {
-                ctx.game().getGameServer().destroy();
-            }
-        }, delayedExecutor));
     }
 
     @Override
     public void onStart() {
         this.secsLeft = 5;
         ctx.listeners().on(PlayerQuitEvent.class, this::onQuit);
-
-        /*
-        this.deployedServer=Tasks.supplyAsync(() ->
-                        gameServers.deployServer(ctx.game().getGameName()))
-                .mapSync(server -> {
-                    ctx.game().setGameServer(server);
-                    return server;
-                }).toFuture()
-        ctx.game().setGameServer();
-         */
     }
 
     private void onQuit(PlayerQuitEvent ev) {
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMinimumPlayersPhase.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMinimumPlayersPhase.java
index c076ae0..2f3588f 100644
--- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMinimumPlayersPhase.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/minigame/lobby/WaitForMinimumPlayersPhase.java
@@ -5,7 +5,7 @@ import de.kentoj.scrow.bukkit.minigame.phase.Phase;
 import de.kentoj.scrow.bukkit.minigame.phaseflow.PhaseContext;
 import org.bukkit.event.player.PlayerJoinEvent;
 
-public class WaitForMinimumPlayersPhase<T extends Minigame> extends Phase<T> {
+class WaitForMinimumPlayersPhase<T extends Minigame> extends Phase<T> {
 
     public WaitForMinimumPlayersPhase(PhaseContext<T> ctx) {
         super(ctx);