Merge "Cleaning up unused code" into jb-mr1.1-dev