Cleaner management of many sources