diff --git a/src/server/ServerGame.java b/src/server/ServerGame.java
index f00e0f5..eabfdf3 100644
--- a/src/server/ServerGame.java
+++ b/src/server/ServerGame.java
@@ -103,67 +103,6 @@
 		//TODO shuffle
 	}
 
-	// protected void onNext(){
-	// if(!checkValidMove()){
-	// printMessage("Please select all cards of the selected color/value",
-	// MSG_TYPES.ERROR);
-	// return;
-	// }
-	// if(roundsLeft >= 0) roundsLeft--;
-	// int selCardIndex = 0;
-	// AbstractPlayer player = players[selectedPlayer];
-	// for(int i=0; i<CARDS_PER_PLAYER; ++i){
-	// Card card = player.getCard(i);
-	// String from = "(from Player " + currentPlayer + ")";
-	// if(card.isSelected()){
-	// selCardIndex = i;
-	// card.setSelected(false);
-	// if(useColor){
-	// String color = "- " + Card.intColorToText(chosenColor);
-	// player.setCardInfo(i, player.getCardInfo(i) + color + " " + from + "\n");
-	// } else if(useValue){
-	// String value = "- is " + chosenValue;
-	// player.setCardInfo(i, player.getCardInfo(i) + value + " " + from + "\n");
-	// }
-	// } else {
-	// if(useColor){
-	// String color = "- not " + Card.intColorToText(chosenColor);
-	// player.setCardInfo(i, player.getCardInfo(i) + color + " " + from + "\n");
-	// } else if(useValue){
-	// String value = "- is not " + chosenValue;
-	// player.setCardInfo(i, player.getCardInfo(i) + value + " " + from + "\n");
-	// }
-	// }
-	// }
-	// if(useColor || useValue){
-	// removeHint();
-	// } else if(trashCard){
-	// moveCardToTrash(selCardIndex);
-	// addHint();
-	// } else if(placeCard){
-	// Card c = players[currentPlayer].getCard(selCardIndex);
-	// int color = c.getColorInt();
-	// int value = c.getValue();
-	// int deckValue = deckCounter[color] + 1;
-	// if(deckValue == value){ //place card possible
-	// placeCard(c, color, value-1);
-	// } else { //card too high or too low
-	// addThunder();
-	// moveCardToTrash(selCardIndex);
-	// }
-	// setWonOrLost();
-	// if(lost) return;
-	// updateCard(selCardIndex);
-	// }
-	// players[currentPlayer].activeCards();
-	// printMessage("Player " + (currentPlayer+1) + " has finished his move!",
-	// MSG_TYPES.INFORMATION);
-	// currentPlayer++;
-	// if(currentPlayer == N_PLAYERS) currentPlayer = 0;
-	// players[currentPlayer].deactiveCards();
-	// resetMoveValues();
-	// }
-
 	protected void receive(DataInputStream inStream) {
 		Log("Server - Receiving");
 		byte[] magic = new byte[4];
diff --git a/src/server/SwingClientGame.java b/src/server/SwingClientGame.java
index 6daadc2..cdd420c 100644
--- a/src/server/SwingClientGame.java
+++ b/src/server/SwingClientGame.java
@@ -151,19 +151,16 @@
 			layoutConstr.weightx = 0.6;
 			layoutConstr.gridwidth = 1;
 			int index = (nPlayers == 2) ? 1 : 2;
-			//mainFrame.add(((SwingPlayer) players[index]).getContainer(), layoutConstr);
 			JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(index)]).getPlayerUi();
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.X_AXIS));
 			mainFrame.add(playerPanel, layoutConstr);
 		} else {
 			layoutConstr.weightx = 0.3;
 			layoutConstr.gridwidth = 1;
-			//mainFrame.add(((SwingPlayer) players[3]).getContainer(), layoutConstr);
 			JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(3)]).getPlayerUi();
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.X_AXIS));
 			mainFrame.add(playerPanel, layoutConstr);
 			layoutConstr.gridx = 2;
-			//mainFrame.add(((SwingPlayer) players[2]).getContainer(), layoutConstr);
 			playerPanel = ((SwingPlayer) players[getPlayersSightId(2)]).getPlayerUi();
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.X_AXIS));
 			mainFrame.add(playerPanel, layoutConstr);
@@ -185,7 +182,6 @@
 			mainFrame.add(new JPanel(), layoutConstr);
 		} else {
 			int index = (nPlayers == 4) ? 3 : 4;
-			//mainFrame.add(((SwingPlayer) players[index]).getContainer(), layoutConstr);
 			JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(index)]).getPlayerUi();
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.Y_AXIS));
 			mainFrame.add(playerPanel, layoutConstr);
@@ -203,7 +199,6 @@
 		if(nPlayers == 2){
 			mainFrame.add(new JPanel(), layoutConstr);
 		} else {
-			//mainFrame.add(((SwingPlayer) players[1]).getContainer(), layoutConstr);
 			JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(1)]).getPlayerUi();
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.Y_AXIS));
 			mainFrame.add(playerPanel, layoutConstr);
@@ -220,7 +215,6 @@
 		layoutConstr.gridx = 1;
 		layoutConstr.weightx = 0.6;
 		layoutConstr.gridwidth = (nPlayers < 5) ? 1 : 2;
-		//mainFrame.add(((SwingPlayer) players[0]).getContainer(), layoutConstr);
 		JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(0)]).getPlayerUi();
 		playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.X_AXIS));
 		mainFrame.add(playerPanel, layoutConstr);