diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index 7ab5ec5663e..91470d200e0 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -1159,18 +1159,6 @@ public class GameAction {
             }
             c.getStaticCommandList().removeAll(toRemove);
         }
-        // Exclude cards in hidden zones from update
-        /*
-         * Refactoring this code to affectedCards.removeIf((Card c) -> c.isInZone(ZoneType.Library));
-         * causes Android build not to compile
-         * */
-        Iterator<Card> it = affectedCards.iterator();
-        while (it.hasNext()) {
-            Card c = it.next();
-            if (c.isInZone(ZoneType.Library)) {
-                it.remove();
-            }
-        }
 
         // preList means that this is run by a pre Check with LKI objects
         // in that case Always trigger should not Run
diff --git a/forge-game/src/main/java/forge/game/StaticEffect.java b/forge-game/src/main/java/forge/game/StaticEffect.java
index f9292630b63..eff08621f69 100644
--- a/forge-game/src/main/java/forge/game/StaticEffect.java
+++ b/forge-game/src/main/java/forge/game/StaticEffect.java
@@ -217,13 +217,11 @@ public class StaticEffect {
             // remove P/T bonus
             affectedCard.removePTBoost(getTimestamp(), ability.getId());
 
-            // the view is updated in GameAction#checkStaticAbilities to avoid flickering
-
             // remove keywords
             // (Although nothing uses it at this time)
             if (hasParam("AddKeyword") || hasParam("RemoveKeyword") || hasParam("RemoveLandTypes")
                     || hasParam("ShareRememberedKeywords") || hasParam("RemoveAllAbilities")) {
-                affectedCard.removeChangedCardKeywords(getTimestamp(), ability.getId());
+                affectedCard.removeChangedCardKeywords(getTimestamp(), ability.getId(), false);
             }
 
             if (hasParam("CantHaveKeyword")) {
@@ -289,8 +287,6 @@ public class StaticEffect {
             }
 
             affectedCard.removeChangedSVars(getTimestamp(), ability.getId());
-
-            affectedCard.updateAbilityTextForView(); // only update keywords and text for view to avoid flickering
         }
         return affectedCards;
     }
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
index eccc6583d10..61331bd03dd 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
@@ -766,7 +766,7 @@ public final class StaticAbilityContinuous {
                 }
 
                 affectedCard.addChangedCardKeywords(newKeywords, removeKeywords,
-                        removeAllAbilities, hostCard.getTimestamp(), stAb.getId());
+                        removeAllAbilities, hostCard.getTimestamp(), stAb.getId(), false);
             }
 
             // add HIDDEN keywords
@@ -895,7 +895,7 @@ public final class StaticAbilityContinuous {
             if (addTypes != null || removeTypes != null || addAllCreatureTypes
                     || !remove.isEmpty()) {
                 affectedCard.addChangedCardTypes(addTypes, removeTypes, addAllCreatureTypes, remove,
-                        hostCard.getTimestamp(), stAb.getId(), true, stAb.hasParam("CharacteristicDefining"));
+                        hostCard.getTimestamp(), stAb.getId(), false, stAb.hasParam("CharacteristicDefining"));
             }
 
             // add colors