!str #15604: Removal of default fanout

I think both of these issues can be solved by the current Source architecture, so the custom fanouts can be ripped from those Publishers