Merge "removing unused code" into honeycomb