Remove some dependencies
Remove most differences between spawn/webhook
Fix some edge cases