Don't need that Promise.all anymore