More ripping out of promises