revert some changes; remove promise and delete unique key on failed/complete
remove dep.