am 1ffd8016: am 6c8d6123: am 3c42e118: Merge "Cleaning up unused code" into jb-mr1.1-dev

* commit '1ffd80162c2129aa03ed65299421b1e69c6205eb':
  Cleaning up unused code