Really removing the EventSubscriptionService :)