Remove usage of depracated Broker API