killbill-aplcache

diff --git a/api/src/main/java/org/killbill/billing/subscription/api/timeline/SubscriptionBaseTimeline.java b/api/src/main/java/org/killbill/billing/subscription/api/timeline/SubscriptionBaseTimeline.java
index 4934603..dc56c4e 100644
--- a/api/src/main/java/org/killbill/billing/subscription/api/timeline/SubscriptionBaseTimeline.java
+++ b/api/src/main/java/org/killbill/billing/subscription/api/timeline/SubscriptionBaseTimeline.java
@@ -39,12 +39,6 @@ public interface SubscriptionBaseTimeline extends Entity {
      */
     public List<ExistingEvent> getExistingEvents();
 
-    /**
-     * @return the active version for the event stream
-     */
-    public long getActiveVersion();
-
-
 
     public interface ExistingEvent {
 

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/SubscriptionBaseApiService.java b/subscription/src/main/java/org/killbill/billing/subscription/api/SubscriptionBaseApiService.java
index d0f2e6d..c6c1855 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/SubscriptionBaseApiService.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/SubscriptionBaseApiService.java
@@ -31,7 +31,6 @@ import org.killbill.billing.catalog.api.PhaseType;
 import org.killbill.billing.catalog.api.Plan;
 import org.killbill.billing.catalog.api.PlanChangeResult;
 import org.killbill.billing.catalog.api.PlanPhasePriceOverride;
-import org.killbill.billing.catalog.api.PlanPhaseSpecifier;
 import org.killbill.billing.subscription.api.user.DefaultSubscriptionBase;
 import org.killbill.billing.subscription.api.user.SubscriptionBaseApiException;
 import org.killbill.billing.subscription.api.user.SubscriptionBuilder;
@@ -92,7 +91,7 @@ public interface SubscriptionBaseApiService {
     //
     // Lower level APIs for dryRun functionality
     //
-    public List<SubscriptionBaseEvent> getEventsOnCreation(UUID bundleId, UUID subscriptionId, DateTime alignStartDate, DateTime bundleStartDate, long activeVersion,
+    public List<SubscriptionBaseEvent> getEventsOnCreation(UUID bundleId, UUID subscriptionId, DateTime alignStartDate, DateTime bundleStartDate,
                                                            Plan plan, PhaseType initialPhase,
                                                            String realPriceList, DateTime effectiveDate, DateTime processedDate,
                                                            InternalTenantContext context)

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java b/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java
index 29a0a24..5ef474f 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/svcs/DefaultSubscriptionInternalApi.java
@@ -523,7 +523,7 @@ public class DefaultSubscriptionInternalApi extends SubscriptionApiBase implemen
                         final DateTime startEffectiveDate = dryRunArguments.getEffectiveDate() != null ? context.toUTCDateTime(dryRunArguments.getEffectiveDate()) : utcNow;
                         final DateTime bundleStartDate = getBundleStartDateWithSanity(bundleId, baseSubscription, plan, startEffectiveDate, context);
                         final UUID subscriptionId = UUIDs.randomUUID();
-                        dryRunEvents = apiService.getEventsOnCreation(bundleId, subscriptionId, startEffectiveDate, bundleStartDate, 1L, plan, inputSpec.getPhaseType(), realPriceList,
+                        dryRunEvents = apiService.getEventsOnCreation(bundleId, subscriptionId, startEffectiveDate, bundleStartDate, plan, inputSpec.getPhaseType(), realPriceList,
                                                                       startEffectiveDate, utcNow, context);
                         final SubscriptionBuilder builder = new SubscriptionBuilder()
                                 .setId(subscriptionId)

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/timeline/DefaultSubscriptionBaseTimeline.java b/subscription/src/main/java/org/killbill/billing/subscription/api/timeline/DefaultSubscriptionBaseTimeline.java
index 1690d74..436393f 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/timeline/DefaultSubscriptionBaseTimeline.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/timeline/DefaultSubscriptionBaseTimeline.java
@@ -45,12 +45,10 @@ public class DefaultSubscriptionBaseTimeline implements SubscriptionBaseTimeline
 
     private final UUID id;
     private final List<ExistingEvent> existingEvents;
-    private final long activeVersion;
 
     public DefaultSubscriptionBaseTimeline(final DefaultSubscriptionBase input, final Catalog catalog) throws CatalogApiException {
         this.id = input.getId();
-        this.existingEvents = toExistingEvents(catalog, input.getActiveVersion(), input.getCategory(), input.getEvents());
-        this.activeVersion = input.getActiveVersion();
+        this.existingEvents = toExistingEvents(catalog, input.getCategory(), input.getEvents());
     }
 
     private BillingPeriod getBillingPeriod(final Catalog catalog, @Nullable final String phaseName, final DateTime effectiveDate, DateTime startDate) throws CatalogApiException {
@@ -61,7 +59,7 @@ public class DefaultSubscriptionBaseTimeline implements SubscriptionBaseTimeline
         return phase.getRecurring() != null ? phase.getRecurring().getBillingPeriod() : BillingPeriod.NO_BILLING_PERIOD;
     }
 
-    private List<ExistingEvent> toExistingEvents(final Catalog catalog, final long activeVersion, final ProductCategory category, final List<SubscriptionBaseEvent> events)
+    private List<ExistingEvent> toExistingEvents(final Catalog catalog, final ProductCategory category, final List<SubscriptionBaseEvent> events)
             throws CatalogApiException {
 
         final List<ExistingEvent> result = new LinkedList<SubscriptionBaseTimeline.ExistingEvent>();
@@ -76,11 +74,7 @@ public class DefaultSubscriptionBaseTimeline implements SubscriptionBaseTimeline
 
         for (final SubscriptionBaseEvent cur : events) {
 
-            // First active event is used to figure out which catalog version to use.
-            //startDate = (startDate == null && cur.getActiveVersion() == activeVersion) ?  cur.getEffectiveDate() : startDate;
-
-            // STEPH that needs to be reviewed if we support multi version events
-            if (cur.getActiveVersion() != activeVersion || !cur.isActive()) {
+            if (!cur.isActive()) {
                 continue;
             }
             startDate = (startDate == null) ? cur.getEffectiveDate() : startDate;
@@ -186,11 +180,6 @@ public class DefaultSubscriptionBaseTimeline implements SubscriptionBaseTimeline
         return existingEvents;
     }
 
-    @Override
-    public long getActiveVersion() {
-        return activeVersion;
-    }
-
     private void sortExistingEvent(final List<ExistingEvent> events) {
         if (events != null) {
             Collections.sort(events, new Comparator<ExistingEvent>() {

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/transfer/DefaultSubscriptionBaseTransferApi.java b/subscription/src/main/java/org/killbill/billing/subscription/api/transfer/DefaultSubscriptionBaseTransferApi.java
index df5ec78..e7ec71a 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/transfer/DefaultSubscriptionBaseTransferApi.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/transfer/DefaultSubscriptionBaseTransferApi.java
@@ -99,7 +99,6 @@ public class DefaultSubscriptionBaseTransferApi extends SubscriptionApiBase impl
                 .setEventPlan(existingEvent.getPlanName())
                 .setEventPlanPhase(currentPhase.getName())
                 .setEventPriceList(spec.getPriceListName())
-                .setActiveVersion(subscription.getActiveVersion())
                 .setEffectiveDate(effectiveDate)
                 .setFromDisk(true);
 
@@ -116,7 +115,7 @@ public class DefaultSubscriptionBaseTransferApi extends SubscriptionApiBase impl
 
             case PHASE:
                 newEvent = firstEvent ? new ApiEventTransfer(apiBuilder) :
-                           PhaseEventData.createNextPhaseEvent(subscription.getId(), subscription.getActiveVersion(), currentPhase.getName(), effectiveDate);
+                           PhaseEventData.createNextPhaseEvent(subscription.getId(), currentPhase.getName(), effectiveDate);
                 break;
 
             case CANCEL:
@@ -228,7 +227,6 @@ public class DefaultSubscriptionBaseTransferApi extends SubscriptionApiBase impl
 
                     final SubscriptionBaseEvent cancelEvent = new ApiEventCancel(new ApiEventBuilder()
                                                                                          .setSubscriptionId(cur.getId())
-                                                                                         .setActiveVersion(cur.getActiveVersion())
                                                                                          .setEffectiveDate(effectiveCancelDate)
                                                                                          .setFromDisk(true));
 

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBase.java b/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBase.java
index 7520130..9594dc5 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBase.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBase.java
@@ -79,7 +79,6 @@ public class DefaultSubscriptionBase extends EntityBase implements SubscriptionB
     // Those can be modified through non User APIs, and a new SubscriptionBase
     // object would be created
     //
-    private final long activeVersion;
     private final DateTime chargedThroughDate;
 
     //
@@ -109,7 +108,6 @@ public class DefaultSubscriptionBase extends EntityBase implements SubscriptionB
         this.alignStartDate = builder.getAlignStartDate();
         this.bundleStartDate = builder.getBundleStartDate();
         this.category = builder.getCategory();
-        this.activeVersion = builder.getActiveVersion();
         this.chargedThroughDate = builder.getChargedThroughDate();
         this.migrated = builder.isMigrated();
     }
@@ -123,7 +121,6 @@ public class DefaultSubscriptionBase extends EntityBase implements SubscriptionB
         this.alignStartDate = internalSubscription.getAlignStartDate();
         this.bundleStartDate = internalSubscription.getBundleStartDate();
         this.category = internalSubscription.getCategory();
-        this.activeVersion = internalSubscription.getActiveVersion();
         this.chargedThroughDate = internalSubscription.getChargedThroughDate();
         this.migrated = internalSubscription.isMigrated();
         this.transitions = new LinkedList<SubscriptionBaseTransition>(internalSubscription.getAllTransitions());
@@ -447,10 +444,6 @@ public class DefaultSubscriptionBase extends EntityBase implements SubscriptionB
         return it.hasNext() ? ((SubscriptionBaseTransitionData) it.next()).getTotalOrdering() : -1L;
     }
 
-    public long getActiveVersion() {
-        return activeVersion;
-    }
-
     public List<SubscriptionBaseTransition> getBillingTransitions() {
 
         if (transitions == null) {
@@ -577,7 +570,7 @@ public class DefaultSubscriptionBase extends EntityBase implements SubscriptionB
 
         for (final SubscriptionBaseEvent cur : inputEvents) {
 
-            if (!cur.isActive() || cur.getActiveVersion() < activeVersion) {
+            if (!cur.isActive()) {
                 continue;
             }
 

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBaseApiService.java b/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBaseApiService.java
index c0377ce..bab81c5 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBaseApiService.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/user/DefaultSubscriptionBaseApiService.java
@@ -107,7 +107,7 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
         final InternalCallContext internalCallContext = createCallContextFromBundleId(subscription.getBundleId(), context);
 
         try {
-            final List<SubscriptionBaseEvent> events = getEventsOnCreation(subscription.getBundleId(), subscription.getId(), subscription.getAlignStartDate(), subscription.getBundleStartDate(), subscription.getActiveVersion(),
+            final List<SubscriptionBaseEvent> events = getEventsOnCreation(subscription.getBundleId(), subscription.getId(), subscription.getAlignStartDate(), subscription.getBundleStartDate(),
                                                                            plan, initialPhase, realPriceList, effectiveDate, processedDate, internalCallContext);
             dao.createSubscription(subscription, events, internalCallContext);
             subscription.rebuildTransitions(dao.getEventsForSubscription(subscription.getId(), internalCallContext), catalogService.getFullCatalog(internalCallContext));
@@ -128,7 +128,7 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
                 final DefaultSubscriptionBase subscriptionBase = new DefaultSubscriptionBase(subscription.getBuilder(), this, clock);
                 final InternalCallContext internalCallContext = createCallContextFromBundleId(subscriptionBase.getBundleId(), context);
                 final List<SubscriptionBaseEvent> events = getEventsOnCreation(subscriptionBase.getBundleId(), subscriptionBase.getId(), subscriptionBase.getAlignStartDate(),
-                                                                               subscriptionBase.getBundleStartDate(), subscriptionBase.getActiveVersion(), subscription.getPlan(),
+                                                                               subscriptionBase.getBundleStartDate(), subscription.getPlan(),
                                                                                subscription.getInitialPhase(), subscription.getRealPriceList(),
                                                                                subscription.getEffectiveDate(), subscription.getProcessedDate(), internalCallContext);
                 eventsMap.put(subscriptionBase.getId(), events);
@@ -274,7 +274,6 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
         final DateTime now = clock.getUTCNow();
         final SubscriptionBaseEvent uncancelEvent = new ApiEventUncancel(new ApiEventBuilder()
                                                                                  .setSubscriptionId(subscription.getId())
-                                                                                 .setActiveVersion(subscription.getActiveVersion())
                                                                                  .setEffectiveDate(now)
                                                                                  .setFromDisk(true));
 
@@ -284,7 +283,7 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
         final InternalCallContext internalCallContext = createCallContextFromBundleId(subscription.getBundleId(), context);
         final TimedPhase nextTimedPhase = planAligner.getNextTimedPhase(subscription, now, internalCallContext);
         final PhaseEvent nextPhaseEvent = (nextTimedPhase != null) ?
-                                          PhaseEventData.createNextPhaseEvent(subscription.getId(), subscription.getActiveVersion(), nextTimedPhase.getPhase().getName(), nextTimedPhase.getStartPhase()) :
+                                          PhaseEventData.createNextPhaseEvent(subscription.getId(), nextTimedPhase.getPhase().getName(), nextTimedPhase.getStartPhase()) :
                                           null;
         if (nextPhaseEvent != null) {
             uncancelEvents.add(nextPhaseEvent);
@@ -430,7 +429,7 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
     }
 
     @Override
-    public List<SubscriptionBaseEvent> getEventsOnCreation(final UUID bundleId, final UUID subscriptionId, final DateTime alignStartDate, final DateTime bundleStartDate, final long activeVersion,
+    public List<SubscriptionBaseEvent> getEventsOnCreation(final UUID bundleId, final UUID subscriptionId, final DateTime alignStartDate, final DateTime bundleStartDate,
                                                            final Plan plan, final PhaseType initialPhase,
                                                            final String realPriceList, final DateTime effectiveDate, final DateTime processedDate,
                                                            final InternalTenantContext internalTenantContext) throws CatalogApiException, SubscriptionBaseApiException {
@@ -442,14 +441,13 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
                 .setEventPlan(plan.getName())
                 .setEventPlanPhase(curAndNextPhases[0].getPhase().getName())
                 .setEventPriceList(realPriceList)
-                .setActiveVersion(activeVersion)
                 .setEffectiveDate(effectiveDate)
                 .setFromDisk(true);
         final ApiEvent creationEvent = new ApiEventCreate(createBuilder);
 
         final TimedPhase nextTimedPhase = curAndNextPhases[1];
         final PhaseEvent nextPhaseEvent = (nextTimedPhase != null) ?
-                                          PhaseEventData.createNextPhaseEvent(subscriptionId, activeVersion, nextTimedPhase.getPhase().getName(), nextTimedPhase.getStartPhase()) :
+                                          PhaseEventData.createNextPhaseEvent(subscriptionId, nextTimedPhase.getPhase().getName(), nextTimedPhase.getStartPhase()) :
                                           null;
         final List<SubscriptionBaseEvent> events = new ArrayList<SubscriptionBaseEvent>();
         events.add(creationEvent);
@@ -484,13 +482,12 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
                                                                              .setEventPlan(newPlan.getName())
                                                                              .setEventPlanPhase(currentTimedPhase.getPhase().getName())
                                                                              .setEventPriceList(newPriceList)
-                                                                             .setActiveVersion(subscription.getActiveVersion())
                                                                              .setEffectiveDate(effectiveDate)
                                                                              .setFromDisk(true));
 
         final TimedPhase nextTimedPhase = planAligner.getNextTimedPhaseOnChange(subscription, newPlan, newPriceList, effectiveDate, internalTenantContext);
         final PhaseEvent nextPhaseEvent = (nextTimedPhase != null) ?
-                                          PhaseEventData.createNextPhaseEvent(subscription.getId(), subscription.getActiveVersion(),
+                                          PhaseEventData.createNextPhaseEvent(subscription.getId(),
                                                                               nextTimedPhase.getPhase().getName(), nextTimedPhase.getStartPhase()) :
                                           null;
 
@@ -515,7 +512,6 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
         final List<SubscriptionBaseEvent> cancelEvents = new ArrayList<SubscriptionBaseEvent>();
         final SubscriptionBaseEvent cancelEvent = new ApiEventCancel(new ApiEventBuilder()
                                                                              .setSubscriptionId(subscription.getId())
-                                                                             .setActiveVersion(subscription.getActiveVersion())
                                                                              .setEffectiveDate(effectiveDate)
                                                                              .setFromDisk(true));
         cancelEvents.add(cancelEvent);
@@ -571,7 +567,6 @@ public class DefaultSubscriptionBaseApiService implements SubscriptionBaseApiSer
                 //
                 final SubscriptionBaseEvent cancelEvent = new ApiEventCancel(new ApiEventBuilder()
                                                                                      .setSubscriptionId(cur.getId())
-                                                                                     .setActiveVersion(cur.getActiveVersion())
                                                                                      .setEffectiveDate(effectiveDate)
                                                                                      .setFromDisk(true));
                 subscriptionsToBeCancelled.add(cur);

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/user/SubscriptionBuilder.java b/subscription/src/main/java/org/killbill/billing/subscription/api/user/SubscriptionBuilder.java
index 061d122..7beabf6 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/user/SubscriptionBuilder.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/user/SubscriptionBuilder.java
@@ -32,13 +32,11 @@ public class SubscriptionBuilder {
     private DateTime updatedDate;
     private DateTime alignStartDate;
     private DateTime bundleStartDate;
-    private Long activeVersion;
     private ProductCategory category;
     private DateTime chargedThroughDate;
     private boolean migrated;
 
     public SubscriptionBuilder() {
-        this.activeVersion = SubscriptionEvents.INITIAL_VERSION;
     }
 
     public SubscriptionBuilder(final DefaultSubscriptionBase original) {
@@ -47,7 +45,6 @@ public class SubscriptionBuilder {
         this.alignStartDate = original.getAlignStartDate();
         this.bundleStartDate = original.getBundleStartDate();
         this.category = original.getCategory();
-        this.activeVersion = original.getActiveVersion();
         this.chargedThroughDate = original.getChargedThroughDate();
         this.migrated = original.isMigrated();
     }
@@ -81,12 +78,6 @@ public class SubscriptionBuilder {
         this.bundleStartDate = bundleStartDate;
         return this;
     }
-
-    public SubscriptionBuilder setActiveVersion(final long activeVersion) {
-        this.activeVersion = activeVersion;
-        return this;
-    }
-
     public SubscriptionBuilder setChargedThroughDate(final DateTime chargedThroughDate) {
         this.chargedThroughDate = chargedThroughDate;
         return this;
@@ -125,11 +116,6 @@ public class SubscriptionBuilder {
     public DateTime getBundleStartDate() {
         return bundleStartDate;
     }
-
-    public Long getActiveVersion() {
-        return activeVersion;
-    }
-
     public ProductCategory getCategory() {
         return category;
     }

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/api/user/SubscriptionEvents.java b/subscription/src/main/java/org/killbill/billing/subscription/api/user/SubscriptionEvents.java
index 46bc931..7977dc5 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/api/user/SubscriptionEvents.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/api/user/SubscriptionEvents.java
@@ -23,49 +23,31 @@ import org.killbill.billing.subscription.events.SubscriptionBaseEvent;
 
 
 public class SubscriptionEvents {
-    public static final long INITIAL_VERSION = 1;
 
-    private final List<SubscriptionBaseEvent> events;
 
-    private long activeVersion;
+    private final List<SubscriptionBaseEvent> events;
 
     public SubscriptionEvents() {
         this.events = new LinkedList<SubscriptionBaseEvent>();
-        this.activeVersion = INITIAL_VERSION;
     }
 
     public void addEvent(final SubscriptionBaseEvent ev) {
         events.add(ev);
     }
 
-    public List<SubscriptionBaseEvent> getCurrentView() {
-        return getViewForVersion(activeVersion);
-    }
-
     public List<SubscriptionBaseEvent> getViewForVersion(final long version) {
         final LinkedList<SubscriptionBaseEvent> result = new LinkedList<SubscriptionBaseEvent>();
         for (final SubscriptionBaseEvent cur : events) {
-            if (cur.getActiveVersion() == version) {
-                result.add(cur);
-            }
+            result.add(cur);
         }
 
         return result;
     }
 
-    public long getActiveVersion() {
-        return activeVersion;
-    }
-
-    public void setActiveVersion(final long activeVersion) {
-        this.activeVersion = activeVersion;
-    }
-
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder();
         sb.append("SubscriptionEvents");
-        sb.append("{activeVersion=").append(activeVersion);
         sb.append(", events=").append(events);
         sb.append('}');
         return sb.toString();
@@ -82,9 +64,6 @@ public class SubscriptionEvents {
 
         final SubscriptionEvents that = (SubscriptionEvents) o;
 
-        if (activeVersion != that.activeVersion) {
-            return false;
-        }
         if (events != null ? !events.equals(that.events) : that.events != null) {
             return false;
         }
@@ -95,7 +74,6 @@ public class SubscriptionEvents {
     @Override
     public int hashCode() {
         int result = events != null ? events.hashCode() : 0;
-        result = 31 * result + (int) (activeVersion ^ (activeVersion >>> 32));
         return result;
     }
 }

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/engine/core/DefaultSubscriptionBaseService.java b/subscription/src/main/java/org/killbill/billing/subscription/engine/core/DefaultSubscriptionBaseService.java
index 18dd082..5a40d15 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/engine/core/DefaultSubscriptionBaseService.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/engine/core/DefaultSubscriptionBaseService.java
@@ -152,10 +152,6 @@ public class DefaultSubscriptionBaseService implements EventListener, Subscripti
                 log.warn("Failed to retrieve subscription for id %s", event.getSubscriptionId());
                 return;
             }
-            if (subscription.getActiveVersion() > event.getActiveVersion()) {
-                // Skip repaired events
-                return;
-            }
 
             boolean eventSent = false;
             if (event.getType() == EventType.PHASE) {
@@ -187,7 +183,7 @@ public class DefaultSubscriptionBaseService implements EventListener, Subscripti
             final DateTime now = clock.getUTCNow();
             final TimedPhase nextTimedPhase = planAligner.getNextTimedPhase(subscription, now, context);
             final PhaseEvent nextPhaseEvent = (nextTimedPhase != null) ?
-                                              PhaseEventData.createNextPhaseEvent(subscription.getId(), subscription.getActiveVersion(),
+                                              PhaseEventData.createNextPhaseEvent(subscription.getId(),
                                                                                   nextTimedPhase.getPhase().getName(), nextTimedPhase.getStartPhase()) :
                                               null;
             if (nextPhaseEvent != null) {

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java
index 88faa5a..71b5af6 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/DefaultSubscriptionDao.java
@@ -825,7 +825,6 @@ public class DefaultSubscriptionDao extends EntityDaoBase<SubscriptionBundleMode
                         final DateTime now = clock.getUTCNow();
                         final SubscriptionBaseEvent addOnCancelEvent = new ApiEventCancel(new ApiEventBuilder()
                                                                                                   .setSubscriptionId(reloaded.getId())
-                                                                                                  .setActiveVersion(((DefaultSubscriptionBase) reloaded).getActiveVersion())
                                                                                                   .setEffectiveDate(baseTriggerEventForAddOnCancellation.getEffectiveDate())
                                                                                                   .setCreatedDate(baseTriggerEventForAddOnCancellation.getCreatedDate())
                                                                                                   // This event is only there to indicate the ADD_ON is future canceled, but it is not there

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/model/SubscriptionEventModelDao.java b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/model/SubscriptionEventModelDao.java
index 32d5faf..9bcdd69 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/model/SubscriptionEventModelDao.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/model/SubscriptionEventModelDao.java
@@ -43,7 +43,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
     private String planName;
     private String phaseName;
     private String priceListName;
-    private long currentVersion;
     private boolean isActive;
 
     public SubscriptionEventModelDao() {
@@ -52,7 +51,7 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
 
     public SubscriptionEventModelDao(final UUID id, final long totalOrdering, final EventType eventType, final ApiEventType userType,
                                      final DateTime effectiveDate, final UUID subscriptionId,
-                                     final String planName, final String phaseName, final String priceListName, final long currentVersion,
+                                     final String planName, final String phaseName, final String priceListName,
                                      final boolean active, final DateTime createDate, final DateTime updateDate) {
         super(id, createDate, updateDate);
         this.totalOrdering = totalOrdering;
@@ -63,7 +62,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
         this.planName = planName;
         this.phaseName = phaseName;
         this.priceListName = priceListName;
-        this.currentVersion = currentVersion;
         this.isActive = active;
     }
 
@@ -77,7 +75,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
         this.planName = eventType == EventType.API_USER ? ((ApiEvent) src).getEventPlan() : null;
         this.phaseName = eventType == EventType.API_USER ? ((ApiEvent) src).getEventPlanPhase() : ((PhaseEvent) src).getPhase();
         this.priceListName = eventType == EventType.API_USER ? ((ApiEvent) src).getPriceList() : null;
-        this.currentVersion = src.getActiveVersion();
         this.isActive = src.isActive();
     }
 
@@ -113,10 +110,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
         return priceListName;
     }
 
-    public long getCurrentVersion() {
-        return currentVersion;
-    }
-
     // TODO required for jdbi binder
     public boolean getIsActive() {
         return isActive;
@@ -158,10 +151,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
         this.priceListName = priceListName;
     }
 
-    public void setCurrentVersion(final long currentVersion) {
-        this.currentVersion = currentVersion;
-    }
-
     public void setIsActive(final boolean isActive) {
         this.isActive = isActive;
     }
@@ -181,7 +170,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
                 .setCreatedDate(src.getCreatedDate())
                 .setUpdatedDate(src.getUpdatedDate())
                 .setEffectiveDate(src.getEffectiveDate())
-                .setActiveVersion(src.getCurrentVersion())
                 .setActive(src.isActive());
 
         SubscriptionBaseEvent result;
@@ -214,7 +202,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
         sb.append(", planName='").append(planName).append('\'');
         sb.append(", phaseName='").append(phaseName).append('\'');
         sb.append(", priceListName='").append(priceListName).append('\'');
-        sb.append(", currentVersion=").append(currentVersion);
         sb.append(", isActive=").append(isActive);
         sb.append('}');
         return sb.toString();
@@ -234,9 +221,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
 
         final SubscriptionEventModelDao that = (SubscriptionEventModelDao) o;
 
-        if (currentVersion != that.currentVersion) {
-            return false;
-        }
         if (isActive != that.isActive) {
             return false;
         }
@@ -279,7 +263,6 @@ public class SubscriptionEventModelDao extends EntityModelDaoBase implements Ent
         result = 31 * result + (planName != null ? planName.hashCode() : 0);
         result = 31 * result + (phaseName != null ? phaseName.hashCode() : 0);
         result = 31 * result + (priceListName != null ? priceListName.hashCode() : 0);
-        result = 31 * result + (int) (currentVersion ^ (currentVersion >>> 32));
         result = 31 * result + (isActive ? 1 : 0);
         return result;
     }

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/model/SubscriptionModelDao.java b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/model/SubscriptionModelDao.java
index 2f9d338..b53a9cd 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/model/SubscriptionModelDao.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/model/SubscriptionModelDao.java
@@ -35,26 +35,24 @@ public class SubscriptionModelDao extends EntityModelDaoBase implements EntityMo
     private ProductCategory category;
     private DateTime startDate;
     private DateTime bundleStartDate;
-    private long activeVersion;
     private DateTime chargedThroughDate;
     private boolean migrated;
 
     public SubscriptionModelDao() { /* For the DAO mapper */ }
 
     public SubscriptionModelDao(final UUID id, final UUID bundleId, final ProductCategory category, final DateTime startDate, final DateTime bundleStartDate,
-                                final long activeVersion, final DateTime chargedThroughDate, final boolean migrated, final DateTime createdDate, final DateTime updateDate) {
+                                final DateTime chargedThroughDate, final boolean migrated, final DateTime createdDate, final DateTime updateDate) {
         super(id, createdDate, updateDate);
         this.bundleId = bundleId;
         this.category = category;
         this.startDate = startDate;
         this.bundleStartDate = bundleStartDate;
-        this.activeVersion = activeVersion;
         this.chargedThroughDate = chargedThroughDate;
         this.migrated = migrated;
     }
 
     public SubscriptionModelDao(final DefaultSubscriptionBase src) {
-        this(src.getId(), src.getBundleId(), src.getCategory(), src.getAlignStartDate(), src.getBundleStartDate(), src.getActiveVersion(),
+        this(src.getId(), src.getBundleId(), src.getCategory(), src.getAlignStartDate(), src.getBundleStartDate(),
              src.getChargedThroughDate(), src.isMigrated(), src.getCreatedDate(), src.getUpdatedDate());
     }
 
@@ -74,9 +72,6 @@ public class SubscriptionModelDao extends EntityModelDaoBase implements EntityMo
         return bundleStartDate;
     }
 
-    public long getActiveVersion() {
-        return activeVersion;
-    }
 
     public DateTime getChargedThroughDate() {
         return chargedThroughDate;
@@ -98,9 +93,6 @@ public class SubscriptionModelDao extends EntityModelDaoBase implements EntityMo
         this.bundleStartDate = bundleStartDate;
     }
 
-    public void setActiveVersion(final long activeVersion) {
-        this.activeVersion = activeVersion;
-    }
 
     public void setChargedThroughDate(final DateTime chargedThroughDate) {
         this.chargedThroughDate = chargedThroughDate;
@@ -126,7 +118,6 @@ public class SubscriptionModelDao extends EntityModelDaoBase implements EntityMo
                                             .setUpdatedDate(src.getUpdatedDate())
                                             .setBundleStartDate(src.getBundleStartDate())
                                             .setAlignStartDate(src.getStartDate())
-                                            .setActiveVersion(src.getActiveVersion())
                                             .setChargedThroughDate(src.getChargedThroughDate())
                                             .setMigrated(src.isMigrated())
                                             .setCreatedDate(src.getCreatedDate())
@@ -141,7 +132,6 @@ public class SubscriptionModelDao extends EntityModelDaoBase implements EntityMo
         sb.append(", category=").append(category);
         sb.append(", startDate=").append(startDate);
         sb.append(", bundleStartDate=").append(bundleStartDate);
-        sb.append(", activeVersion=").append(activeVersion);
         sb.append(", chargedThroughDate=").append(chargedThroughDate);
         sb.append(", migrated=").append(migrated);
         sb.append('}');
@@ -162,9 +152,6 @@ public class SubscriptionModelDao extends EntityModelDaoBase implements EntityMo
 
         final SubscriptionModelDao that = (SubscriptionModelDao) o;
 
-        if (activeVersion != that.activeVersion) {
-            return false;
-        }
         if (bundleId != null ? !bundleId.equals(that.bundleId) : that.bundleId != null) {
             return false;
         }
@@ -194,7 +181,6 @@ public class SubscriptionModelDao extends EntityModelDaoBase implements EntityMo
         result = 31 * result + (category != null ? category.hashCode() : 0);
         result = 31 * result + (startDate != null ? startDate.hashCode() : 0);
         result = 31 * result + (bundleStartDate != null ? bundleStartDate.hashCode() : 0);
-        result = 31 * result + (int) (activeVersion ^ (activeVersion >>> 32));
         result = 31 * result + (chargedThroughDate != null ? chargedThroughDate.hashCode() : 0);
         result = 31 * result + Boolean.valueOf(migrated).hashCode();
         return result;

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/SubscriptionEventSqlDao.java b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/SubscriptionEventSqlDao.java
index 177df8b..33358f6 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/SubscriptionEventSqlDao.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/SubscriptionEventSqlDao.java
@@ -41,17 +41,6 @@ public interface SubscriptionEventSqlDao extends EntitySqlDao<SubscriptionEventM
     public void unactiveEvent(@Bind("id") String id,
                               @BindBean final InternalCallContext context);
 
-    @SqlUpdate
-    @Audited(ChangeType.UPDATE)
-    public void reactiveEvent(@Bind("id") String id,
-                              @BindBean final InternalCallContext context);
-
-    @SqlUpdate
-    @Audited(ChangeType.UPDATE)
-    public void updateVersion(@Bind("id") String id,
-                              @Bind("currentVersion") Long currentVersion,
-                              @BindBean final InternalCallContext context);
-
     @SqlQuery
     public List<SubscriptionEventModelDao> getFutureActiveEventForSubscription(@Bind("subscriptionId") String subscriptionId,
                                                                               @Bind("now") Date now,

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/SubscriptionSqlDao.java b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/SubscriptionSqlDao.java
index 76baf12..b47b5ba 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/SubscriptionSqlDao.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/engine/dao/SubscriptionSqlDao.java
@@ -45,15 +45,4 @@ public interface SubscriptionSqlDao extends EntitySqlDao<SubscriptionModelDao, S
     public void updateChargedThroughDate(@Bind("id") String id, @Bind("chargedThroughDate") Date chargedThroughDate,
                                          @BindBean final InternalCallContext context);
 
-    @SqlUpdate
-    @Audited(ChangeType.UPDATE)
-    void updateActiveVersion(@Bind("id") String id, @Bind("activeVersion") long activeVersion,
-                             @BindBean final InternalCallContext context);
-
-    @SqlUpdate
-    @Audited(ChangeType.UPDATE)
-    public void updateForRepair(@Bind("id") String id, @Bind("activeVersion") long activeVersion,
-                                @Bind("startDate") Date startDate,
-                                @Bind("bundleStartDate") Date bundleStartDate,
-                                @BindBean final InternalCallContext context);
 }

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 98fa9d1..334d524 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
@@ -31,7 +31,6 @@ public abstract class EventBase implements SubscriptionBaseEvent {
     private final DateTime effectiveDate;
 
     private final long totalOrdering;
-    private final long activeVersion;
     private final boolean isActive;
 
     public EventBase(final EventBaseBuilder<?> builder) {
@@ -41,7 +40,6 @@ public abstract class EventBase implements SubscriptionBaseEvent {
         this.createdDate = builder.getCreatedDate();
         this.updatedDate = builder.getUpdatedDate();
         this.effectiveDate = builder.getEffectiveDate();
-        this.activeVersion = builder.getActiveVersion();
         this.isActive = builder.isActive();
     }
 
@@ -76,11 +74,6 @@ public abstract class EventBase implements SubscriptionBaseEvent {
     }
 
     @Override
-    public long getActiveVersion() {
-        return activeVersion;
-    }
-
-    @Override
     public boolean isActive() {
         return isActive;
     }

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/events/EventBaseBuilder.java b/subscription/src/main/java/org/killbill/billing/subscription/events/EventBaseBuilder.java
index 4dd7b96..41fd074 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/events/EventBaseBuilder.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/events/EventBaseBuilder.java
@@ -31,7 +31,6 @@ public abstract class EventBaseBuilder<T extends EventBaseBuilder<T>> {
     private DateTime updatedDate;
     private DateTime effectiveDate;
 
-    private long activeVersion;
     private boolean isActive;
 
     public EventBaseBuilder() {
@@ -46,7 +45,6 @@ public abstract class EventBaseBuilder<T extends EventBaseBuilder<T>> {
         this.effectiveDate = event.getEffectiveDate();
         this.createdDate = event.getCreatedDate();
         this.updatedDate = event.getUpdatedDate();
-        this.activeVersion = event.getActiveVersion();
         this.isActive = event.isActive();
         this.totalOrdering = event.getTotalOrdering();
     }
@@ -57,7 +55,6 @@ public abstract class EventBaseBuilder<T extends EventBaseBuilder<T>> {
         this.effectiveDate = copy.effectiveDate;
         this.createdDate = copy.getCreatedDate();
         this.updatedDate = copy.getUpdatedDate();
-        this.activeVersion = copy.activeVersion;
         this.isActive = copy.isActive;
         this.totalOrdering = copy.totalOrdering;
     }
@@ -92,11 +89,6 @@ public abstract class EventBaseBuilder<T extends EventBaseBuilder<T>> {
         return (T) this;
     }
 
-    public T setActiveVersion(final long activeVersion) {
-        this.activeVersion = activeVersion;
-        return (T) this;
-    }
-
     public T setActive(final boolean isActive) {
         this.isActive = isActive;
         return (T) this;
@@ -125,11 +117,6 @@ public abstract class EventBaseBuilder<T extends EventBaseBuilder<T>> {
     public DateTime getEffectiveDate() {
         return effectiveDate;
     }
-
-    public long getActiveVersion() {
-        return activeVersion;
-    }
-
     public boolean isActive() {
         return isActive;
     }

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/events/phase/PhaseEventData.java b/subscription/src/main/java/org/killbill/billing/subscription/events/phase/PhaseEventData.java
index 07afcdf..acf9375 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/events/phase/PhaseEventData.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/events/phase/PhaseEventData.java
@@ -21,7 +21,6 @@ import java.util.UUID;
 
 import org.joda.time.DateTime;
 
-import org.killbill.billing.subscription.api.user.DefaultSubscriptionBase;
 import org.killbill.billing.subscription.events.EventBase;
 
 
@@ -51,18 +50,16 @@ public class PhaseEventData extends EventBase implements PhaseEvent {
                 + ", getType()=" + getType()
                 + ", getPhase()=" + getPhase()
                 + ", getEffectiveDate()=" + getEffectiveDate()
-                + ", getActiveVersion()=" + getActiveVersion()
                 + ", getSubscriptionId()=" + getSubscriptionId()
                 + ", isActive()=" + isActive() + "]\n";
     }
 
-    public static PhaseEvent createNextPhaseEvent(final UUID subscriptionId, final long activeVersion, final String phaseName, final DateTime effectiveDate) {
+    public static PhaseEvent createNextPhaseEvent(final UUID subscriptionId, final String phaseName, final DateTime effectiveDate) {
         return (phaseName == null) ?
                 null :
                 new PhaseEventData(new PhaseEventBuilder()
                                            .setSubscriptionId(subscriptionId)
                                            .setEffectiveDate(effectiveDate)
-                                           .setActiveVersion(activeVersion)
                                            .setPhaseName(phaseName));
     }
 }

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 1f81e63..f710d44 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
@@ -34,8 +34,6 @@ public interface SubscriptionBaseEvent extends Comparable<SubscriptionBaseEvent>
 
     public long getTotalOrdering();
 
-    public long getActiveVersion();
-
     public boolean isActive();
 
     public DateTime getEffectiveDate();

diff --git a/subscription/src/main/java/org/killbill/billing/subscription/events/user/ApiEventBase.java b/subscription/src/main/java/org/killbill/billing/subscription/events/user/ApiEventBase.java
index 98f6b9e..70c5d63 100644
--- a/subscription/src/main/java/org/killbill/billing/subscription/events/user/ApiEventBase.java
+++ b/subscription/src/main/java/org/killbill/billing/subscription/events/user/ApiEventBase.java
@@ -78,7 +78,6 @@ public class ApiEventBase extends EventBase implements ApiEvent {
                + ", getEventPlanPhase()=" + getEventPlanPhase()
                + ", getType()=" + getType()
                + ", getEffectiveDate()=" + getEffectiveDate()
-               + ", getActiveVersion()=" + getActiveVersion()
                + ", getSubscriptionId()=" + getSubscriptionId()
                + ", isActive()=" + isActive() + "]";
     }

diff --git a/subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql b/subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql
index f44f13d..790129a 100644
--- a/subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql
+++ b/subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql
@@ -11,7 +11,6 @@ CREATE TABLE subscription_events (
     plan_name varchar(64) DEFAULT NULL,
     phase_name varchar(128) DEFAULT NULL,
     price_list_name varchar(64) DEFAULT NULL,
-    current_version int DEFAULT 1,
     is_active boolean default true,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
@@ -34,7 +33,6 @@ CREATE TABLE subscriptions (
     category varchar(32) NOT NULL,
     start_date datetime NOT NULL,
     bundle_start_date datetime NOT NULL,
-    active_version int DEFAULT 1,
     charged_through_date datetime DEFAULT NULL,
     migrated bool NOT NULL,
     created_by varchar(50) NOT NULL,

diff --git a/subscription/src/main/resources/org/killbill/billing/subscription/engine/dao/SubscriptionEventSqlDao.sql.stg b/subscription/src/main/resources/org/killbill/billing/subscription/engine/dao/SubscriptionEventSqlDao.sql.stg
index 5b20e79..296083c 100644
--- a/subscription/src/main/resources/org/killbill/billing/subscription/engine/dao/SubscriptionEventSqlDao.sql.stg
+++ b/subscription/src/main/resources/org/killbill/billing/subscription/engine/dao/SubscriptionEventSqlDao.sql.stg
@@ -21,7 +21,6 @@ tableFields(prefix) ::= <<
 , <prefix> plan_name
 , <prefix> phase_name
 , <prefix> price_list_name
-, <prefix> current_version
 , <prefix> is_active
 , <prefix> created_by
 , <prefix> created_date
@@ -37,7 +36,6 @@ tableValues() ::= <<
 , :planName
 , :phaseName
 , :priceListName
-, :currentVersion
 , :isActive
 , :createdBy
 , :createdDate
@@ -46,18 +44,6 @@ tableValues() ::= <<
 >>
 
 
-updateVersion() ::= <<
-update <tableName()>
-set
-current_version = :currentVersion
-, updated_by = :createdBy
-, updated_date = :createdDate
-where
-id = :id
-<AND_CHECK_TENANT()>
-;
->>
-
 unactiveEvent() ::= <<
 update <tableName()>
 set
@@ -70,17 +56,6 @@ id = :id
 ;
 >>
 
-reactiveEvent() ::= <<
-update <tableName()>
-set
-is_active = true
-, updated_by = :createdBy
-, updated_date = :createdDate
-where
-event_id = :eventId
-<AND_CHECK_TENANT()>
-;
->>
 
 
 

diff --git a/subscription/src/main/resources/org/killbill/billing/subscription/engine/dao/SubscriptionSqlDao.sql.stg b/subscription/src/main/resources/org/killbill/billing/subscription/engine/dao/SubscriptionSqlDao.sql.stg
index a21559a..f644d2d 100644
--- a/subscription/src/main/resources/org/killbill/billing/subscription/engine/dao/SubscriptionSqlDao.sql.stg
+++ b/subscription/src/main/resources/org/killbill/billing/subscription/engine/dao/SubscriptionSqlDao.sql.stg
@@ -7,7 +7,6 @@ tableFields(prefix) ::= <<
 , <prefix>category
 , <prefix>start_date
 , <prefix>bundle_start_date
-, <prefix>active_version
 , <prefix>charged_through_date
 , <prefix>migrated
 , <prefix>created_by
@@ -21,7 +20,6 @@ tableValues() ::= <<
 , :category
 , :startDate
 , :bundleStartDate
-, :activeVersion
 , :chargedThroughDate
 , :migrated
 , :createdBy
@@ -52,25 +50,3 @@ where id = :id
 ;
 >>
 
-updateActiveVersion() ::= <<
-update <tableName()>
-set
-active_version = :activeVersion
-, updated_by = :createdBy
-, updated_date = :createdDate
-where id = :id
-;
->>
-
-updateForRepair() ::= <<
-update <tableName()>
-set
-active_version = :activeVersion
-, start_date = :startDate
-, bundle_start_date = :bundleStartDate
-, updated_by = :createdBy
-, updated_date = :createdDate
-where id = :id
-<AND_CHECK_TENANT()>
-;
->>

diff --git a/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java b/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java
index 0ec542a..513ddad 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java
@@ -52,20 +52,6 @@ public class TestPlanAligner extends SubscriptionTestSuiteNoDB {
     @BeforeClass(groups = "fast")
     public void beforeClass() throws Exception {
         super.beforeClass();
-
-        /*
-        final VersionedCatalogLoader versionedCatalogLoader = new VersionedCatalogLoader(clock);
-        final CatalogConfig config = new ConfigurationObjectFactory(new ConfigSource() {
-            final Map<String, String> properties = ImmutableMap.<String, String>of("org.killbill.catalog.uri", "file:src/test/resources/testInput.xml");
-
-            @Override
-            public String getString(final String propertyName) {
-                return properties.get(propertyName);
-            }
-        }).build(CatalogConfig.class);
-
-        catalogService = new DefaultCatalogService(config, versionedCatalogLoader);
-        */
         planAligner = new PlanAligner(catalogService);
 
     }
@@ -171,8 +157,8 @@ public class TestPlanAligner extends SubscriptionTestSuiteNoDB {
         final SubscriptionBaseEvent event = createSubscriptionEvent(builder.getAlignStartDate(),
                                                                     productName,
                                                                     phaseType,
-                                                                    ApiEventType.CREATE,
-                                                                    defaultSubscriptionBase.getActiveVersion());
+                                                                    ApiEventType.CREATE
+                                                                   );
         defaultSubscriptionBase.rebuildTransitions(ImmutableList.<SubscriptionBaseEvent>of(event), catalogService.getFullCatalog(internalCallContext));
 
         Assert.assertEquals(defaultSubscriptionBase.getAllTransitions().size(), 1);
@@ -190,13 +176,13 @@ public class TestPlanAligner extends SubscriptionTestSuiteNoDB {
         final SubscriptionBaseEvent previousEvent = createSubscriptionEvent(defaultSubscriptionBase.getStartDate(),
                                                                             previousProductName,
                                                                             commonPhaseType,
-                                                                            ApiEventType.CREATE,
-                                                                            defaultSubscriptionBase.getActiveVersion());
+                                                                            ApiEventType.CREATE
+                                                                           );
         final SubscriptionBaseEvent event = createSubscriptionEvent(effectiveChangeDate,
                                                                     newProductName,
                                                                     commonPhaseType,
-                                                                    ApiEventType.CHANGE,
-                                                                    defaultSubscriptionBase.getActiveVersion());
+                                                                    ApiEventType.CHANGE
+                                                                   );
 
         defaultSubscriptionBase.rebuildTransitions(ImmutableList.<SubscriptionBaseEvent>of(previousEvent, event), catalogService.getFullCatalog(internalCallContext));
 
@@ -210,8 +196,7 @@ public class TestPlanAligner extends SubscriptionTestSuiteNoDB {
     private SubscriptionBaseEvent createSubscriptionEvent(final DateTime effectiveDate,
                                                           final String productName,
                                                           final PhaseType phaseType,
-                                                          final ApiEventType apiEventType,
-                                                          final long activeVersion) {
+                                                          final ApiEventType apiEventType) {
         final ApiEventBuilder eventBuilder = new ApiEventBuilder();
         eventBuilder.setEffectiveDate(effectiveDate);
         eventBuilder.setEventPlan(productName);
@@ -220,7 +205,6 @@ public class TestPlanAligner extends SubscriptionTestSuiteNoDB {
 
         // We don't really use the following but the code path requires it
         eventBuilder.setFromDisk(true);
-        eventBuilder.setActiveVersion(activeVersion);
 
         return new ApiEventBase(eventBuilder.setApiEventType(apiEventType));
     }

diff --git a/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiCreate.java b/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiCreate.java
index b3d14f6..4776379 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiCreate.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiCreate.java
@@ -109,8 +109,6 @@ public class TestUserApiCreate extends SubscriptionTestSuiteWithEmbeddedDB {
         final SubscriptionBaseEvent trialEvent = events.get(0);
         final SubscriptionBaseEvent phaseEvent = events.get(1);
 
-        assertEquals(subscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
-        //assertEquals(subscription.getAccount(), account.getId());
         assertEquals(subscription.getBundleId(), bundle.getId());
         assertEquals(subscription.getStartDate(), requestedDate);
 
@@ -139,8 +137,6 @@ public class TestUserApiCreate extends SubscriptionTestSuiteWithEmbeddedDB {
                                                                                                                           testUtil.getProductSpecifier(productName, planSetName, term, PhaseType.EVERGREEN), null, clock.getUTCNow(), false, internalCallContext);
         assertNotNull(subscription);
 
-        assertEquals(subscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
-        //assertEquals(subscription.getAccount(), account.getId());
         assertEquals(subscription.getBundleId(), bundle.getId());
         testUtil.assertDateWithin(subscription.getStartDate(), init, clock.getUTCNow());
         testUtil.assertDateWithin(subscription.getBundleStartDate(), init, clock.getUTCNow());
@@ -173,8 +169,6 @@ public class TestUserApiCreate extends SubscriptionTestSuiteWithEmbeddedDB {
                                                                                                                           null, clock.getUTCNow(), false, internalCallContext);
         assertNotNull(subscription);
 
-        assertEquals(subscription.getActiveVersion(), SubscriptionEvents.INITIAL_VERSION);
-        //assertEquals(subscription.getAccount(), account.getId());
         assertEquals(subscription.getBundleId(), bundle.getId());
         testUtil.assertDateWithin(subscription.getStartDate(), init, clock.getUTCNow());
         testUtil.assertDateWithin(subscription.getBundleStartDate(), init, clock.getUTCNow());