BrokerImpl destroy refactor