Clean up so it doesn't fail when order changes