Drop dependency on defy