Clean out 3.0 to 3.1 rscompat stuff from master
There's 3.0 ruleset compatibility code fragments ended to master. Clean them out.
There's 3.0 ruleset compatibility code fragments ended to master. Clean them out.