diff --git a/bin/cards/maumau/model/Canceled.class b/bin/cards/maumau/model/Canceled.class
index 801751c..7c6b015 100644
Binary files a/bin/cards/maumau/model/Canceled.class and b/bin/cards/maumau/model/Canceled.class differ
diff --git a/bin/cards/maumau/model/Finished.class b/bin/cards/maumau/model/Finished.class
index 719c537..10cd4a8 100644
Binary files a/bin/cards/maumau/model/Finished.class and b/bin/cards/maumau/model/Finished.class differ
diff --git a/bin/cards/maumau/model/HandlerState.class b/bin/cards/maumau/model/HandlerState.class
index 5022551..394f7ea 100644
Binary files a/bin/cards/maumau/model/HandlerState.class and b/bin/cards/maumau/model/HandlerState.class differ
diff --git a/bin/cards/maumau/model/Initialized.class b/bin/cards/maumau/model/Initialized.class
index 26d0b8f..bf1ebd8 100644
Binary files a/bin/cards/maumau/model/Initialized.class and b/bin/cards/maumau/model/Initialized.class differ
diff --git a/bin/cards/maumau/model/JackChosen.class b/bin/cards/maumau/model/JackChosen.class
index ecc281c..b6d081f 100644
Binary files a/bin/cards/maumau/model/JackChosen.class and b/bin/cards/maumau/model/JackChosen.class differ
diff --git a/bin/cards/maumau/model/Normal.class b/bin/cards/maumau/model/Normal.class
index 6ff27b7..e9d1997 100644
Binary files a/bin/cards/maumau/model/Normal.class and b/bin/cards/maumau/model/Normal.class differ
diff --git a/bin/cards/maumau/model/SevenChosen.class b/bin/cards/maumau/model/SevenChosen.class
index c7f3ded..612f7f1 100644
Binary files a/bin/cards/maumau/model/SevenChosen.class and b/bin/cards/maumau/model/SevenChosen.class differ
diff --git a/bin/cards/maumau/model/SuitChosen.class b/bin/cards/maumau/model/SuitChosen.class
index bb64e6f..b475eeb 100644
Binary files a/bin/cards/maumau/model/SuitChosen.class and b/bin/cards/maumau/model/SuitChosen.class differ
diff --git a/src/cards/maumau/model/Canceled.java b/src/cards/maumau/model/Canceled.java
index 5c356a8..1d2b6ad 100644
--- a/src/cards/maumau/model/Canceled.java
+++ b/src/cards/maumau/model/Canceled.java
@@ -13,7 +13,6 @@ public class Canceled implements HandlerState {
 
     public void addPlayer(Player player){}
     public void startGame(){}
-    public void finishGame(){}
     public void cancelGame(){}
     public void chooseCard(Card c){}
     public void chooseSuit(Suit suit){}
diff --git a/src/cards/maumau/model/Finished.java b/src/cards/maumau/model/Finished.java
index 6c8ca69..eb2a9ee 100644
--- a/src/cards/maumau/model/Finished.java
+++ b/src/cards/maumau/model/Finished.java
@@ -12,7 +12,6 @@ public class Finished implements HandlerState{
 
     public void addPlayer(Player player){}
     public void startGame(){}
-    public void finishGame(){}
     public void cancelGame(){}
     public void chooseCard(Card c){}
     public void chooseSuit(Suit suit){}
diff --git a/src/cards/maumau/model/HandlerState.java b/src/cards/maumau/model/HandlerState.java
index 9736aa4..0bc72ba 100644
--- a/src/cards/maumau/model/HandlerState.java
+++ b/src/cards/maumau/model/HandlerState.java
@@ -7,7 +7,6 @@ public interface HandlerState {
     
     void addPlayer(Player player);
     void startGame();
-    void finishGame();
     void cancelGame();
     void chooseCard(Card c);
     void chooseSuit(Suit suit);
diff --git a/src/cards/maumau/model/Initialized.java b/src/cards/maumau/model/Initialized.java
index 296a733..20a25d0 100644
--- a/src/cards/maumau/model/Initialized.java
+++ b/src/cards/maumau/model/Initialized.java
@@ -28,7 +28,6 @@ public class Initialized implements HandlerState {
         }
     }
 
-    public void finishGame(){}
     public void cancelGame(){}
     public void chooseCard(Card c){}
     public void chooseSuit(Suit suit){}
diff --git a/src/cards/maumau/model/JackChosen.java b/src/cards/maumau/model/JackChosen.java
index c9a7743..eb6c1ca 100644
--- a/src/cards/maumau/model/JackChosen.java
+++ b/src/cards/maumau/model/JackChosen.java
@@ -21,7 +21,6 @@ public class JackChosen implements HandlerState{
 
     public void startGame(){}
     public void addPlayer(Player player){}
-    public void finishGame(){}
     public void cancelGame(){}
     public void chooseCard(Card c){}
     public void skip(){}
diff --git a/src/cards/maumau/model/Normal.java b/src/cards/maumau/model/Normal.java
index 9b3f898..769a85a 100644
--- a/src/cards/maumau/model/Normal.java
+++ b/src/cards/maumau/model/Normal.java
@@ -13,10 +13,6 @@ public class Normal implements HandlerState {
 
     public void addPlayer(Player player){}
     public void startGame(){}
-    public void finishGame(){
-        handler.setGameState(GameState.GAME_OVER);
-        handler.setHandlerState(new Finished(handler));
-    }
     public void cancelGame(){}
 
     public void chooseCard(Card c){
diff --git a/src/cards/maumau/model/SevenChosen.java b/src/cards/maumau/model/SevenChosen.java
index b999aa1..c3475af 100644
--- a/src/cards/maumau/model/SevenChosen.java
+++ b/src/cards/maumau/model/SevenChosen.java
@@ -12,7 +12,6 @@ public class SevenChosen implements HandlerState{
 
     public void addPlayer(Player player){}
     public void startGame(){}
-    public void finishGame(){}
     public void cancelGame(){}
 
     public void chooseCard(Card c){
diff --git a/src/cards/maumau/model/SuitChosen.java b/src/cards/maumau/model/SuitChosen.java
index 2729d3a..d1c8216 100644
--- a/src/cards/maumau/model/SuitChosen.java
+++ b/src/cards/maumau/model/SuitChosen.java
@@ -13,7 +13,6 @@ public class SuitChosen implements HandlerState{
 
     public void addPlayer(Player player){}
     public void startGame(){}
-    public void finishGame(){}
     public void cancelGame(){}
 
     public void chooseCard(Card c){