killbill-memoizeit

diff --git a/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultEntitlement.java b/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultEntitlement.java
index 9680a76..10246cb 100644
--- a/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultEntitlement.java
+++ b/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultEntitlement.java
@@ -493,9 +493,6 @@ public class DefaultEntitlement extends EntityBase implements Entitlement {
                     throw new EntitlementApiException(ErrorCode.SUB_CANCEL_BAD_STATE, getId(), EntitlementState.CANCELLED);
                 }
 
-                // Make sure to compute the entitlement effective date first to avoid timing issues for IMM cancellations
-                // (we don't want an entitlement cancel date one second or so after the subscription cancel date or add-ons cancellations
-                // computations won't work).
                 final InternalCallContext contextWithValidAccountRecordId = internalCallContextFactory.createInternalCallContext(getAccountId(), callContext);
 
                 try {

diff --git a/entitlement/src/main/java/org/killbill/billing/entitlement/api/svcs/DefaultEntitlementInternalApi.java b/entitlement/src/main/java/org/killbill/billing/entitlement/api/svcs/DefaultEntitlementInternalApi.java
index a5f4fc5..5a59a28 100644
--- a/entitlement/src/main/java/org/killbill/billing/entitlement/api/svcs/DefaultEntitlementInternalApi.java
+++ b/entitlement/src/main/java/org/killbill/billing/entitlement/api/svcs/DefaultEntitlementInternalApi.java
@@ -146,15 +146,14 @@ public class DefaultEntitlementInternalApi extends DefaultEntitlementApiBase imp
                                                                                    callContext);
             pluginContexts.add(pluginContext);
 
-            final DefaultEntitlement defaultEntitlement = getDefaultEntitlement(entitlement, internalCallContext);
-            final WithEntitlementPlugin<Entitlement> cancelEntitlementWithPlugin = new WithDateOverrideBillingPolicyEntitlementCanceler(defaultEntitlement,
+            final WithEntitlementPlugin<Entitlement> cancelEntitlementWithPlugin = new WithDateOverrideBillingPolicyEntitlementCanceler((DefaultEntitlement) entitlement,
                                                                                                                                         blockingStates,
                                                                                                                                         notificationEvents,
                                                                                                                                         callContext,
                                                                                                                                         internalCallContext);
             callbacks.add(cancelEntitlementWithPlugin);
 
-            subscriptions.add(defaultEntitlement.getSubscriptionBase());
+            subscriptions.add(((DefaultEntitlement) entitlement).getSubscriptionBase());
         }
 
         final Callable<Void> preCallbacksCallback = new BulkSubscriptionBaseCancellation(subscriptions,
@@ -188,16 +187,6 @@ public class DefaultEntitlementInternalApi extends DefaultEntitlementApiBase imp
         }
     }
 
-    // For forward-compatibility
-    private DefaultEntitlement getDefaultEntitlement(final Entitlement entitlement, final InternalTenantContext context) throws EntitlementApiException {
-        if (entitlement instanceof DefaultEntitlement) {
-            return (DefaultEntitlement) entitlement;
-        } else {
-            // Safe cast
-            return (DefaultEntitlement) getEntitlementForId(entitlement.getId(), context);
-        }
-    }
-
     private class BulkSubscriptionBaseCancellation implements Callable<Void> {
 
         private final Iterable<SubscriptionBase> subscriptions;