diff --git a/src/main/java/de/mannheim/th/chess/domain/Game.java b/src/main/java/de/mannheim/th/chess/domain/Game.java
index f2503db..12014e9 100644
--- a/src/main/java/de/mannheim/th/chess/domain/Game.java
+++ b/src/main/java/de/mannheim/th/chess/domain/Game.java
@@ -173,7 +173,11 @@ public class Game {
     Move move = new Move(origin, desination);
     Piece removedPiece = board.getPiece(desination);
     if (removedPiece != Piece.NONE) {
+    	int removedPiecesCount = removedPieces.size();
     	removedPieces.add(removedPiece);
+    	if (removedPieces.size() > removedPiecesCount + 1) {
+    		removedPieces.removeLast();
+    	}
     }
     this.board.doMove(move);
     this.movelist.add(move);
diff --git a/src/main/java/de/mannheim/th/chess/ui/MainFrame.java b/src/main/java/de/mannheim/th/chess/ui/MainFrame.java
index 11c7e4d..320ec61 100644
--- a/src/main/java/de/mannheim/th/chess/ui/MainFrame.java
+++ b/src/main/java/de/mannheim/th/chess/ui/MainFrame.java
@@ -9,7 +9,6 @@ import javax.swing.border.EmptyBorder;
 
 // import de.mannheim.th.chess.App;
 import de.mannheim.th.chess.domain.Game;
-import de.mannheim.th.chess.utl.OpeningRecognizer;
 
 import javax.swing.JLabel;
 
diff --git a/src/main/java/de/mannheim/th/chess/ui/SpielFrame.java b/src/main/java/de/mannheim/th/chess/ui/SpielFrame.java
index 574fb7e..4a114cc 100644
--- a/src/main/java/de/mannheim/th/chess/ui/SpielFrame.java
+++ b/src/main/java/de/mannheim/th/chess/ui/SpielFrame.java
@@ -606,6 +606,7 @@ public class SpielFrame extends JFrame {
 		}
 
 		ausgabe.setText(sb.toString());
+		anzeigeMoves.removeLast();
 	}
 
 	private JPanel getUiPlayerOne() {