Clean up of binding broker implementation