clean up thenable calls