Removed anything to do with Subscriptions