Some future on_completed callback cleanup