When Org Structures are updated, can old structures with zero colleagues be removed automatically?

We utilise a daily data feed to update new colleagues and archive leavers as well as organisation structure updates. I've come to realise that over the years the old function / department names are still visible even with zero colleagues held within.

This is awkward when allocating content via registration rules as you always second guess which one to pick where department names are similar therefore you have to come out of your reg rule, go to Org & Users, remind yourself which org path to take and go back to your reg rule.

How I'd make it better?

Either

1. As part of the reg rule when allocating content show the number of colleagues in the structure as part of the reg rule similar to Org & Users, or

2. When an org unit / department or function has zero colleagues (including child) auto archive / remove it