Remove broker dependencies