Merge "Doc change: remove an unneeded file. Edits." into jb-dev