am a423d868: Merge "clean-up unneeded code" into honeycomb

* commit 'a423d868009b9961597365ce7f190aef23f4b1cc':
  clean-up unneeded code