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

* commit '612d7f3c092ec2c4a2ae44cb09d6dfb4e525a659':
  clean-up unneeded code