A little more cleanup for promises