Merge "Remove unnecessary code." into jb-mr1-dev