killbill-aplcache

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/events/EventBase.java b/subscription/src/main/java/org/killbill/billing/subscription/events/EventBase.java
index d80cfc1..926ccaf 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/events/EventBase.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/events/EventBase.java
@@ -105,16 +105,6 @@ public abstract class EventBase implements SubscriptionBaseEvent {
     }
 
     @Override
-    public void deactivate() {
-        this.isActive = false;
-    }
-
-    @Override
-    public void reactivate() {
-        this.isActive = true;
-    }
-
-    @Override
     public void setTotalOrdering(final long totalOrdering) {
         this.totalOrdering = totalOrdering;
     }

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/events/SubscriptionBaseEvent.java b/subscription/src/main/java/org/killbill/billing/subscription/events/SubscriptionBaseEvent.java
index ceb0211..225cf92 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/events/SubscriptionBaseEvent.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/events/SubscriptionBaseEvent.java
@@ -42,10 +42,6 @@ public interface SubscriptionBaseEvent extends Comparable<SubscriptionBaseEvent>
 
     public boolean isActive();
 
-    public void deactivate();
-
-    public void reactivate();
-
     public DateTime getProcessedDate();
 
     public DateTime getRequestedDate();

diff --git a/subscription/src/test/java/org/killbill/billing/subscription/engine/dao/MockSubscriptionDaoMemory.java b/subscription/src/test/java/org/killbill/billing/subscription/engine/dao/MockSubscriptionDaoMemory.java
index 9b608c0..6cc963b 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/engine/dao/MockSubscriptionDaoMemory.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/engine/dao/MockSubscriptionDaoMemory.java
@@ -375,7 +375,7 @@ public class MockSubscriptionDaoMemory extends MockEntityDaoBase<SubscriptionBun
                 }
                 if (cur.getType() == EventType.PHASE &&
                     cur.getEffectiveDate().isAfter(clock.getUTCNow())) {
-                    cur.deactivate();
+                    it.remove();
                     break;
                 }
 
@@ -396,7 +396,7 @@ public class MockSubscriptionDaoMemory extends MockEntityDaoBase<SubscriptionBun
                 if (cur.getType() == EventType.API_USER &&
                     ApiEventType.CHANGE == ((ApiEvent) cur).getEventType() &&
                     cur.getEffectiveDate().isAfter(clock.getUTCNow())) {
-                    cur.deactivate();
+                    it.remove();
                     break;
                 }
             }
@@ -417,7 +417,7 @@ public class MockSubscriptionDaoMemory extends MockEntityDaoBase<SubscriptionBun
                 }
                 if (cur.getType() == EventType.API_USER &&
                     ((ApiEvent) cur).getEventType() == ApiEventType.CANCEL) {
-                    cur.deactivate();
+                    it.remove();
                     foundCancel = true;
                     break;
                 }