minor cleanup to soa5 rules