Minor future on_completed cleanup