diff --git a/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt b/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt
index 2c63ae94..21616214 100644
--- a/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt
@@ -24,6 +24,7 @@ import de.steamwar.tntleague.command.*
 import de.steamwar.tntleague.events.GlobalListener
 import de.steamwar.tntleague.events.LobbyListener
 import de.steamwar.tntleague.game.TNTLeagueTeam
+import org.bukkit.Bukkit
 import org.bukkit.plugin.java.JavaPlugin
 
 lateinit var plugin: TNTLeague
@@ -47,6 +48,11 @@ class TNTLeague : JavaPlugin() {
         AcceptCommand.register()
         RemoveCommand.register()
         LeaveCommand.register()
+
+        plugin.server.scheduler.runTaskLater(plugin, Runnable {
+            if (server.onlinePlayers.size >= 2) return@Runnable
+            Bukkit.shutdown()
+        }, 20 * 60 * 5)
     }
 }
 
diff --git a/TNTLeague/src/de/steamwar/tntleague/events/LobbyListener.kt b/TNTLeague/src/de/steamwar/tntleague/events/LobbyListener.kt
index bb570498..d160498f 100644
--- a/TNTLeague/src/de/steamwar/tntleague/events/LobbyListener.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/events/LobbyListener.kt
@@ -23,7 +23,6 @@ import de.steamwar.tntleague.game.TNTLeagueGame
 import org.bukkit.GameMode
 import org.bukkit.entity.EntityType
 import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.entity.EntityDamageEvent
 import org.bukkit.event.inventory.InventoryClickEvent
diff --git a/TNTLeague/src/de/steamwar/tntleague/util/TNTLeagueScoreboard.kt b/TNTLeague/src/de/steamwar/tntleague/util/TNTLeagueScoreboard.kt
index 204680d0..40fb4138 100644
--- a/TNTLeague/src/de/steamwar/tntleague/util/TNTLeagueScoreboard.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/util/TNTLeagueScoreboard.kt
@@ -19,9 +19,7 @@
 
 package de.steamwar.tntleague.util
 
-import de.steamwar.message.SubMessage
 import de.steamwar.scoreboard.ScoreboardCallback
-import de.steamwar.tntleague.colorByTeam
 import de.steamwar.tntleague.config.targetedBlocks
 import de.steamwar.tntleague.game.TNTLeagueGame
 import de.steamwar.tntleague.game.TNTLeagueTeam