am 32c88ecd: am a33307ea: Merge "removing unused code" into honeycomb

* commit '32c88ecdc696c7306b1c565ffd74d791c7943abd':
  removing unused code