Remove hardcoded event type