am d2f0dcd1: Merge "Remove unused code"

* commit 'd2f0dcd182fbc0423d206919e81f3845fb9b8155':
  Remove unused code