drop "old-branches" prefix
small ruleset additions