am 260df841: Merge "Remove unused code"

* commit '260df8419739f92d4c64abfedec448a7f447b3a1':
  Remove unused code