diff --git a/src/game/BaseGame.java b/src/game/BaseGame.java
index ecbff71..b846af2 100644
--- a/src/game/BaseGame.java
+++ b/src/game/BaseGame.java
@@ -72,12 +72,6 @@
 	ServerSocket server;
 	Socket s;
 	boolean isHost;
-	
-	/*public static void main(String[] args) {
-		AbstractGame game = new AbstractGame();
-		game.getPlayer(game.currentPlayer).deactiveCards();
-		System.out.println("Player " + game.currentPlayer + "'s turn");
-	}*/
 
 	public BaseGame(){
 		init();
@@ -110,13 +104,10 @@
 			if(difficulty < 0) difficulty = 0;
 			if(fontSize <= 0) fontSize = 20;
 		} catch (JSONException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	}
@@ -159,9 +150,6 @@
 	
 	protected void createPlayers(){
 		players = new AbstractPlayer[N_PLAYERS];
-		/*for(int i=0; i<NR_PLAYERS; ++i){
-			players[i] = new AbstractPlayer(CARDS_PER_PLAYER, this, i);
-		}*/
 	}
 	
 	private void addCards(){
@@ -215,7 +203,6 @@
 		dealCard(index, currentPlayer);
 		players[currentPlayer].setCardInfo(index, "");
 		Card c = players[currentPlayer].getCard(index);
-		//JLabel card = ((SwingPlayer) players[currentPlayer]).getUiCard(index);
 		if(c.getValue() == -1){ //dummy card, no more cards
 			setNoCard(index);
 		}
@@ -384,18 +371,14 @@
 		if(roundsLeft >= 0) roundsLeft--;
 		int selCardIndex = 0;
 		for(int i=0; i<CARDS_PER_PLAYER; ++i){
-			//SwingPlayer sp = (SwingPlayer) players[selectedPlayer];
-			//JLabel card = sp.getUiCard(i);
 			AbstractPlayer player = players[selectedPlayer];
 			Card card = player.getCard(i);
 			String from = "(from Player " + currentPlayer + ")";
 			if(card.isSelected()){
 				selCardIndex = i;
-				//card.setBackground(Color.black);
 				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;
@@ -486,13 +469,4 @@
 		trashCard = false;
 	}
 	protected abstract void showTrash();
-	
-	/*private void printArray(int[][] arr){
-		for(int j=0; j<arr.length; ++j){
-			for(int k=0; k<arr[0].length; ++k){
-				System.out.print(arr[j][k] + ", ");
-			}
-			System.out.println("");
-		}
-	}*/
 }
\ No newline at end of file
diff --git a/src/player/ConsolePlayer.java b/src/player/ConsolePlayer.java
index 57f40cd..08e2577 100644
--- a/src/player/ConsolePlayer.java
+++ b/src/player/ConsolePlayer.java
@@ -1,83 +1,83 @@
-package player;
-
-import game.AbstractGame;
-
-
-public class ConsolePlayer extends AbstractPlayer {
-
-	public ConsolePlayer(int cards, AbstractGame g, int Id) {
-		super(cards, g, Id);
-	}
-
-	@Override
-	public void setName(int index, String name) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public String getName(int index) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public void setSize(int index, int width, int height) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void setColor(int index, int r, int g, int b) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public int[] getColor(int index) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public void setBackground(int index, int r, int g, int b) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public int[] getBackground(int index) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public void setText(int index, String text) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public String getText(int index) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public void unsetListeners(int index) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void deactiveCards() {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void activeCards() {
-		// TODO Auto-generated method stub
-		
-	}
-}
\ No newline at end of file
+//package player;
+//
+//import game.AbstractGame;
+//
+//
+//public class ConsolePlayer extends AbstractPlayer {
+//
+//	public ConsolePlayer(int cards, AbstractGame g, int Id) {
+//		super(cards, g, Id);
+//	}
+//
+//	@Override
+//	public void setName(int index, String name) {
+//		// TODO Auto-generated method stub
+//		
+//	}
+//
+//	@Override
+//	public String getName(int index) {
+//		// TODO Auto-generated method stub
+//		return null;
+//	}
+//
+//	@Override
+//	public void setSize(int index, int width, int height) {
+//		// TODO Auto-generated method stub
+//		
+//	}
+//
+//	@Override
+//	public void setColor(int index, int r, int g, int b) {
+//		// TODO Auto-generated method stub
+//		
+//	}
+//
+//	@Override
+//	public int[] getColor(int index) {
+//		// TODO Auto-generated method stub
+//		return null;
+//	}
+//
+//	@Override
+//	public void setBackground(int index, int r, int g, int b) {
+//		// TODO Auto-generated method stub
+//		
+//	}
+//
+//	@Override
+//	public int[] getBackground(int index) {
+//		// TODO Auto-generated method stub
+//		return null;
+//	}
+//
+//	@Override
+//	public void setText(int index, String text) {
+//		// TODO Auto-generated method stub
+//		
+//	}
+//
+//	@Override
+//	public String getText(int index) {
+//		// TODO Auto-generated method stub
+//		return null;
+//	}
+//
+//	@Override
+//	public void unsetListeners(int index) {
+//		// TODO Auto-generated method stub
+//		
+//	}
+//
+//	@Override
+//	public void deactiveCards() {
+//		// TODO Auto-generated method stub
+//		
+//	}
+//
+//	@Override
+//	public void activeCards() {
+//		// TODO Auto-generated method stub
+//		
+//	}
+//}
\ No newline at end of file