am a33307ea: Merge "removing unused code" into honeycomb

* commit 'a33307ea6bc399ef7e49c0f62c8d7aa031fcb843':
  removing unused code