more promise cleanup