Bugfix
Bugfix
Broker code cleanup