diff --git a/Mage.Common/src/mage/view/TournamentView.java b/Mage.Common/src/mage/view/TournamentView.java
index 4332df9b575..a887d53f7ab 100644
--- a/Mage.Common/src/mage/view/TournamentView.java
+++ b/Mage.Common/src/mage/view/TournamentView.java
@@ -63,7 +63,11 @@ public class TournamentView implements Serializable {
 
         tournamentName = tournament.getOptions().getName();
 
-        tournamentType = new StringBuilder(tournament.getOptions().getTournamentType()).append(" ").append(tournament.getNumberRounds()).append(" rounds").toString();
+        if (tournament.getNumberRounds() > 0) {
+            tournamentType = tournament.getOptions().getTournamentType() + " " + tournament.getNumberRounds()+ " rounds";
+        } else {
+            tournamentType = tournament.getOptions().getTournamentType();
+        }
         startTime = tournament.getStartTime();
         endTime = tournament.getEndTime();
         stepStartTime = tournament.getStepStartTime();
diff --git a/Mage/src/mage/game/tournament/TournamentPlayer.java b/Mage/src/mage/game/tournament/TournamentPlayer.java
index 21838521358..6204fd0be0b 100644
--- a/Mage/src/mage/game/tournament/TournamentPlayer.java
+++ b/Mage/src/mage/game/tournament/TournamentPlayer.java
@@ -28,15 +28,8 @@
 
 package mage.game.tournament;
 
-import java.util.List;
-import java.util.Random;
 import java.util.Set;
-import mage.cards.Card;
 import mage.cards.decks.Deck;
-import mage.cards.repository.CardCriteria;
-import mage.cards.repository.CardInfo;
-import mage.cards.repository.CardRepository;
-import mage.constants.Rarity;
 import mage.constants.TournamentPlayerState;
 import mage.players.Player;
 import mage.util.TournamentUtil;