Remove single-cc field and move exp and cvv into separate fields