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

* commit 'f4ffdc63d3d5b400174624f5bb8c41c7ed17265b':
  removed some more unnecessary code