clean + fix delivery on checkout