I think you can remove this and similarly for webhook.