Cleaned up InApp Billing