Is there a way to clean up empty Team Shared Query folders in the Web UI?

We have a project area that has a lot of teams that get formed and archived on a regular basis.  When one shares a query with the team, it shows up under a folder with the team's name in the RTC web UI.   However, if you're a member of the team, even if the team area is archived, that folder seems to follow you in the web UI which gets cluttered very quickly over time.  Is there a way to make the folder for archived teams that you're a member of not clutter your Shared query view? In fact, I think there should be an option to not display empty folders at all if there are no shared queries under them.