remove unused restrictToActive method and rewrite the other one to cover both, restrict
and reorder.