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

* commit '3c42e118c4c78f0b7f71e27ce0232bdc105842f0':
  Cleaning up unused code