diff --git a/Mage.Sets/src/mage/cards/a/AtomwheelAcrobats.java b/Mage.Sets/src/mage/cards/a/AtomwheelAcrobats.java
index 8ea23bace4f..9909d2b9ce8 100644
--- a/Mage.Sets/src/mage/cards/a/AtomwheelAcrobats.java
+++ b/Mage.Sets/src/mage/cards/a/AtomwheelAcrobats.java
@@ -35,8 +35,7 @@ public final class AtomwheelAcrobats extends CardImpl {
         this.addAbility(new AtomwheelAcrobatsTriggeredAbility());
 
         // {2}{G}: Roll a six-sided die.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RollDiceEffect(null, 6), new ManaCostsImpl<>("{2}{G}"));
-        this.addAbility(ability);
+        this.addAbility(new SimpleActivatedAbility(new RollDiceEffect(6), new ManaCostsImpl<>("{2}{G}")));
     }
 
     private AtomwheelAcrobats(final AtomwheelAcrobats card) {
diff --git a/Mage.Sets/src/mage/cards/c/ChickenALaKing.java b/Mage.Sets/src/mage/cards/c/ChickenALaKing.java
index bffc8641de0..24773df3209 100644
--- a/Mage.Sets/src/mage/cards/c/ChickenALaKing.java
+++ b/Mage.Sets/src/mage/cards/c/ChickenALaKing.java
@@ -9,7 +9,6 @@ import mage.abilities.effects.common.counter.AddCountersAllEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.counters.CounterType;
@@ -47,7 +46,7 @@ public final class ChickenALaKing extends CardImpl {
         this.addAbility(new ChickenALaKingTriggeredAbility());
 
         // Tap an untapped Bird you control: Roll a six-sided die.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RollDiceEffect(null, Outcome.Benefit, 6), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false))));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RollDiceEffect(6), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false))));
     }
 
     private ChickenALaKing(final ChickenALaKing card) {
diff --git a/Mage.Sets/src/mage/cards/m/MonoxaMidwayManager.java b/Mage.Sets/src/mage/cards/m/MonoxaMidwayManager.java
index e02fb8d6bd4..e15c36434e8 100644
--- a/Mage.Sets/src/mage/cards/m/MonoxaMidwayManager.java
+++ b/Mage.Sets/src/mage/cards/m/MonoxaMidwayManager.java
@@ -38,7 +38,7 @@ public final class MonoxaMidwayManager extends CardImpl {
         this.addAbility(new MonoxaMidwayManagerTriggeredAbility());
 
         // {6}: Roll a six-sided die.
-        this.addAbility(new SimpleActivatedAbility(new RollDiceEffect(null, 6), new GenericManaCost(6)));
+        this.addAbility(new SimpleActivatedAbility(new RollDiceEffect(6), new GenericManaCost(6)));
     }
 
     private MonoxaMidwayManager(final MonoxaMidwayManager card) {
diff --git a/Mage.Sets/src/mage/cards/s/SteelSquirrel.java b/Mage.Sets/src/mage/cards/s/SteelSquirrel.java
index 20fd20a11a8..cb4543b17ba 100644
--- a/Mage.Sets/src/mage/cards/s/SteelSquirrel.java
+++ b/Mage.Sets/src/mage/cards/s/SteelSquirrel.java
@@ -36,7 +36,7 @@ public final class SteelSquirrel extends CardImpl {
         this.addAbility(new SteelSquirrelTriggeredAbility());
 
         // 6: Roll a six-sided die.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RollDiceEffect(null, 6), new GenericManaCost(6));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RollDiceEffect(6), new GenericManaCost(6));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/cards/v/VexingPuzzlebox.java b/Mage.Sets/src/mage/cards/v/VexingPuzzlebox.java
index 82ccaad8172..bae5f0e9d5d 100644
--- a/Mage.Sets/src/mage/cards/v/VexingPuzzlebox.java
+++ b/Mage.Sets/src/mage/cards/v/VexingPuzzlebox.java
@@ -36,7 +36,7 @@ public final class VexingPuzzlebox extends CardImpl {
 
         // {T}: Add one mana of any color. Roll a d20.
         AnyColorManaAbility manaAbility = new AnyColorManaAbility();
-        manaAbility.addEffect(new RollDiceEffect(null, 20).setText("Roll a d20"));
+        manaAbility.addEffect(new RollDiceEffect(20).setText("Roll a d20"));
         manaAbility.setUndoPossible(false);
         this.addAbility(manaAbility);
 
diff --git a/Mage.Sets/src/mage/cards/w/WillingTestSubject.java b/Mage.Sets/src/mage/cards/w/WillingTestSubject.java
index 4681754658d..d6fccff2bf4 100644
--- a/Mage.Sets/src/mage/cards/w/WillingTestSubject.java
+++ b/Mage.Sets/src/mage/cards/w/WillingTestSubject.java
@@ -42,7 +42,7 @@ public final class WillingTestSubject extends CardImpl {
         this.addAbility(new WillingTestSubjectTriggeredAbility());
 
         // 6: Roll a six-sided die.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RollDiceEffect(null, 6), new GenericManaCost(6));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RollDiceEffect(6), new GenericManaCost(6));
         this.addAbility(ability);
     }
 
diff --git a/Mage/src/main/java/mage/abilities/effects/common/RollDiceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RollDiceEffect.java
index 16bbc2acaeb..8c67969f5e9 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/RollDiceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/RollDiceEffect.java
@@ -1,10 +1,7 @@
 package mage.abilities.effects.common;
 
-import mage.MageObject;
 import mage.abilities.Ability;
 import mage.abilities.Mode;
-import mage.abilities.effects.Effect;
-import mage.abilities.effects.Effects;
 import mage.abilities.effects.OneShotEffect;
 import mage.constants.Outcome;
 import mage.game.Game;
@@ -16,36 +13,22 @@ import mage.util.CardUtil;
  */
 public class RollDiceEffect extends OneShotEffect {
 
-    protected Effects executingEffects = new Effects();
     protected int numSides;
 
-    public RollDiceEffect(Effect effect, int numSides) {
-        this(effect, Outcome.Neutral, numSides);
-    }
-
-    public RollDiceEffect(Effect effect, Outcome outcome, int numSides) {
-        super(outcome);
-        addEffect(effect);
+    public RollDiceEffect(int numSides) {
+        super(Outcome.Benefit);
         this.numSides = numSides;
     }
 
     protected RollDiceEffect(final RollDiceEffect effect) {
         super(effect);
-        this.executingEffects = effect.executingEffects.copy();
         this.numSides = effect.numSides;
     }
 
-    public void addEffect(Effect effect) {
-        if (effect != null) {
-            executingEffects.add(effect);
-        }
-    }
-
     @Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
-        MageObject mageObject = game.getObject(source);
-        if (controller != null && mageObject != null) {
+        if (controller != null) {
             controller.rollDice(outcome, source, game, numSides);
             return true;
         }
@@ -57,7 +40,7 @@ public class RollDiceEffect extends OneShotEffect {
         if (!staticText.isEmpty()) {
             return staticText;
         }
-        return "Roll a " + CardUtil.numberToText(numSides) + "-sided die";
+        return "roll a " + CardUtil.numberToText(numSides) + "-sided die";
     }
 
     @Override