Changing the way nodes are removed from brokers list