Minor fixes

- Disable broker join if Intra join is available.

- Delete some useless comments.