am b19e06f3: Merge "remove unused code"

* commit 'b19e06f3e53cf011a04d9e0f0529c2a94a7c3780':
  remove unused code