am e0963f27: am f4ffdc63: Merge "removed some more unnecessary code" into honeycomb

* commit 'e0963f27096b2433f56d4929c0461c92a683659b':
  removed some more unnecessary code