Remove unused feature
Fix listeners for DSB provider