Merge "clean-up unneeded code" into honeycomb