Merge "Clean up unused code used to use for...." into jb-mr1-dev