removing broker dependency