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

* commit '6c8d6123ba22c8bd523cfaf46196385cb79290ee':
  Cleaning up unused code