Move webhooks into control remove callbacks