Tidy up some more promises