Update pri value regex and remove redundant fields