Eliminate use of SubscriptionUserApi