Remove 'Endpoint' from EventData