Merge "Remove obsolete tool." into jb-dev