diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index c92246ab804..4f6a91b81d4 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -201,10 +201,6 @@ public class GameAction {
             }
 
             if (!c.isToken()) {
-                if (c.removeChangedState()) {
-                    c.updateStateForView();
-                }
-
                 copied = CardFactory.copyCard(c, false);
 
                 if (fromBattlefield) {
diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java
index e8f5cef39ba..21274785182 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactory.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactory.java
@@ -85,17 +85,9 @@ public class CardFactory {
             // need to copy this values for the tokens
             out.setEmbalmed(in.isEmbalmed());
             out.setEternalized(in.isEternalized());
-
-            // add abilities
-            //for (SpellAbility sa : in.getIntrinsicSpellAbilities()) {
-            //    out.addSpellAbility(sa);
-            //}
         }
 
         out.setZone(in.getZone());
-        for (final CardStateName state : in.getStates()) {
-            CardFactory.copyState(in, state, out, state);
-        }
         out.setState(in.getCurrentStateName(), true);
         out.setBackSide(in.isBackSide());