More ruleset cleanup