More ripping out promises