Clean up of binding broker implementation

No match.