Remove Service & Endpoint from events