Moved remove-unary-abstract filter to a more general rules-filter, and added scope-3
filtering of rules