Merge "Remove unused code." into jb-dev