Fix remove_from_order