clean up cdma/gsm variant props