Merge "Remove dead code." into jb-mr2-dev