Make saltnado conditionally wait for new events
Remove unecessary delete, on_finish already times-out the futures