More future on_completed cleanup