killbill-aplcache

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/billing/BillingEvent.java b/api/src/main/java/com/ning/billing/entitlement/api/billing/BillingEvent.java
index d3425bb..a1cf572 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/billing/BillingEvent.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/billing/BillingEvent.java
@@ -16,13 +16,9 @@
 
 package com.ning.billing.entitlement.api.billing;
 
-import java.math.BigDecimal;
-
 import org.joda.time.DateTime;
 
 import com.ning.billing.catalog.api.BillingPeriod;
-import com.ning.billing.catalog.api.CatalogApiException;
-import com.ning.billing.catalog.api.Currency;
 import com.ning.billing.catalog.api.InternationalPrice;
 import com.ning.billing.catalog.api.Plan;
 import com.ning.billing.catalog.api.PlanPhase;
@@ -92,20 +88,4 @@ public interface BillingEvent extends Comparable<BillingEvent> {
      * @return the recurring price for the phase
      */
     public InternationalPrice getRecurringPrice();
-
-    /**
-     * Syntactic sugar to wrap currency access call
-     * 
-     * @param currency
-     * @return price value
-     */
-    public BigDecimal getRecurringPrice(Currency currency) throws CatalogApiException ;
-
-    /**
-     * Syntactic sugar to wrap currency access call
-     * 
-     * @param currency
-     * @return price value
-     */
-    public BigDecimal getFixedPrice(Currency currency) throws CatalogApiException ;
 }

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/billing/DefaultBillingEvent.java b/api/src/main/java/com/ning/billing/entitlement/api/billing/DefaultBillingEvent.java
index 673dec5..47df764 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/billing/DefaultBillingEvent.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/billing/DefaultBillingEvent.java
@@ -16,14 +16,9 @@
 
 package com.ning.billing.entitlement.api.billing;
 
-import java.math.BigDecimal;
-import java.util.UUID;
-
 import org.joda.time.DateTime;
 
 import com.ning.billing.catalog.api.BillingPeriod;
-import com.ning.billing.catalog.api.CatalogApiException;
-import com.ning.billing.catalog.api.Currency;
 import com.ning.billing.catalog.api.InternationalPrice;
 import com.ning.billing.catalog.api.Plan;
 import com.ning.billing.catalog.api.PlanPhase;
@@ -48,8 +43,10 @@ public class DefaultBillingEvent implements BillingEvent {
         effectiveDate = transition.getEffectiveTransitionTime();
         planPhase = transition.getNextPhase();
         plan = transition.getNextPlan();
-        fixedPrice = transition.getNextPhase().getFixedPrice();
-        recurringPrice = transition.getNextPhase().getRecurringPrice();
+        fixedPrice = (transition.getNextPhase() == null) ? null : 
+        		transition.getNextPhase().getFixedPrice();
+        recurringPrice = (transition.getNextPhase() == null) ? null :
+        	transition.getNextPhase().getRecurringPrice();
         description = transition.getTransitionType().toString();
         billingModeType=BillingModeType.IN_ADVANCE;
         billingPeriod = transition.getNextPhase().getBillingPeriod();
@@ -133,14 +130,5 @@ public class DefaultBillingEvent implements BillingEvent {
     public InternationalPrice getRecurringPrice() {
         return recurringPrice;
     }
-    @Override
-    public BigDecimal getFixedPrice(Currency currency) throws CatalogApiException {
-        return  fixedPrice != null ? fixedPrice.getPrice(currency) : new BigDecimal(0);
-    }
-
-    @Override
-    public BigDecimal getRecurringPrice(Currency currency) throws CatalogApiException {
-        return  recurringPrice != null ? recurringPrice.getPrice(currency) : new BigDecimal(0);
-    }
 
 }
\ No newline at end of file

diff --git a/api/src/main/java/com/ning/billing/entitlement/api/billing/EntitlementBillingApi.java b/api/src/main/java/com/ning/billing/entitlement/api/billing/EntitlementBillingApi.java
index 0e429ab..8172ae4 100644
--- a/api/src/main/java/com/ning/billing/entitlement/api/billing/EntitlementBillingApi.java
+++ b/api/src/main/java/com/ning/billing/entitlement/api/billing/EntitlementBillingApi.java
@@ -16,15 +16,11 @@
 
 package com.ning.billing.entitlement.api.billing;
 
-import java.util.List;
 import java.util.SortedSet;
 import java.util.UUID;
 
 import org.joda.time.DateTime;
 
-import com.ning.billing.account.api.Account;
-import com.ning.billing.entitlement.api.user.EntitlementUserApiException;
-
 public interface EntitlementBillingApi {