Clean up so it works on checkout.