Remove SubscriptionParcelable and other re-orgs