Merge "removed some more unnecessary code" into honeycomb