Removed more resolving/rejecting
May as well remove when() as well