am 15b28432: Merge "Cleanup unused code" into jb-mr1-dev

* commit '15b28432bab6b530d82ba01e0ef6a19cd1a4c698':
  Cleanup unused code