Removed cases where promises where not needed.