Cleanup broker and bridge