Remove unncessary promises