diff --git a/.gitattributes b/.gitattributes
index 4746c3b2656..4d816ab202f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5476,8 +5476,6 @@ src/forge/OldDeckIO.java svneol=native#text/plain
 src/forge/Phase.java svneol=native#text/plain
 src/forge/PhaseObserver.java svneol=native#text/plain
 src/forge/Player.java -text svneol=native#text/plain
-src/forge/PlayerLife.java svneol=native#text/plain
-src/forge/PlayerPoisonCounter.java -text svneol=native#text/plain
 src/forge/PlayerUtil.java -text svneol=native#text/plain
 src/forge/PlayerZone.java svneol=native#text/plain
 src/forge/PlayerZoneUtil.java svneol=native#text/plain
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index d6dcd89600d..579a9a91931 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -7691,7 +7691,7 @@ public class CardFactory implements NewConstants {
                 
                 @Override
                 public void showMessage() {
-                	boolean paid = AllZone.GameAction.payLife(card.getController(), 1, card);
+                	boolean paid = card.getController().payLife(1, card);
                     
                     //this order is very important, do not change
                     stop();
@@ -7755,7 +7755,7 @@ public class CardFactory implements NewConstants {
                 
                 @Override
                 public void showMessage() {
-                	boolean paid = AllZone.GameAction.payLife(card.getController(), 1, card);
+                	boolean paid = card.getController().payLife(1, card);
                     
                     //this order is very important, do not change
                     stop();
diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java
index 30acad0ff46..d2c6dcaba1d 100644
--- a/src/forge/GameAction.java
+++ b/src/forge/GameAction.java
@@ -2573,21 +2573,6 @@ public class GameAction {
         return list.contains(card);
     }
     
-    public boolean payLife(Player player, int lifePayment, Card source){
-    	if( null == player ) return false;
-    	else return player.payLife(lifePayment, source);
-    	//    	if(player == null) return false;
-    	//    	
-    	//    	int curLife = player.getLife();
-    	//    	
-    	//    	if (lifePayment <= curLife){
-    	//    		player.subtractLife(lifePayment, source);
-    	//    		return true;
-    	//    	}
-    	//    	return false;
-    	
-    }
-    
     //removes all damage from player's creatures
     public void removeDamage(Player player) {
         PlayerZone p = AllZone.getZone(Constant.Zone.Play, player);
diff --git a/src/forge/PlayerLife.java b/src/forge/PlayerLife.java
deleted file mode 100644
index d283d1589b9..00000000000
--- a/src/forge/PlayerLife.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*package forge;
-public class PlayerLife extends MyObservable implements java.io.Serializable
-{
-	private static final long serialVersionUID = -1614695903669967202L;
-	
-	private String player;
-	private Card playerCard;
-	private int life;
-    private int assignedDamage;//from combat
-    
-    public void setPlayerCard(Card playerCard)	{	this.playerCard = playerCard; }
-	public Card getPlayerCard() 				{	return playerCard; 	}
-	public void setAssignedDamage(int n)   		{	assignedDamage = n; }
-    public int  getAssignedDamage()        		{	return assignedDamage; }
-    
-    public PlayerLife(String pl)
-    {
-    	player = pl;
-    	if (player.isHuman())
-    		setPlayerCard(AllZone.CardFactory.HumanNullCard);
-    	else
-    		setPlayerCard(AllZone.CardFactory.ComputerNullCard);
-    }
-    
-    public int getLife()
-    {
-    	return life;
-    }
-    public void setLife(int life2)
-    {
-    	life = life2;
-    	this.updateObservers();
-    }
-    
-    public void addLife(int life2)
-    {
-    	life += life2;
-    	this.updateObservers();
-    }
-    public void subtractLife(int life2, Card SourceCard)
-    {
-    	life -= life2;
-    	this.updateObservers();
-    }
-
-    public void payLife(int life2)	// change this to subtractLife
-    {
-    	subtractLife(life2, null);
-    }
-} */
\ No newline at end of file
diff --git a/src/forge/PlayerPoisonCounter.java b/src/forge/PlayerPoisonCounter.java
deleted file mode 100644
index 87bb4ac87ee..00000000000
--- a/src/forge/PlayerPoisonCounter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*package forge;
-public class PlayerPoisonCounter extends MyObservable implements java.io.Serializable
-{
-	private static final long serialVersionUID = 7559655609258111697L;
-	private int poisonCounters;
-    
-    public int getPoisonCounters()
-    {
-    	return poisonCounters;
-    }
-    public void setPoisonCounters(int poisonCounters2)
-    {
-    	poisonCounters = poisonCounters2;
-    	this.updateObservers();
-    }
-    public void addPoisonCounters(int poisonCounters2)
-    {
-    	poisonCounters += poisonCounters2;
-    	this.updateObservers();
-    }
-    public void subtractLife(int poisonCounters2)
-    {
-    	poisonCounters -= poisonCounters2;
-    	this.updateObservers();
-    }
-}*/
\ No newline at end of file