Clean up promises for sources saving