Remove getter/setter interface for inv_P_ and P_